Fixed findings during the work on #267

Signed-off-by: Dennis Huebner <[email protected]>
eclipse · Jun 19, 2019 · c5a4d07 · c5a4d07
1 parent 6d11570
commit c5a4d07
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 25 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -63,12 +63,17 @@ timestamps() {
                     }
                 }
             }
-            
+
             if(env.BRANCH_NAME.toLowerCase() == 'master') {
                 stage('deploy') {
                     def settings = "-s /opt/public/hipp/homes/genie.xpect/.m2/settings-deploy-ossrh.xml"
                     sh "${mvnHome}/bin/mvn -P!tests -P maven-publish -Dtarget-platform=eclipse_4_4_2-xtext_2_9_2 ${settings} ${mvnParams} clean deploy"
                 }
+            } else if(env.BRANCH_NAME.toLowerCase().startsWith('release_')) {
+                stage('deploy') {
+                    def settings = "-s /opt/public/hipp/homes/genie.xpect/.m2/settings-deploy-ossrh.xml"
+                    sh "${mvnHome}/bin/mvn -P!tests -P!xtext-examples  -P maven-publish -Dtarget-platform=eclipse_4_4_2-xtext_2_9_2 ${settings} ${mvnParams} clean deploy"
+                }
             }
         }
     }

diff --git a/org.eclipse.xpect.releng/README.md b/org.eclipse.xpect.releng/README.md
@@ -0,0 +1,32 @@
+# Releng
+
+### Buildserver
+
+https://ci.eclipse.org/xpect/job/Xpect/
+
+
+
+## Releasing
+
+- create branch named 'release_x.y.z'
+- update maven versions
+- push the branch
+- Jenkins will trigger a build and publish to maven staging
+- review and publish staging repo from sonatype web UI
+
+### Update maven version
+
+To select an other target platform use e.g. `-Dtarget-platform=eclipse_4_4_2-xtext_2_9_2`
+
+```mvn org.eclipse.tycho:tycho-versions-plugin:set-version -Dtarget-platform=eclipse_4_4_2-xtext_2_9_2 -P'!xtext-examples' -DnewVersion="0.2.0.v20190619" -Dartifacts="org.eclipse.xpect.parent,org.eclipse.xpect.test.parent"```
+
+Manually change the property value of `target-platform-version` to  0.2.0.v20190619 in:
+```
+org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
+org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
+org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
+```
+
+### Sonatype Web UI
+
+https://oss.sonatype.org/index.html
diff --git a/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml b/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
@@ -16,10 +16,23 @@
 	<properties>
 		<target-platform>eclipse_4_4_2-xtext_2_9_2</target-platform>
 		<xtend-compiler-version>2.9.2</xtend-compiler-version>
-		<tycho-version>1.3.0</tycho-version>
+		<tycho-version>1.4.0</tycho-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<target-platform-version>0.2.0-SNAPSHOT</target-platform-version>
 	</properties>
 
+	<modules>
+		<module>../../org.eclipse.xpect</module>
+		<module>../../org.eclipse.xpect.ui</module>
+		<module>../../org.eclipse.xpect.ui.junit</module>
+		<module>../../org.eclipse.xpect.xtext.lib</module>
+		<module>../../org.eclipse.xpect.xtext.xbase.lib</module>
+		<module>../../org.eclipse.xpect.sdk</module>
+		<module>../../org.eclipse.xpect.xtext.lib.feature</module>
+		<module>../../org.eclipse.xpect.xtext.xbase.lib.feature</module>
+		<module>../../org.eclipse.xpect.releng/p2-repository</module>
+	</modules>
+
 	<repositories>
 		<repository>
 			<id>license-feature</id>
@@ -47,7 +60,7 @@
 						<artifact>
 							<groupId>org.eclipse.xpect</groupId>
 							<artifactId>org.eclipse.xpect.target.${target-platform}</artifactId>
-							<version>0.2.0-SNAPSHOT</version>
+							<version>${target-platform-version}</version>
 						</artifact>
 					</target>
 					<environments>
