Fix deploy script

1 files changed, 52 insertions, 23 deletions

diff --git a/org.eclipse.scout.sdk.s2e.releng/pom.xml b/org.eclipse.scout.sdk.s2e.releng/pom.xml
index 761bfe07a..f0f60ffd4 100644
--- a/org.eclipse.scout.sdk.s2e.releng/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.releng/pom.xml
@@ -33,7 +33,8 @@
     - In org.eclipse.scout.sdk.s2e.releng/, execute
     mvn clean deploy -DforgeSnapshotUrl=https://scout.bsiag.com/repository/org.eclipse.scout-snapshot-local -DforgeSnapshotId=bsi-tools-snapshot
     3b. For deploying releases (to be used by Tycho releases):
-    - Prerequisite: you need to have GPG properly set up, see https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven
+    - Prerequisite: 1. you need to have GPG properly set up, see http://central.sonatype.org/pages/working-with-pgp-signatures.html
+                    2. if not already present: you need to add the server with id of property DforgeReleaseId into your settings.xml including the corresponding credentials (e.g. oss sonatype username/password)
     - Make sure that ${org.eclipse.jdt.core-maven}, ${org.eclipse.equinox.common-maven}, ${org.eclipse.osgi-maven},... in the parent POM don't have a '-SNAPSHOT' suffix
     - In org.eclipse.scout.sdk.s2e.releng/, execute
     mvn clean deploy -Pdeploy-releases -DforgeReleaseUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DforgeReleaseId=forge-releases -Dgpg.passphrase=<your_passphrase>
@@ -72,6 +73,23 @@
       </plugins>
     </pluginManagement>
 
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>*.pom</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>*.pom</exclude>
+        </excludes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -84,24 +102,6 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <resources>
-            <resource>
-              <directory>src/main/resources</directory>
-              <filtering>true</filtering>
-              <includes>
-                <include>*.pom</include>
-              </includes>
-            </resource>
-            <resource>
-              <directory>src/main/resources</directory>
-              <filtering>false</filtering>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-            </resource>
-          </resources>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho.extras</groupId>
@@ -1695,15 +1695,44 @@
             </configuration>
             <executions>
               <execution>
-                <id>deploy-core-variables</id>
+                <id>deploy-debug-core</id>
                 <goals>
                   <goal>sign-and-deploy-file</goal>
                 </goals>
                 <phase>deploy</phase>
+                <inherited>true</inherited>
                 <configuration>
-                  <file>${downloaded}/org.eclipse.core.variables_${org.eclipse.core.variables}.jar</file>
-                  <sources>${downloaded}/org.eclipse.core.variables.source_${org.eclipse.core.variables}.jar</sources>
-                  <pomFile>${project.build.outputDirectory}/org.eclipse.core.variables.pom</pomFile>
+                  <file>${downloaded}/org.eclipse.debug.core_${org.eclipse.debug.core}.jar</file>
+                  <sources>${downloaded}/org.eclipse.debug.core.source_${org.eclipse.debug.core}.jar</sources>
+                  <pomFile>${project.build.outputDirectory}/org.eclipse.debug.core.pom</pomFile>
+                  <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
+                </configuration>
+              </execution>
+              <execution>
+                <id>deploy-debug-ui</id>
+                <goals>
+                  <goal>sign-and-deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <inherited>true</inherited>
+                <configuration>
+                  <file>${downloaded}/org.eclipse.debug.ui_${org.eclipse.debug.ui}.jar</file>
+                  <sources>${downloaded}/org.eclipse.debug.ui.source_${org.eclipse.debug.ui}.jar</sources>
+                  <pomFile>${project.build.outputDirectory}/org.eclipse.debug.ui.pom</pomFile>
+                  <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
+                </configuration>
+              </execution>
+              <execution>
+                <id>deploy-jdt-junit</id>
+                <goals>
+                  <goal>sign-and-deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <inherited>true</inherited>
+                <configuration>
+                  <file>${downloaded}/org.eclipse.jdt.junit_${org.eclipse.jdt.junit}.jar</file>
+                  <sources>${downloaded}/org.eclipse.jdt.junit.source_${org.eclipse.jdt.junit}.jar</sources>
+                  <pomFile>${project.build.outputDirectory}/org.eclipse.jdt.junit.pom</pomFile>
                   <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
                 </configuration>
               </execution>