You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/01/10 02:45:43 UTC
[maven-plugin-tools] branch MPLUGIN-387 updated (28027be -> de9a935)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git.
discard 28027be [MPLUGIN-387] Bump plexus-compiler-manager to 2.8.8
discard 8ad76d5 [MPLUGIN-387] Switch from fest-assert to AssertJ 2.9.1
discard dda9b65 [MPLUGIN-387] Bump plexus-archiver to 4.2.6
new 6c97d5f [MPLUGIN-387] Bump plexus-archiver to 4.2.5
new 781a332 [MPLUGIN-387] Switch from fest-assert to AssertJ 2.9.1
new 8aea132 [MPLUGIN-387] Bump plexus-compiler-manager to 2.8.8
new 2efc058 [MPLUGIN-387] Bump xmlunit to 1.6
new de9a935 [MPLUGIN-387] Bump Ant to 1.9.16
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (28027be)
\
N -- N -- N refs/heads/MPLUGIN-387 (de9a935)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-plugin-tools-annotations/pom.xml | 4 +-
maven-plugin-tools-java/pom.xml | 2 +-
maven-script/maven-script-ant/pom.xml | 2 +-
.../apache/maven/script/ant/AntMojoWrapper.java | 4 +-
.../maven/script/ant/AntMojoWrapperTest.java | 108 +++++++--------------
.../test/resources/META-INF/maven/plugin-2.0.xml | 63 ------------
pom.xml | 2 +-
7 files changed, 42 insertions(+), 143 deletions(-)
delete mode 100644 maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.0.xml
[maven-plugin-tools] 01/05: [MPLUGIN-387] Bump plexus-archiver to 4.2.5
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 6c97d5f4f3ab44d744d23c7865cef8c2fca3ce5f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 02:07:33 2022 +0100
[MPLUGIN-387] Bump plexus-archiver to 4.2.5
---
maven-plugin-tools-annotations/pom.xml | 1 +
maven-script/maven-script-ant/pom.xml | 1 +
.../src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 426e7ea..73b343d 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -74,6 +74,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
+ <version>4.2.5</version><!-- Java 7 -->
</dependency>
<dependency>
diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml
index f52bc85..ce96282 100644
--- a/maven-script/maven-script-ant/pom.xml
+++ b/maven-script/maven-script-ant/pom.xml
@@ -60,6 +60,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
+ <version>4.2.5</version><!-- Java 7 -->
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java b/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
index 56eba08..90f33d0 100644
--- a/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
+++ b/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
@@ -34,7 +34,6 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.PropertyHelper;
import org.apache.tools.ant.types.Path;
import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
import org.codehaus.plexus.component.MapOrientedComponent;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
@@ -204,7 +203,8 @@ public class AntMojoWrapper
try
{
- UnArchiver ua = new ZipUnArchiver( pluginJar );
+ ZipUnArchiver ua = new ZipUnArchiver( pluginJar );
+ ua.enableLogging( logger );
ua.extract( resourcesPath, outputDirectory );
}
[maven-plugin-tools] 02/05: [MPLUGIN-387] Switch from fest-assert to AssertJ 2.9.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 781a3322ef4a6b4443b49754afc95ca58f3df9fb
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 02:30:14 2022 +0100
[MPLUGIN-387] Switch from fest-assert to AssertJ 2.9.1
---
maven-plugin-tools-annotations/pom.xml | 6 +++---
.../plugin/extractor/annotations/TestAnnotationsReader.java | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 73b343d..34c2db2 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -110,9 +110,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
- <version>1.4</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>2.9.1</version><!-- Java 7 -->
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
index b7702df..1f43e56 100644
--- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
+++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
@@ -29,7 +29,6 @@ import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotated
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest;
import org.codehaus.plexus.PlexusTestCase;
-import org.fest.assertions.Assertions;
import java.io.File;
import java.util.Arrays;
@@ -37,6 +36,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* @author Olivier Lamy
*/
@@ -57,7 +58,7 @@ public class TestAnnotationsReader
System.out.println( "mojoAnnotatedClasses:" + mojoAnnotatedClasses );
- Assertions.assertThat( mojoAnnotatedClasses ).isNotNull().isNotEmpty().hasSize( 1 );
+ assertThat( mojoAnnotatedClasses ).isNotNull().isNotEmpty().hasSize( 1 );
MojoAnnotatedClass mojoAnnotatedClass = mojoAnnotatedClasses.values().iterator().next();
@@ -78,10 +79,10 @@ public class TestAnnotationsReader
assertEquals( LifecyclePhase.PACKAGE, execute.phase() );
Collection<ComponentAnnotationContent> components = mojoAnnotatedClass.getComponents().values();
- Assertions.assertThat( components ).isNotNull().isNotEmpty().hasSize( 2 );
+ assertThat( components ).isNotNull().isNotEmpty().hasSize( 2 );
Collection<ParameterAnnotationContent> parameters = mojoAnnotatedClass.getParameters().values();
- Assertions.assertThat( parameters ).isNotNull().isNotEmpty().hasSize( 2 ).contains(
+ assertThat( parameters ).isNotNull().isNotEmpty().hasSize( 2 ).contains(
new ParameterAnnotationContent( "bar", null, "thebar", "coolbar", true, false, String.class.getName() ),
new ParameterAnnotationContent( "beer", null, "thebeer", "coolbeer", false, false,
String.class.getName() ) );
[maven-plugin-tools] 04/05: [MPLUGIN-387] Bump xmlunit to 1.6
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 2efc05893b7bfb72243872d41ea1f895d77db6fe
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 02:39:41 2022 +0100
[MPLUGIN-387] Bump xmlunit to 1.6
---
maven-plugin-tools-java/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index 36155d7..5a65aa3 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.3</version>
+ <version>1.6</version>
<scope>test</scope>
</dependency>
</dependencies>
[maven-plugin-tools] 05/05: [MPLUGIN-387] Bump Ant to 1.9.16
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit de9a93564ba5023476e1b215ed2794489a56bddb
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 03:42:30 2022 +0100
[MPLUGIN-387] Bump Ant to 1.9.16
---
.../maven/script/ant/AntMojoWrapperTest.java | 108 +++++++--------------
.../test/resources/META-INF/maven/plugin-2.0.xml | 63 ------------
pom.xml | 2 +-
3 files changed, 36 insertions(+), 137 deletions(-)
diff --git a/maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java b/maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
index 2b50e99..791c87f 100644
--- a/maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
+++ b/maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
@@ -87,16 +87,14 @@ public class AntMojoWrapperTest
{
String pluginXml = "META-INF/maven/plugin-2.1.xml";
- List<String> messages = run( pluginXml, true );
+ List<String> messages = run( pluginXml );
- assertPresence( messages, "Unpacked Ant build scripts (in Maven build directory).", false );
- assertPresence( messages, "Maven parameter expression evaluator for Ant properties.", false );
- assertPresence( messages, "Maven standard project-based classpath references.", false );
- assertPresence( messages, "Maven standard plugin-based classpath references.", false );
- assertPresence( messages,
- "Maven project, session, mojo-execution, or path-translation parameter information is", false );
- assertPresence( messages, "maven-script-ant < 2.1.0, or used maven-plugin-tools-ant < 2.2 during release",
- false );
+ assertPresence( messages, "Unpacked Ant build scripts (in Maven build directory)." );
+ assertPresence( messages, "Maven parameter expression evaluator for Ant properties." );
+ assertPresence( messages, "Maven standard project-based classpath references." );
+ assertPresence( messages, "Maven standard plugin-based classpath references." );
+ assertPresence( messages, "Maven project, session, mojo-execution, or path-translation parameter information is" );
+ assertPresence( messages, "maven-script-ant < 2.1.0, or used maven-plugin-tools-ant < 2.2 during release" );
ArgumentCaptor<BuildEvent> buildEvent = ArgumentCaptor.forClass(BuildEvent.class);
verify( buildListener, atLeastOnce() ).messageLogged( buildEvent.capture() );
@@ -106,52 +104,19 @@ public class AntMojoWrapperTest
assertThat( buildEvent.getValue().getMessage(), endsWith( ".test.jar" ) );
}
- @Test
- public void test20StylePlugin()
- throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
- ComponentConfigurationException, ArchiverException, URISyntaxException
- {
- String pluginXml = "META-INF/maven/plugin-2.0.xml";
-
- List<String> messages = run( pluginXml, false );
-
- assertPresence( messages, "Unpacked Ant build scripts (in Maven build directory).", true );
- assertPresence( messages, "Maven parameter expression evaluator for Ant properties.", true );
- assertPresence( messages, "Maven standard project-based classpath references.", true );
- assertPresence( messages, "Maven standard plugin-based classpath references.", true );
- assertPresence( messages,
- "Maven project, session, mojo-execution, or path-translation parameter information is", true );
- assertPresence( messages, "maven-script-ant < 2.1.0, or used maven-plugin-tools-ant < 2.2 during release", true );
-
- ArgumentCaptor<BuildEvent> buildEvent = ArgumentCaptor.forClass(BuildEvent.class);
- verify( buildListener, atLeastOnce() ).messageLogged( buildEvent.capture() );
-
- // last message
- assertThat( buildEvent.getValue().getMessage(), startsWith( "plugin classpath is: " ) );
- assertThat( buildEvent.getValue().getMessage(), endsWith( "path-is-missing" ) );
- }
-
- private void assertPresence( List<String> messages, String test, boolean shouldBePresent )
+ private void assertPresence( List<String> messages, String test )
{
for ( String message : messages )
{
if ( message.contains( test ) )
{
- if ( !shouldBePresent )
- {
- fail( "Test string: '" + test + "' was found in output, but SHOULD NOT BE THERE." );
- }
+ fail( "Test string: '" + test + "' was found in output, but SHOULD NOT BE THERE." );
return;
}
}
-
- if ( shouldBePresent )
- {
- fail( "Test string: '" + test + "' was NOT found in output, but SHOULD BE THERE." );
- }
}
- private List<String> run( String pluginXml, boolean includeImplied )
+ private List<String> run( String pluginXml )
throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
ComponentConfigurationException, ArchiverException, URISyntaxException
{
@@ -185,43 +150,40 @@ public class AntMojoWrapperTest
Artifact artifact = mock( Artifact.class );
PathTranslator pt = mock( PathTranslator.class );
- if ( includeImplied )
- {
- File pluginXmlFile = Paths.get( resource.toURI() ).toFile();
+ File pluginXmlFile = Paths.get( resource.toURI() ).toFile();
- File jarFile = File.createTempFile( "AntMojoWrapperTest.", ".test.jar" );
- jarFile.deleteOnExit();
+ File jarFile = File.createTempFile( "AntMojoWrapperTest.", ".test.jar" );
+ jarFile.deleteOnExit();
- JarArchiver archiver = new JarArchiver();
- archiver.enableLogging( new ConsoleLogger( Logger.LEVEL_ERROR, "archiver" ) );
- archiver.setDestFile( jarFile );
- archiver.addFile( pluginXmlFile, pluginXml );
- archiver.createArchive();
+ JarArchiver archiver = new JarArchiver();
+ archiver.enableLogging( new ConsoleLogger( Logger.LEVEL_ERROR, "archiver" ) );
+ archiver.setDestFile( jarFile );
+ archiver.addFile( pluginXmlFile, pluginXml );
+ archiver.createArchive();
- when( artifact.getFile() ).thenReturn( jarFile );
+ when( artifact.getFile() ).thenReturn( jarFile );
- Model model = new Model();
+ Model model = new Model();
- Build build = new Build();
- build.setDirectory( "target" );
+ Build build = new Build();
+ build.setDirectory( "target" );
- model.setBuild( build );
+ model.setBuild( build );
- MavenProject project = new MavenProject( model );
- project.setFile( new File( "pom.xml" ).getAbsoluteFile() );
+ MavenProject project = new MavenProject( model );
+ project.setFile( new File( "pom.xml" ).getAbsoluteFile() );
- pd.setPluginArtifact( artifact );
- pd.setArtifacts( Collections.singletonList( artifact ) );
+ pd.setPluginArtifact( artifact );
+ pd.setArtifacts( Collections.singletonList( artifact ) );
- config.put( "project", project );
- config.put( "session", new MavenSession( null, null, null, null, null, null, null, null, null, null ) );
- config.put( "mojoExecution", new MojoExecution( md ) );
+ config.put( "project", project );
+ config.put( "session", new MavenSession( null, null, null, null, null, null, null, null, null, null ) );
+ config.put( "mojoExecution", new MojoExecution( md ) );
- ComponentRequirement cr = new ComponentRequirement();
- cr.setRole( PathTranslator.class.getName() );
+ ComponentRequirement cr = new ComponentRequirement();
+ cr.setRole( PathTranslator.class.getName() );
- wrapper.addComponentRequirement( cr, pt );
- }
+ wrapper.addComponentRequirement( cr, pt );
wrapper.setComponentConfiguration( config );
@@ -251,7 +213,7 @@ public class AntMojoWrapperTest
messages.addAll( tbl.messages );
}
- messages.add( new String( baos.toByteArray() ) );
+ messages.add( baos.toString() );
return messages;
}
@@ -259,7 +221,7 @@ public class AntMojoWrapperTest
private static final class TestBuildListener
implements BuildListener
{
- private List<String> messages = new ArrayList<>();
+ private final List<String> messages = new ArrayList<>();
public void buildFinished( BuildEvent arg0 )
{
diff --git a/maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.0.xml b/maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.0.xml
deleted file mode 100644
index 63f8bf2..0000000
--- a/maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.0.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<plugin>
- <description>Test Plugin</description>
- <groupId>org.myplugin</groupId>
- <artifactId>my-plugin</artifactId>
- <version>1</version>
- <goalPrefix>myplugin</goalPrefix>
- <isolatedRealm>false</isolatedRealm>
- <inheritedByDefault>true</inheritedByDefault>
- <mojos>
- <mojo>
- <goal>test</goal>
- <description>Build a JAR from the current project.</description>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>false</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <implementation>test.build.xml:test</implementation>
- <language>ant</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <parameters>
- <parameter>
- <name>basedir</name>
- <required>true</required>
- <editable>false</editable>
- <type>java.io.File</type>
- </parameter>
- <parameter>
- <name>messageLevel</name>
- <required>true</required>
- <editable>false</editable>
- <type>java.lang.String</type>
- </parameter>
- </parameters>
- <configuration>
- <basedir implementation="java.io.File">${basedir}</basedir>
- <messageLevel implementation="java.lang.String">${messageLevel}</messageLevel>
- </configuration>
- </mojo>
- </mojos>
-</plugin>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index af80d2f..3f57cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<javaVersion>7</javaVersion>
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
<mavenVersion>3.2.5</mavenVersion>
- <antVersion>1.7.1</antVersion>
+ <antVersion>1.9.16</antVersion>
<sisuVersion>0.3.5</sisuVersion>
<mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
[maven-plugin-tools] 03/05: [MPLUGIN-387] Bump plexus-compiler-manager to 2.8.8
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 8aea132a2dd323a18833238f431f59fba8b35e6d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 02:23:54 2022 +0100
[MPLUGIN-387] Bump plexus-compiler-manager to 2.8.8
---
maven-plugin-tools-annotations/pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 34c2db2..64a5595 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -90,13 +90,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-manager</artifactId>
- <version>1.8.6</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.8.8</version><!-- Java 7 -->
<scope>test</scope>
</dependency>
<dependency>