Skip to content

Migrate 10 @Component classes to JSR330 annotations in p2-maven-plugin #5514

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

Merged
laeubi merged 3 commits into from
Oct 24, 2025
Merged

Migrate 10 @Component classes to JSR330 annotations in p2-maven-plugin #5514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e32c366
Initial plan
Copilot Oct 24, 2025
6bcc2c9
Migrate 10 @Component classes to JSR330 in p2-maven-plugin
Copilot Oct 24, 2025
8f4f799
Use lazy init
laeubi Oct 24, 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
5 changes: 5 additions & 0 deletions p2-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<maven>${minimal-maven-version}</maven>
</prerequisites>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.core</artifactId>
Expand Down
12 changes: 8 additions & 4 deletions ...aven-plugin/src/main/java/org/eclipse/tycho/p2maven/DefaultProvisioningAgentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,21 @@

import java.net.URI;

import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.sisu.equinox.EquinoxServiceFactory;

@Component(role = IProvisioningAgentProvider.class)
@Named
@Singleton
public class DefaultProvisioningAgentProvider implements IProvisioningAgentProvider {

@Requirement(hint = "connect")
@Inject
@Named("connect")
private EquinoxServiceFactory serviceFactory;

@Override
Expand Down
23 changes: 13 additions & 10 deletions p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/InstallableUnitGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@
import java.util.jar.Manifest;
import java.util.stream.Stream;

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

import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
Expand Down Expand Up @@ -75,35 +77,36 @@
* Component used to generate {@link IInstallableUnit}s from other artifacts
*
*/
@Component(role = InstallableUnitGenerator.class)
@Named
@Singleton
public class InstallableUnitGenerator {

private static final boolean DUMP_DATA = Boolean.getBoolean("tycho.p2.dump")
|| Boolean.getBoolean("tycho.p2.dump.units");

@Requirement
@Inject
private Logger log;

private static final String KEY_UNITS = "InstallableUnitGenerator.units";

private static final String KEY_ARTIFACT_FILE = "InstallableUnitGenerator.artifactFile";

@Requirement
@Inject
private IProvisioningAgent provisioningAgent;

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

@Requirement
@Inject
private PluginRealmHelper pluginRealmHelper;

@Requirement
@Inject
private InstallableUnitPublisher publisher;

@Requirement
@Inject
private PlexusContainer plexus;

@Requirement
@Inject
ArtifactHandlerManager artifactHandlerManager;

private Map<Artifact, ArtifactUnits> artifactUnitMap = new ConcurrentHashMap<>();
Expand Down
7 changes: 5 additions & 2 deletions p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/InstallableUnitPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
import java.util.Map;
import java.util.Map.Entry;

import org.codehaus.plexus.component.annotations.Component;
import javax.inject.Named;
import javax.inject.Singleton;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
Expand All @@ -37,7 +39,8 @@
/**
* Component that helps publishing units using publisher actions
*/
@Component(role = InstallableUnitPublisher.class)
@Named
@Singleton
public class InstallableUnitPublisher {

/**
Expand Down
11 changes: 7 additions & 4 deletions p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/InstallableUnitSlicer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
import java.util.Map;
import java.util.Objects;

import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.codehaus.plexus.logging.Logger;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
Expand All @@ -36,11 +38,12 @@
/**
* A strategy that computes a slice from a set of all units.
*/
@Component(role = InstallableUnitSlicer.class)
@Named
@Singleton
public class InstallableUnitSlicer {

private static final SlicingOptions DEFAULT_SLICING_OPTIONS = new SlicingOptions();
@Requirement
@Inject
private Logger log;

/**
Expand Down
24 changes: 13 additions & 11 deletions p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/helper/ProxyHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,36 @@
import java.net.Proxy.Type;
import java.net.URI;

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

import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
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.aether.RepositorySystemSession;
import org.eclipse.aether.repository.Authentication;
import org.eclipse.aether.repository.AuthenticationContext;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.tycho.p2maven.repository.P2ArtifactRepositoryLayout;

@Component(role = ProxyHelper.class)
public class ProxyHelper implements Initializable {
@Named
@Singleton
public class ProxyHelper {

@Requirement
@Inject
protected Logger logger;
@Requirement
@Inject
protected LegacySupport context;

@Requirement
@Inject
protected SettingsDecrypterHelper decrypter;

private RepositorySystemSession repositorySession;

@Override
public void initialize() throws InitializationException {
@PostConstruct
public void initialize() {
MavenSession session = context.getSession();
if (session != null) {
repositorySession = session.getRepositorySession();
Expand Down
17 changes: 10 additions & 7 deletions p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/helper/SettingsDecrypterHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,28 @@
* SAP AG - initial API and implementation
*******************************************************************************/
package org.eclipse.tycho.p2maven.helper;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.building.SettingsProblem;
import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
import org.apache.maven.settings.crypto.SettingsDecryptionResult;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;


@Component(role = SettingsDecrypterHelper.class)
@Named
@Singleton
public class SettingsDecrypterHelper {

@Requirement
private Logger logger;
@Requirement
private SettingsDecrypter decrypter;
@Inject
private Logger logger;
@Inject
private SettingsDecrypter decrypter;

public SettingsDecryptionResult decryptAndLogProblems(Proxy proxySettings) {
return decryptAndLogProblems(new DefaultSettingsDecryptionRequest(proxySettings));
Expand Down
6 changes: 4 additions & 2 deletions p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/io/MetadataIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
import java.util.List;
import java.util.Set;

import javax.inject.Named;
import javax.inject.Singleton;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;

import org.codehaus.plexus.component.annotations.Component;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
Expand All @@ -44,7 +45,8 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

@Component(role = MetadataIO.class)
@Named
@Singleton
public class MetadataIO {
private static class Writer extends MetadataWriter {

Expand Down
20 changes: 11 additions & 9 deletions ...plugin/src/main/java/org/eclipse/tycho/p2maven/transport/DefaultTransportCacheConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,32 @@

import java.io.File;

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

import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
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.aether.transfer.TransferListener;
import org.eclipse.tycho.TychoConstants;

@Component(role = TransportCacheConfig.class)
public class DefaultTransportCacheConfig implements TransportCacheConfig, Initializable {
@Named
@Singleton
public class DefaultTransportCacheConfig implements TransportCacheConfig {

private static final boolean DEBUG_REQUESTS = Boolean.getBoolean("tycho.p2.transport.debug");

private boolean offline;
private boolean update;
private boolean interactive;

@Requirement
@Inject
private LegacySupport legacySupport;
private File cacheLocation;

@Override
public void initialize() throws InitializationException {
@PostConstruct
public void initialize() {
File repoDir;
MavenSession session = legacySupport.getSession();
if (session == null) {
Expand Down
Loading
Loading