Skip to content

Migrate tycho-source-plugin to JSR330 annotations #5532

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

Open
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate tycho-source-plugin to JSR330 annotations #5532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f67bc2
Initial plan
Copilot Oct 25, 2025
6b8bd16
Migrate tycho-source-plugin to JSR330 annotations
Copilot Oct 25, 2025
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
4 changes: 4 additions & 0 deletions tycho-source-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
Expand Down
9 changes: 6 additions & 3 deletions tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@
import java.util.Iterator;
import java.util.List;

import javax.inject.Inject;
import javax.inject.Named;

import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
Expand Down Expand Up @@ -103,7 +105,8 @@ public abstract class AbstractSourceJarMojo extends AbstractMojo {
/**
* The Jar archiver.
*/
@Component(role = Archiver.class, hint = "jar")
@Inject
@Named("jar")
private JarArchiver jarArchiver;

/**
Expand Down Expand Up @@ -162,7 +165,7 @@ public abstract class AbstractSourceJarMojo extends AbstractMojo {
/**
* Used for attaching the source jar to the project.
*/
@Component
@Inject
private MavenProjectHelper projectHelper;

/**
Expand Down
11 changes: 6 additions & 5 deletions tycho-source-plugin/src/main/java/org/eclipse/tycho/source/OsgiSourceMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@
import java.util.jar.JarFile;
import java.util.stream.Collectors;

import javax.inject.Inject;

import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
Expand Down Expand Up @@ -161,16 +162,16 @@ public class OsgiSourceMojo extends AbstractSourceJarMojo {
@Parameter(defaultValue = ReactorProject.SOURCE_ARTIFACT_CLASSIFIER)
private String classifier;

@Component(role = TychoProject.class)
@Inject
private Map<String, TychoProject> projectTypes;

@Component
@Inject
private IncludeValidationHelper includeValidationHelper;

@Component
@Inject
private BundleReader bundleReader;

@Component
@Inject
private BuildPropertiesParser buildPropertiesParser;

public void setBuildPropertiesParser(BuildPropertiesParser buildPropertiesParser) {
Expand Down
22 changes: 12 additions & 10 deletions tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
import java.util.Properties;
import java.util.Set;

import javax.inject.Inject;
import javax.inject.Named;

import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.execution.MavenSession;
Expand All @@ -34,7 +37,6 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
Expand All @@ -45,7 +47,6 @@
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.AbstractScanner;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.tycho.BuildProperties;
Expand Down Expand Up @@ -209,7 +210,7 @@ public enum MissingSourcesAction {
@Parameter
private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();

@Component
@Inject
private BuildPropertiesParser buildPropertiesParser;

/**
Expand All @@ -219,22 +220,23 @@ public enum MissingSourcesAction {
@Parameter(property = "project.build.finalName")
private String finalName;

@Component(role = Archiver.class, hint = "jar")
@Inject
@Named("jar")
private JarArchiver jarArchiver;

@Component
@Inject
private MavenProjectHelper projectHelper;

@Component
@Inject
private LicenseFeatureHelper licenseFeatureHelper;

@Component()
@Inject
P2ResolverFactory factory;

@Component
private Logger logger;
@Inject
private org.slf4j.Logger logger;

@Component
@Inject
private TychoProjectManager projectManager;

@Override
Expand Down
25 changes: 11 additions & 14 deletions ...source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureP2MetadataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.eclipse.tycho.IArtifactFacade;
import org.eclipse.tycho.IDependencyMetadata;
import org.eclipse.tycho.OptionalResolutionAction;
Expand All @@ -41,12 +40,14 @@
import de.pdark.decentxml.Element;
import de.pdark.decentxml.XMLDeclaration;

@Component(role = P2MetadataProvider.class, hint = "org.eclipse.tycho.source.SourceFeatureP2MetadataProvider")
public class SourceFeatureP2MetadataProvider implements P2MetadataProvider, Initializable {
@Requirement
private Logger log;
@Named("org.eclipse.tycho.source.SourceFeatureP2MetadataProvider")
@Singleton
public class SourceFeatureP2MetadataProvider implements P2MetadataProvider {
@Inject
private org.slf4j.Logger log;

@Requirement(hint = DependencyMetadataGenerator.DEPENDENCY_ONLY)
@Inject
@Named(DependencyMetadataGenerator.DEPENDENCY_ONLY)
private DependencyMetadataGenerator generator;

@Override
Expand Down Expand Up @@ -107,8 +108,4 @@ static Feature createPreliminarySourceFeature(MavenProject project) throws IOExc
return sourceFeature;
}

@Override
public void initialize() throws InitializationException {
}

}
17 changes: 10 additions & 7 deletions ...o-source-plugin/src/main/java/org/eclipse/tycho/source/SourceInstallableUnitProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
Expand All @@ -45,19 +47,20 @@
/**
* provides a preliminary IU to make generated sources visible to the project dependencies stage
*/
@Component(role = InstallableUnitProvider.class, hint = "source")
@Named("source")
@Singleton
public class SourceInstallableUnitProvider implements InstallableUnitProvider {

@Requirement
@Inject
private InstallableUnitPublisher publisher;

@Requirement
@Inject
private BundleReader bundleReader;

@Requirement(role = TychoProject.class)
@Inject
private Map<String, TychoProject> projectTypes;

@Requirement
@Inject
private BuildPropertiesParser buildPropertiesParser;

@Override
Expand Down
22 changes: 10 additions & 12 deletions tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourcesP2MetadataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.eclipse.tycho.BuildPropertiesParser;
import org.eclipse.tycho.IArtifactFacade;
import org.eclipse.tycho.IDependencyMetadata;
Expand All @@ -32,13 +32,15 @@
import org.eclipse.tycho.p2resolver.AttachedArtifact;
import org.eclipse.tycho.resolver.P2MetadataProvider;

@Component(role = P2MetadataProvider.class, hint = "SourcesP2MetadataProvider")
public class SourcesP2MetadataProvider implements P2MetadataProvider, Initializable {
@Named("SourcesP2MetadataProvider")
@Singleton
public class SourcesP2MetadataProvider implements P2MetadataProvider {

@Requirement(hint = DependencyMetadataGenerator.SOURCE_BUNDLE)
@Inject
@Named(DependencyMetadataGenerator.SOURCE_BUNDLE)
private DependencyMetadataGenerator sourcesGenerator;

@Requirement
@Inject
private BuildPropertiesParser buildPropertiesParser;

@Override
Expand All @@ -51,8 +53,4 @@ public Map<String, IDependencyMetadata> getDependencyMetadata(MavenSession sessi
}
return null;
}

@Override
public void initialize() throws InitializationException {
}
}
Loading