Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate tycho-sourceref-jgit to JSR330 #4004

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Migrate tycho-sourceref-jgit to JSR330 #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions tycho-extras/tycho-sourceref-jgit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 5 additions & 2 deletions ...t/src/main/java/org/eclipse/tycho/extras/sourceref/jgit/JGitSourceReferencesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Loading