[#1251] upgrade to Jetty 12

Upgrade to Tycho 3.0.5 Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
eclipse-passage · Nov 15, 2023 · 033e587 · 033e587
1 parent a550b25
commit 033e587
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 34 deletions.
diff --git a/releng/org.eclipse.passage.parent/pom.xml b/releng/org.eclipse.passage.parent/pom.xml
@@ -33,7 +33,7 @@
 		<build.label>${unqualifiedVersion}.${buildQualifier}</build.label>
 
 		<tycho.scmUrl>scm:git:https://github.com/eclipse-passage/passage.git</tycho.scmUrl>
-		<tycho.version>2.7.5</tycho.version>
+		<tycho.version>3.0.5</tycho.version>
 		<cbi-plugins.version>1.3.1</cbi-plugins.version>
 
 		<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
@@ -541,46 +541,18 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho.version}</version>
-				<configuration>
-					<distinctSourceRoots>true</distinctSourceRoots>
-					<strictSrcIncludes>false</strictSrcIncludes>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration>
 				<executions>
 					<execution>
-						<id>attach-source</id>
+						<id>plugin-source</id>
 						<goals>
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-					<reuseBrandingPlugin>false</reuseBrandingPlugin>
-				</configuration>
-				<executions>
 					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
+						<id>feature-source</id>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
-						<configuration>
-							<excludes>
-								<plugin id="org.eclipse.passage.loc.operator" />
-								<plugin id="org.eclipse.passage.lbc.server" />
-								<plugin id="org.eclipse.passage.ldc" />
-							</excludes>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -603,7 +575,7 @@
 				<version>${tycho.version}</version>
 				<dependencies>
 					<dependency>
-						<groupId>org.eclipse.tycho.extras</groupId>
+						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-buildtimestamp-jgit</artifactId>
 						<version>${tycho.version}</version>
 					</dependency>

diff --git a/releng/org.eclipse.passage.publish/pom.xml b/releng/org.eclipse.passage.publish/pom.xml
@@ -17,7 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tycho>2.7.5</version.tycho>
+    <version.tycho>3.0.5</version.tycho>
     <version.passage>stage</version.passage>
     <promotion.passage>drops</promotion.passage>
     <p2.passage>https://download.eclipse.org/passage/${promotion.passage}/release/${version.passage}</p2.passage>