Merge pull request #194 from eclipse/cd_crapedicrap

remove ExecutionEnvironment config nobody knows why it is there
eclipse · Jul 29, 2021 · 6d8d1a9 · 6d8d1a9
2 parents ca6656b + 9c1dae2
commit 6d8d1a9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
   agent {
     kubernetes {
-      label 'migration'
+      label 'centos-7'
     }
   }
 
@@ -75,7 +75,7 @@ pipeline {
     stage ('Build') {
       steps {
         wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
-          withMaven(jdk: 'adoptopenjdk-hotspot-jdk8-latest', maven: 'apache-maven-latest', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
+          withMaven(jdk: 'adoptopenjdk-hotspot-jdk11-latest', maven: 'apache-maven-latest', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
             dir ('git-repo') {
               sh '''
                 if [ "${BRANCH_NAME}" == "master" ] || [ "${RELEASE_TYPE}" != "Integration" ] || [ "${FORCE_PUBLISH}" == "true" ]; then

diff --git a/maven/org.eclipse.emf.mwe2.parent/pom.xml b/maven/org.eclipse.emf.mwe2.parent/pom.xml
@@ -23,7 +23,7 @@
 	<properties>
 		<tycho-qualifier>yyyyMMdd-HHmm</tycho-qualifier>
 
-		<tycho-version>1.7.0</tycho-version>
+		<tycho-version>2.4.0</tycho-version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven-install-version>2.5.2</maven-install-version>
@@ -130,7 +130,6 @@
 							</requirement>
 						</extraRequirements>
 					</dependency-resolution>
-					<executionEnvironment>JavaSE-1.8</executionEnvironment>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target b/maven/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target
@@ -7,7 +7,7 @@
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/oxygen/201804111000"/>
+<repository location="https://download.eclipse.org/releases/2021-06"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
@@ -34,7 +34,7 @@
 <unit id="org.junit" version="0.0.0"/>
 <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
 <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-03"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-06"/>
 </location>
 </locations>
 </target>
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -48,19 +48,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-pack200a-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>pack200-normalize</id>
-						<goals>
-							<goal>normalize</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.eclipse.cbi.maven.plugins</groupId>
 				<artifactId>eclipse-jarsigner-plugin</artifactId>
@@ -76,19 +63,6 @@
 					<skip>${sign.skip}</skip>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-pack200b-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>pack200-pack</id>
-						<goals>
-							<goal>pack</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>