Masterc (#131)

* [releng] Bump to 0.12.0 * [releng] Update to 7.0
eclipse-capella · Jul 23, 2024 · c52af80 · c52af80
1 parent 50ab53e
commit c52af80
Show file tree

Hide file tree

Showing 26 changed files with 105 additions and 173 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,13 +5,13 @@ pipeline {
 
 	tools {
 		maven 'apache-maven-latest'
-		jdk 'openjdk-jdk11-latest'
+		jdk 'openjdk-jdk17-latest'
 	}
 
 	environment {
 		BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
 		CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
-		CAPELLA_BRANCH = '6.x'
+		CAPELLA_BRANCH = 'master'
   	}
 
   	stages {
@@ -76,7 +76,7 @@ pipeline {
 
 	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", capella.getTestUpdateSiteURL("${CAPELLA_BRANCH}"), 'org.polarsys.capella.test.feature.feature.group')
 	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.scenario.editor.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.scenario.editor.feature.feature.group')
-	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "http://download.eclipse.org/releases/2021-06/", 'org.eclipse.xtext.sdk.feature.group')
+	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "https://download.eclipse.org/releases/2023-03/", 'org.eclipse.xtext.sdk.feature.group')
 	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.scenario.editor.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.scenario.editor.tests.feature.feature.group')
 	       		}         
 	     	}

diff --git a/features/org.polarsys.capella.scenario.editor.feature/feature.xml b/features/org.polarsys.capella.scenario.editor.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.polarsys.capella.scenario.editor.feature"
       label="%featureName"
-      version="0.11.1.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -89,4 +89,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.google.guava"
+         download-size="0"
+         install-size="0"
+         version="30.1.0.v20221112-0806"
+         unpack="false"/>
+
+   <plugin
+         id="org.aopalliance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.polarsys.capella.scenario.editor.feature/pom.xml b/features/org.polarsys.capella.scenario.editor.feature/pom.xml
diff --git a/features/org.polarsys.capella.scenario.editor.tests.feature/feature.xml b/features/org.polarsys.capella.scenario.editor.tests.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.polarsys.capella.scenario.editor.tests.feature"
       label="%featureName"
-      version="0.11.1.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/features/org.polarsys.capella.scenario.editor.tests.feature/pom.xml b/features/org.polarsys.capella.scenario.editor.tests.feature/pom.xml
diff --git a/features/pom.xml b/features/pom.xml
@@ -18,16 +18,20 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.scenario.editor.features</artifactId>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
+    <properties>
+      <sonar.skip>true</sonar.skip>
+    </properties>
+
 	<modules>
 		<module>org.polarsys.capella.scenario.editor.feature</module>
 		<module>org.polarsys.capella.scenario.editor.tests.feature</module>

diff --git a/plugins/org.polarsys.capella.scenario.editor.doc/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.doc;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-Activator: org.polarsys.capella.scenario.editor.doc.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/plugins/org.polarsys.capella.scenario.editor.dsl.ide/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.dsl.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl,

diff --git a/plugins/org.polarsys.capella.scenario.editor.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.dsl.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl,

diff --git a/plugins/org.polarsys.capella.scenario.editor.dsl/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.dsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.polarsys.capella.scenario.editor.dsl
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.dsl; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.xbase,

diff --git a/plugins/org.polarsys.capella.scenario.editor.embeddededitor/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor.embeddededitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor.embeddededitor;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Require-Bundle: org.polarsys.capella.scenario.editor.dsl.ui,
  org.eclipse.xtext.ui,
  org.polarsys.capella.scenario.editor.dsl,

diff --git a/plugins/org.polarsys.capella.scenario.editor/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.scenario.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.capella.scenario.editor;singleton:=true
-Bundle-Version: 0.11.1.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -17,16 +17,20 @@
 
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.capella.scenario.editor.plugins</artifactId>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
+	<properties>
+		<sonar.sources>src</sonar.sources>
+	</properties>
+
 	<modules>
 		<module>org.polarsys.capella.scenario.editor</module>
 		<module>org.polarsys.capella.scenario.editor.dsl</module>

diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <name>Capella Textual Editor Addon</name>
   <groupId>org.polarsys</groupId>
   <artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-  <version>0.11.1-SNAPSHOT</version>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	    <tycho-version>2.6.0</tycho-version>
-	    <tycho-extras-version>2.6.0</tycho-extras-version>
+	    <tycho-version>2.7.5</tycho-version>
+	    <tycho-extras-version>2.7.5</tycho-extras-version>
 		<antrun-version>3.0.0</antrun-version>
 		<rcptt-version>2.5.3</rcptt-version>
 		<rcptt-runner-version>2.5.3</rcptt-runner-version>
@@ -44,7 +44,7 @@
 
 
 		<!-- for packaging -->
-		<platform-name>2021-06</platform-name>
+		<platform-name>2023-03</platform-name>
 		<eclipse-repo.url>https://download.eclipse.org/releases/${platform-name}</eclipse-repo.url>
 		<packagedAddonName>TextualEditor</packagedAddonName>
 
@@ -102,26 +102,16 @@
 						<artifact>
 							<groupId>org.polarsys</groupId>
 							<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-							<version>0.11.1-SNAPSHOT</version>
+							<version>0.12.0-SNAPSHOT</version>
 							<classifier>releng/org.polarsys.capella.scenario.editor.update/capella.target-definition</classifier>
 						</artifact>
 					</target>
 					<environments>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
 					</environments>
 				</configuration>
 			</plugin>
@@ -205,11 +195,11 @@
 								<type>eclipse-feature</type>
 							</dependency>
 							<dependency>
-								<artifactId>org.eclipse.equinox.ds</artifactId>
+								<artifactId>org.apache.felix.scr</artifactId>
 								<type>eclipse-plugin</type>
 							</dependency>
 						</dependencies>
-						<executionEnvironment>JavaSE-11</executionEnvironment>
+						<executionEnvironment>JavaSE-17</executionEnvironment>
 					</configuration>
 					<executions>
 						<execution>
@@ -307,20 +297,6 @@
 		</activation>
 		<build>
 				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200a-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-normalize</id>
-								<phase>package</phase>
-								<goals>
-									<goal>normalize</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
@@ -335,20 +311,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200b-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-pack</id>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 			<pluginRepositories>

diff --git a/releng/org.polarsys.capella.scenario.editor.site/category.xml b/releng/org.polarsys.capella.scenario.editor.site/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.polarsys.capella.scenario.editor.feature" version="0.11.1.qualifier">
+   <feature id="org.polarsys.capella.scenario.editor.feature" version="0.12.0.qualifier">
       <category name="org.polarsys.capella.scenario.editor"/>
    </feature>
    <feature id="org.polarsys.capella.scenario.editor.tests.feature">

diff --git a/releng/org.polarsys.capella.scenario.editor.site/pom.xml b/releng/org.polarsys.capella.scenario.editor.site/pom.xml
@@ -17,12 +17,12 @@
 
 	<artifactId>org.polarsys.capella.scenario.editor.site</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>0.11.1-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.capella.scenario.editor.parent</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.12.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>