@@ -138,6 +151,42 @@
 		</pluginManagement>
 	</build>
 	<profiles>
+		<profile>
+			<id>eclipse_4_10_0-xtext_nightly</id>
+			<activation>
+				<property>
+					<name>target-platform</name>
+					<value>eclipse_4_10_0-xtext_nightly</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../target-platforms/eclipse_4_10_0-xtext_nightly</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>eclipse_4_5_0-xtext_2_14_0</id>
+			<activation>
+				<property>
+					<name>target-platform</name>
+					<value>eclipse_4_5_0-xtext_2_14_0</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../target-platforms/eclipse_4_5_0-xtext_2_14_0</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>eclipse_4_4_2-xtext_2_9_2</id>
+			<activation>
+				<property>
+					<name>target-platform</name>
+					<value>eclipse_4_4_2-xtext_2_9_2</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../target-platforms/eclipse_4_4_2-xtext_2_9_2</module>
+			</modules>
+		</profile>
 		<profile>
 			<id>maven-publish</id>
 			<distributionManagement>

diff --git a/org.eclipse.xpect.releng/maven-test-parent/pom.xml b/org.eclipse.xpect.releng/maven-test-parent/pom.xml
@@ -111,6 +111,42 @@ Contributors:
 	</build>
 
 	<profiles>
+		<profile>
+			<id>eclipse_4_10_0-xtext_nightly</id>
+			<activation>
+				<property>
+					<name>target-platform</name>
+					<value>eclipse_4_10_0-xtext_nightly</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../target-platforms/eclipse_4_10_0-xtext_nightly</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>eclipse_4_5_0-xtext_2_14_0</id>
+			<activation>
+				<property>
+					<name>target-platform</name>
+					<value>eclipse_4_5_0-xtext_2_14_0</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../target-platforms/eclipse_4_5_0-xtext_2_14_0</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>eclipse_4_4_2-xtext_2_9_2</id>
+			<activation>
+				<property>
+					<name>target-platform</name>
+					<value>eclipse_4_4_2-xtext_2_9_2</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../target-platforms/eclipse_4_4_2-xtext_2_9_2</module>
+			</modules>
+		</profile>
 		<profile>
 			<id>osx</id>
 			<activation>

diff --git a/org.eclipse.xpect.releng/xtext-examples/maven-parents/grammar-plugin/pom.xml b/org.eclipse.xpect.releng/xtext-examples/maven-parents/grammar-plugin/pom.xml
@@ -14,7 +14,7 @@ Contributors:
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.xtext.example</groupId>
 	<artifactId>org.eclipse.xtext.example.maven_parents.grammar_plugin</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>

diff --git a/org.eclipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/pom.xml b/org.eclipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/pom.xml
@@ -19,7 +19,7 @@ Contributors:
 	<parent>
 		<groupId>org.eclipse.xtext.example</groupId>
 		<artifactId>org.eclipse.xtext.example.maven_parents.grammar_plugin</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>../maven-parents/grammar-plugin</relativePath>
 	</parent>
 	<properties>

diff --git a/org.eclipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/pom.xml b/org.eclipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/pom.xml
@@ -19,7 +19,7 @@ Contributors:
 	<parent>
 		<groupId>org.eclipse.xtext.example</groupId>
 		<artifactId>org.eclipse.xtext.example.maven_parents.grammar_plugin</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>../maven-parents/grammar-plugin</relativePath>
 	</parent>
 	<properties>

diff --git a/org.eclipse.xpect/META-INF/MANIFEST.MF b/org.eclipse.xpect/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Localization: plugin
 Bundle-Version: 0.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-SymbolicName: org.eclipse.xpect;singleton:=true
+Automatic-Module-Name: org.eclipse.xpect
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.apache.log4j;bundle-version="1.2.0";visibility:=reexport,
  org.junit;bundle-version="4.11.0";visibility:=reexport,

diff --git a/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml b/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
@@ -20,8 +20,9 @@ Contributors:
 	<properties>
 		<os-jvm-flags />
 		<memory-settings>-Xmx1G</memory-settings>
