Migrate tycho-sourceref-jgit to JSR330

eclipse-tycho · Jun 19, 2024 · a45ec40 · a45ec40
1 parent 8a012d6
commit a45ec40
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,6 +65,7 @@
 		<pluginToolsVersion>3.13.1</pluginToolsVersion>
 		<jgit-version>6.10.0.202406032230-r</jgit-version>
 		<maven-version>3.9.8</maven-version>
+		<sisu-version>0.9.0.M2</sisu-version>
 		<minimal-maven-version>3.9.0</minimal-maven-version>
 		<!-- When updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
 		<surefire-version>3.3.0</surefire-version>
@@ -136,7 +137,7 @@
 				<groupId>org.eclipse.sisu</groupId>
 				<artifactId>org.eclipse.sisu.plexus</artifactId>
 				<!-- classes from plexus-container-default come with the maven installation -->
-				<version>0.9.0.M2</version>
+				<version>${sisu-version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -510,6 +511,20 @@
 					<artifactId>maven-invoker-plugin</artifactId>
 					<version>3.7.0</version>
 				</plugin>
+				<plugin>
+		        	<groupId>org.eclipse.sisu</groupId>
+		        	<artifactId>sisu-maven-plugin</artifactId>
+		        	<version>${sisu-version}</version>
+		        	<executions>
+			          <execution>
+			            <id>index-project</id>
+			            <goals>
+			              <goal>main-index</goal>
+			              <goal>test-index</goal>
+			            </goals>
+			          </execution>
+			        </executions>
+	            </plugin>
 			</plugins>
 		</pluginManagement>
 	</build>

diff --git a/tycho-extras/tycho-sourceref-jgit/pom.xml b/tycho-extras/tycho-sourceref-jgit/pom.xml
@@ -55,9 +55,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-component-metadata</artifactId>
-			</plugin>
+		        <groupId>org.eclipse.sisu</groupId>
+		        <artifactId>sisu-maven-plugin</artifactId>
+	        </plugin>
 		</plugins>
 	</build>
 

diff --git a/...t/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java b/...t/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java
@@ -16,9 +16,11 @@
 import java.io.IOException;
 import java.net.URI;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.AmbiguousObjectException;
@@ -30,7 +32,8 @@
 import org.eclipse.tycho.packaging.sourceref.ScmUrl;
 import org.eclipse.tycho.packaging.sourceref.SourceReferencesProvider;
 
-@Component(role = SourceReferencesProvider.class, hint = "git")
+@Named("git")
+@Singleton
 public class JGitSourceReferencesProvider implements SourceReferencesProvider {
 
     @Override