This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6513
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 983252b956d6bedf3fcee04305f9c64ecd2ba625
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Sat Nov 10 21:44:36 2018 +0100
[MNG-6513] Migrate Plexus Tags to Plexus Annotations
---
.../core-it-plugins/maven-it-plugin-configuration/pom.xml | 4 ++++
.../apache/maven/plugin/coreit/CustomComponentConfigurator.java | 4 +++-
.../core-it-plugins/maven-it-plugin-no-default-comp/pom.xml | 4 ++++
.../java/org/apache/maven/plugin/coreit/ConcreteComponent.java | 7 ++++---
.../core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml | 4 ++++
.../maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java | 5 +++--
.../core-it-plugins/maven-it-plugin-singleton-component/pom.xml | 4 ++++
.../main/java/org/apache/maven/plugin/coreit/DefaultComponent.java | 7 ++++---
core-it-support/core-it-wagon/pom.xml | 4 ++++
.../org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java | 4 ++--
.../java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java | 4 ++--
.../maven/wagon/providers/ssh/external/ScpExternalWagon.java | 4 ++--
12 files changed, 40 insertions(+), 15 deletions(-)
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
b/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
index feeaa63..ba05e26 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
@@ -49,6 +49,10 @@ under the License.
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
index 5acdc8a..c295209 100644
---
a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
+++
b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.coreit;
*/
import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.plexus.component.annotations.Component;
import
org.codehaus.plexus.component.configurator.AbstractComponentConfigurator;
import
org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
@@ -32,12 +33,13 @@ import
org.codehaus.plexus.configuration.PlexusConfiguration;
* general support of the specific API.
*
* @author Benjamin Bentmann
- * @plexus.component
role="org.codehaus.plexus.component.configurator.ComponentConfigurator"
role-hint="coreit"
*/
+@Component ( role =
org.codehaus.plexus.component.configurator.ComponentConfigurator.class, hint =
"coreit" )
public class CustomComponentConfigurator
extends AbstractComponentConfigurator
{
+ @Override
public void configureComponent( Object component, PlexusConfiguration
configuration,
ExpressionEvaluator expressionEvaluator,
ClassRealm containerRealm,
ConfigurationListener listener )
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/pom.xml
b/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/pom.xml
index b3a79ee..529441a 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/pom.xml
+++ b/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/pom.xml
@@ -48,5 +48,9 @@ under the License.
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
b/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
index feb78ef..baecacb 100644
---
a/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
+++
b/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
@@ -19,15 +19,16 @@ package org.apache.maven.plugin.coreit;
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+
/**
* A dummy component whose role hint is not "default", yet should be used to
satisfy an ordinary component requirement.
*
- * @plexus.component role="org.apache.maven.plugin.coreit.Component"
role-hint="concrete"
- *
* @author Benjamin Bentmann
*/
+@Component ( role = org.apache.maven.plugin.coreit.Component.class, hint =
"concrete" )
public class ConcreteComponent
- implements Component
+ implements org.apache.maven.plugin.coreit.Component
{
public String getId()
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml
b/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml
index 511cab0..14ae86c 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml
+++ b/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml
@@ -46,6 +46,10 @@ under the License.
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9-stable-1</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java
b/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java
index 6179bf4..4daf109 100644
---
a/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java
+++
b/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java
@@ -19,6 +19,7 @@ package org.apache.maven.its.plugins.plexuslifecycle;
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.LogEnabled;
@@ -28,12 +29,12 @@ import
org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
/**
* @author Olivier Lamy
- * @plexus.component
role="org.apache.maven.its.plugins.plexuslifecycle.FakeComponent"
role-hint="default"
*/
+@Component ( role =
org.apache.maven.its.plugins.plexuslifecycle.FakeComponent.class )
public class DefaultFakeComponent
implements FakeComponent, Contextualizable, Disposable, LogEnabled
{
- Logger logger;
+ private Logger logger;
public void enableLogging( Logger logger )
{
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
b/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
index 28ff48b..bf50f53 100644
---
a/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
+++
b/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/pom.xml
@@ -47,5 +47,9 @@ under the License.
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
b/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
index 9c2d0ab..41e226b 100644
---
a/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
+++
b/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
@@ -19,15 +19,16 @@ package org.apache.maven.plugin.coreit;
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+
/**
* A stateful singleton.
*
- * @plexus.component role="org.apache.maven.plugin.coreit.Component"
role-hint="default"
- *
* @author Benjamin Bentmann
*/
+@Component ( role = org.apache.maven.plugin.coreit.Component.class )
public class DefaultComponent
- implements Component
+ implements org.apache.maven.plugin.coreit.Component
{
private final String id;
diff --git a/core-it-support/core-it-wagon/pom.xml
b/core-it-support/core-it-wagon/pom.xml
index 72ca791..2df737e 100644
--- a/core-it-support/core-it-wagon/pom.xml
+++ b/core-it-support/core-it-wagon/pom.xml
@@ -49,6 +49,10 @@ under the License.
<artifactId>wagon-provider-api</artifactId>
<version>1.0-beta-2</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java
b/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java
index 6ff1148..2c3a778 100644
---
a/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java
+++
b/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java
@@ -28,6 +28,7 @@ import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
+import org.codehaus.plexus.component.annotations.Component;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -40,9 +41,8 @@ import java.util.Properties;
/**
* Shamelessly copied from ScpExternalWagon in this same project...
- *
- * @plexus.component role="org.apache.maven.wagon.Wagon"
role-hint="http-coreit" instantiation-strategy="per-lookup"
*/
+@Component( role = org.apache.maven.wagon.Wagon.class, hint = "http-coreit",
instantiationStrategy = "per-lookup" )
public class CoreItHttpWagon
extends AbstractWagon
{
diff --git
a/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java
b/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java
index 985f036..2c24d3e 100644
---
a/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java
+++
b/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java
@@ -29,6 +29,7 @@ import
org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
+import org.codehaus.plexus.component.annotations.Component;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -41,9 +42,8 @@ import java.util.Properties;
/**
* Shamelessly copied from ScpExternalWagon in this same project...
- *
- * @plexus.component role="org.apache.maven.wagon.Wagon" role-hint="coreit"
instantiation-strategy="per-lookup"
*/
+@Component( role = org.apache.maven.wagon.Wagon.class, hint = "coreit",
instantiationStrategy = "per-lookup" )
public class CoreItWagon
extends AbstractWagon
{
diff --git
a/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
b/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
index 41cfed6..4985d2c 100644
---
a/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
+++
b/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
@@ -28,6 +28,7 @@ import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
+import org.codehaus.plexus.component.annotations.Component;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -41,9 +42,8 @@ import java.util.Properties;
/**
* NOTE: Plexus will only pick this correctly if the Class package and name
are the same as that in core. This is
* because the core component descriptor is read, but the class is read from
the latter JAR.
- *
- * @plexus.component role="org.apache.maven.wagon.Wagon" role-hint="scpexe"
instantiation-strategy="per-lookup"
*/
+@Component( role = org.apache.maven.wagon.Wagon.class, hint = "scpexe",
instantiationStrategy = "per-lookup" )
public class ScpExternalWagon
extends AbstractWagon
{
