Merge remote-tracking branch 'origin/releases/5.2.x' into releases/6.0.x

2 files changed, 114 insertions, 24 deletions

diff --git a/org.eclipse.scout.sdk.s2e.releng/pom.xml b/org.eclipse.scout.sdk.s2e.releng/pom.xml
index 4303c518f..05e3acdd5 100644
--- a/org.eclipse.scout.sdk.s2e.releng/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.releng/pom.xml
@@ -37,6 +37,8 @@
     - 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>
+    - For single additional deps: In org.eclipse.scout.sdk.s2e.releng/, execute
+    mvn clean deploy -Pdeploy-releases-addNewDeps -DforgeReleaseUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DforgeReleaseId=forge-releases -Dgpg.passphrase=<your_passphrase>
     - Close and release staged artifacts into repository 'Releases'
   -->
   <properties>
@@ -46,31 +48,9 @@
   </properties>
 
   <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*.pom</include>
-        </includes>
-      </resource>
-      <resource>
-        <filtering>false</filtering>
-        <directory>src/main/resources</directory>
-        <excludes>
-          <exclude>**/*.pom</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
           <groupId>org.eclipse.tycho.extras</groupId>
           <artifactId>tycho-p2-extras-plugin</artifactId>
           <version>${master_plugin_tycho-extras_version}</version>
@@ -107,12 +87,19 @@
         <configuration>
           <resources>
             <resource>
-              <directory>${project.source.dircetory}</directory>
+              <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>
@@ -212,6 +199,14 @@
               <version>${org.eclipse.core.filesystem}</version>
             </iu>
             <iu>
+              <id>org.eclipse.core.variables</id>
+              <version>${org.eclipse.core.variables}</version>
+            </iu>
+            <iu>
+              <id>org.eclipse.core.variables.source</id>
+              <version>${org.eclipse.core.variables}</version>
+            </iu>
+            <iu>
               <id>org.eclipse.core.runtime</id>
               <version>${org.eclipse.core.runtime}</version>
             </iu>
@@ -692,6 +687,18 @@
                 </configuration>
               </execution>
               <execution>
+                <id>deploy-core-variables</id>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <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>
+                </configuration>
+              </execution>
+              <execution>
                 <id>deploy-core-runtime</id>
                 <goals>
                   <goal>deploy-file</goal>
@@ -1419,7 +1426,7 @@
                 </configuration>
               </execution>
               <execution>
-                <id>deploy-core-filesystems</id>
+                <id>deploy-core-filesystem</id>
                 <goals>
                   <goal>sign-and-deploy-file</goal>
                 </goals>
@@ -1432,6 +1439,19 @@
                 </configuration>
               </execution>
               <execution>
+                <id>deploy-core-variables</id>
+                <goals>
+                  <goal>sign-and-deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <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>
+                  <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
+                </configuration>
+              </execution>
+              <execution>
                 <id>deploy-core-runtime</id>
                 <goals>
                   <goal>sign-and-deploy-file</goal>
@@ -1578,5 +1598,36 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>deploy-releases-addNewDeps</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.7.0.MGPG-53</version>
+            <configuration>
+              <repositoryId>${forgeReleaseId}</repositoryId>
+              <url>${forgeReleaseUrl}</url>
+            </configuration>
+            <executions>
+              <execution>
+                <id>deploy-core-variables</id>
+                <goals>
+                  <goal>sign-and-deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <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>
+                  <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.core.variables.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.core.variables.pom
new file mode 100644
index 000000000..8722d0030
--- /dev/null
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.core.variables.pom
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.eclipse.scout.sdk.deps</groupId>
+  <artifactId>org.eclipse.core.variables</artifactId>
+  <version>${org.eclipse.core.variables-maven}</version>
+
+  <name>Scout SDK org.eclipse.core.variables dependency (Incubation)</name>
+  <description>This is org.eclipse.core.variables jar used by Scout SDK</description>
+  <url>http://www.eclipse.org/scout/</url>
+
+  <licenses>
+    <license>
+      <name>Eclipse Public License</name>
+      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>http://git.eclipse.org/c/scout/org.eclipse.scout.sdk.git</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>scout-dev@eclipse.org</id>
+      <name>Scout Development Team</name>
+    </developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.runtime</artifactId>
+      <version>${org.eclipse.core.runtime-range}</version>
+    </dependency>
+  </dependencies>
+</project>