This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-5577 in repository https://gitbox.apache.org/repos/asf/maven.git
commit d9fa4c14417d5d87478c7e08557bd46337f016f9 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Fri Jan 11 03:09:45 2019 +0100 [MNG-5577] Migrate to JSR 300 Annotations - maven-settings-builder --- maven-settings-builder/pom.xml | 12 ++++++------ .../maven/settings/building/DefaultSettingsBuilder.java | 15 +++++++++------ .../maven/settings/crypto/DefaultSettingsDecrypter.java | 16 ++++++++++++---- .../apache/maven/settings/io/DefaultSettingsReader.java | 7 +++++-- .../apache/maven/settings/io/DefaultSettingsWriter.java | 7 +++++-- .../settings/validation/DefaultSettingsValidator.java | 7 +++++-- 6 files changed, 42 insertions(+), 22 deletions(-) diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index 381f5b1..68d5da9 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -54,10 +54,6 @@ under the License. <artifactId>plexus-interpolation</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-annotations</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-settings</artifactId> </dependency> @@ -65,13 +61,17 @@ under the License. <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> + <groupId>org.eclipse.sisu</groupId> + <artifactId>sisu-maven-plugin</artifactId> </plugin> </plugins> </build> diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java index 3cdae7d..7692510 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java @@ -36,31 +36,34 @@ import org.apache.maven.settings.io.SettingsReader; import org.apache.maven.settings.io.SettingsWriter; import org.apache.maven.settings.merge.MavenSettingsMerger; import org.apache.maven.settings.validation.SettingsValidator; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.interpolation.EnvarBasedValueSource; import org.codehaus.plexus.interpolation.InterpolationException; import org.codehaus.plexus.interpolation.InterpolationPostProcessor; import org.codehaus.plexus.interpolation.PropertiesBasedValueSource; import org.codehaus.plexus.interpolation.RegexBasedInterpolator; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + /** * Builds the effective settings from a user settings file and/or a global settings file. * * @author Benjamin Bentmann */ -@Component( role = SettingsBuilder.class ) +@Named +@Singleton public class DefaultSettingsBuilder implements SettingsBuilder { - @Requirement + @Inject private SettingsReader settingsReader; - @Requirement + @Inject private SettingsWriter settingsWriter; - @Requirement + @Inject private SettingsValidator settingsValidator; private MavenSettingsMerger settingsMerger = new MavenSettingsMerger(); diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java index 671a20d..eb974b9 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java @@ -27,24 +27,32 @@ import org.apache.maven.settings.Server; import org.apache.maven.settings.building.DefaultSettingsProblem; import org.apache.maven.settings.building.SettingsProblem; import org.apache.maven.settings.building.SettingsProblem.Severity; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + /** * Decrypts passwords in the settings. * * @author Benjamin Bentmann */ -@Component( role = SettingsDecrypter.class ) +@Named +@Singleton public class DefaultSettingsDecrypter implements SettingsDecrypter { - @Requirement( hint = "maven" ) private SecDispatcher securityDispatcher; + @Inject + public DefaultSettingsDecrypter( final @Named( "maven" ) SecDispatcher securityDispatcher ) + { + this.securityDispatcher = securityDispatcher; + } + @Override public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request ) { diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java index fa95613..d5daf16 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java @@ -28,16 +28,19 @@ import java.util.Objects; import org.apache.maven.settings.Settings; import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import javax.inject.Named; +import javax.inject.Singleton; + /** * Handles deserialization of settings from the default textual format. * * @author Benjamin Bentmann */ -@Component( role = SettingsReader.class ) +@Named +@Singleton public class DefaultSettingsReader implements SettingsReader { diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java index 96af1a3..2467bb6 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java @@ -29,15 +29,18 @@ import java.util.Objects; import org.apache.maven.settings.Settings; import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.WriterFactory; +import javax.inject.Named; +import javax.inject.Singleton; + /** * Handles serialization of settings into the default textual format. * * @author Benjamin Bentmann */ -@Component( role = SettingsWriter.class ) +@Named +@Singleton public class DefaultSettingsWriter implements SettingsWriter { diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java index 1e31f50..ff00b84 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java @@ -31,13 +31,16 @@ import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; import org.apache.maven.settings.building.SettingsProblem.Severity; import org.apache.maven.settings.building.SettingsProblemCollector; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; +import javax.inject.Named; +import javax.inject.Singleton; + /** * @author Milos Kleint */ -@Component( role = SettingsValidator.class ) +@Named +@Singleton public class DefaultSettingsValidator implements SettingsValidator {