-		<tycho-version>1.3.0</tycho-version>
+		<tycho-version>1.4.0</tycho-version>
 		<target-platform>eclipse_4_4_2-xtext_2_9_2</target-platform>
+		<target-platform-version>0.2.0-SNAPSHOT</target-platform-version>
 	</properties>
 
 	<profiles>
@@ -63,7 +64,7 @@ Contributors:
 						<artifact>
 							<groupId>org.eclipse.xpect</groupId>
 							<artifactId>org.eclipse.xpect.target.${target-platform}</artifactId>
-							<version>0.2.0-SNAPSHOT</version>
+							<version>${target-platform-version}</version>
 						</artifact>
 					</target>
 					<environments>

diff --git a/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml b/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
@@ -19,8 +19,9 @@ Contributors:
 
 	<properties>
 		<memory-settings>-Xmx1G</memory-settings>
-		<tycho-version>1.3.0</tycho-version>
+		<tycho-version>1.4.0</tycho-version>
 		<target-platform>eclipse_4_4_2-xtext_2_9_2</target-platform>
+		<target-platform-version>0.2.0-SNAPSHOT</target-platform-version>
 	</properties>
 
 	<profiles>
@@ -46,7 +47,7 @@ Contributors:
 									<artifact>
 										<groupId>org.eclipse.xpect</groupId>
 										<artifactId>org.eclipse.xpect.target.${target-platform}</artifactId>
-										<version>0.2.0-SNAPSHOT</version>
+										<version>${target-platform-version}</version>
 									</artifact>
 								</target>
 								<environments>
@@ -110,7 +111,7 @@ Contributors:
 									<artifact>
 										<groupId>org.eclipse.xpect</groupId>
 										<artifactId>org.eclipse.xpect.target.${target-platform}</artifactId>
-										<version>0.2.0-SNAPSHOT</version>
+										<version>${target-platform-version}</version>
 									</artifact>
 								</target>
 								<environments>

diff --git a/pom.xml b/pom.xml
@@ -12,17 +12,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.xpect</groupId>
 	<artifactId>org.eclipse.xpect.root</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<target-platform>eclipse_4_5_0-xtext_nightly</target-platform>
+		<target-platform>eclipse_4_4_2-xtext_2_9_2</target-platform>
 		<xtend-compiler-version>2.9.2</xtend-compiler-version>
+		<tycho-version>1.4.0</tycho-version>
 	</properties>
-	<modules>
-		<module>org.eclipse.xpect.releng/target-platforms/${target-platform}</module>
-	</modules>
 	<build>
 		<plugins>
 			<!-- Don't publish this artifact to Maven repositories. -->
@@ -33,6 +31,11 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
+			</plugin>
 		</plugins>
 	</build>
 	<profiles>
@@ -42,15 +45,6 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<module>org.eclipse.xpect</module>
-				<module>org.eclipse.xpect.ui</module>
-				<module>org.eclipse.xpect.ui.junit</module>
-				<module>org.eclipse.xpect.xtext.lib</module>
-				<module>org.eclipse.xpect.xtext.xbase.lib</module>
-				<module>org.eclipse.xpect.sdk</module>
-				<module>org.eclipse.xpect.xtext.lib.feature</module>
-				<module>org.eclipse.xpect.xtext.xbase.lib.feature</module>
-				<module>org.eclipse.xpect.releng/p2-repository</module>
 				<module>org.eclipse.xpect.releng/maven-plugin-parent</module>
 			</modules>
 		</profile>
@@ -76,6 +70,7 @@
 			<modules>
 				<module>org.eclipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests</module>
 				<module>org.eclipse.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests</module>
+				<module>org.eclipse.xpect.releng/maven-test-parent</module>
 				<module>org.eclipse.xpect.tests</module>
 				<module>org.eclipse.xpect.xtext.lib.tests</module>
 				<module>org.eclipse.xtext.example.arithmetics.xpect.tests</module>