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 16:24:44 UTC
[maven-plugin-tools] branch master updated (c6d0808 -> c8ddcdc)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git.
from c6d0808 [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
new 7e7de4f [MPLUGIN-387] Upgrade plexus-component-metadata to 2.1.1
new 3615973 [MPLUGIN-387] Upgrade ASM to 9.2 (Java 18 support)
new 86d870f [MPLUGIN-387] Upgrade Doxia/Doxia Tools to 1.11.1
new c7ae057 Added Dependabot configuration
new db18031 [MPLUGIN-387] Bump junit to 4.13.2
new f646104 [MPLUGIN-387] Upgrade BeanShell to 2.0b6
new 9ff352c [MPLUGIN-387] Bump plexus-archiver to 4.2.5
new d296e04 [MPLUGIN-387] Switch from fest-assert to AssertJ 2.9.1
new 036fdeb [MPLUGIN-387] Bump plexus-compiler-manager to 2.8.8
new f14830d [MPLUGIN-387] Bump xmlunit to 1.6
new c8ddcdc [MPLUGIN-387] Bump Ant to 1.9.16
The 11 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:
.github/{workflows/maven.yml => dependabot.yml} | 22 ++---
maven-plugin-plugin/pom.xml | 4 +-
.../annotation-with-inheritance-from-deps/pom.xml | 2 +-
.../it/annotation-with-inheritance-reactor/pom.xml | 2 +-
.../src/it/beanshell-simple/pom.xml | 4 +-
.../pom.xml | 2 +-
.../src/site/apt/examples/beanshell-mojo.apt.vm | 6 +-
maven-plugin-tools-annotations/pom.xml | 15 +--
.../annotations/TestAnnotationsReader.java | 9 +-
maven-plugin-tools-java/pom.xml | 2 +-
maven-script/maven-plugin-tools-beanshell/pom.xml | 4 +-
maven-script/maven-script-ant/pom.xml | 1 +
.../apache/maven/script/ant/AntMojoWrapper.java | 4 +-
.../maven/script/ant/AntMojoWrapperTest.java | 108 +++++++--------------
.../test/resources/META-INF/maven/plugin-2.0.xml | 63 ------------
maven-script/maven-script-beanshell/pom.xml | 4 +-
pom.xml | 14 +--
17 files changed, 77 insertions(+), 189 deletions(-)
copy .github/{workflows/maven.yml => dependabot.yml} (79%)
delete mode 100644 maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.0.xml
[maven-plugin-tools] 09/11: [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 master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 036fdebb5cdbab68d79550cc6a0991f2a96ce4c8
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>
[maven-plugin-tools] 05/11: [MPLUGIN-387] Bump junit to 4.13.2
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit db1803198a77a40917a533e70ece7f066b783bf1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 8 14:45:10 2022 +0100
[MPLUGIN-387] Bump junit to 4.13.2
---
.../src/it/annotation-with-inheritance-from-deps/pom.xml | 2 +-
maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml | 2 +-
.../mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
index 792836c..56840d6 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
@@ -61,7 +61,7 @@ under the License.
<!-- dependency of org.apache.maven.plugin-tools:maven-plugin-tools-annotations:@project.version@:jar:tests -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
index a4236d2..558a545 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml
@@ -59,7 +59,7 @@ under the License.
<!-- dependency of org.apache.maven.plugin-tools:maven-plugin-tools-annotations:@project.version@:jar:tests -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
index 7655fe3..36b0aa3 100644
--- a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
@@ -62,7 +62,7 @@ under the License.
<!-- dependency of org.apache.maven.plugin-tools:maven-plugin-tools-annotations:@project.version@:jar:tests -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
[maven-plugin-tools] 06/11: [MPLUGIN-387] Upgrade BeanShell to 2.0b6
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit f6461047666e7c2dc0103042088825fd6a16a8ab
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 02:03:57 2022 +0100
[MPLUGIN-387] Upgrade BeanShell to 2.0b6
---
maven-plugin-plugin/src/it/beanshell-simple/pom.xml | 4 ++--
maven-plugin-plugin/src/site/apt/examples/beanshell-mojo.apt.vm | 6 +++---
maven-script/maven-plugin-tools-beanshell/pom.xml | 4 ++--
maven-script/maven-script-beanshell/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/maven-plugin-plugin/src/it/beanshell-simple/pom.xml b/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
index 57e8c6f..8caf4be 100644
--- a/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
+++ b/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
@@ -35,9 +35,9 @@
<dependencies>
<dependency>
- <groupId>bsh</groupId>
+ <groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
- <version>1.3.0</version>
+ <version>2.0b6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/maven-plugin-plugin/src/site/apt/examples/beanshell-mojo.apt.vm b/maven-plugin-plugin/src/site/apt/examples/beanshell-mojo.apt.vm
index 451f21b..3051e8f 100644
--- a/maven-plugin-plugin/src/site/apt/examples/beanshell-mojo.apt.vm
+++ b/maven-plugin-plugin/src/site/apt/examples/beanshell-mojo.apt.vm
@@ -35,14 +35,14 @@ Writing a Beanshell Maven Plugin
+------------------
<dependencies>
<dependency>
- <groupId>bsh</groupId>
+ <groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
- <version>1.3.0</version>
+ <version>2.0b6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script-beanshell</artifactId>
- <version>2.2.1</version>
+ <version>3.6.4</version>
</dependency>
</dependencies>
diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml
index 2cafe02..266aebd 100644
--- a/maven-script/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-script/maven-plugin-tools-beanshell/pom.xml
@@ -56,9 +56,9 @@
<!-- misc -->
<dependency>
- <groupId>org.beanshell</groupId>
+ <groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
- <version>1.3.0</version>
+ <version>2.0b6</version>
</dependency>
</dependencies>
diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml
index 9c47ac1..8f8a1e5 100644
--- a/maven-script/maven-script-beanshell/pom.xml
+++ b/maven-script/maven-script-beanshell/pom.xml
@@ -48,9 +48,9 @@ under the License.
</exclusions>
</dependency>
<dependency>
- <groupId>bsh</groupId>
+ <groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
- <version>1.3.0</version>
+ <version>2.0b6</version>
</dependency>
</dependencies>
</project>
[maven-plugin-tools] 08/11: [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 master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit d296e04045026716f1fba5d296a0dd4330cc7f92
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/11: Added Dependabot configuration
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit c7ae057613aab21957197f93d33d6c0e2eb55bf8
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 8 14:38:55 2022 +0100
Added Dependabot configuration
---
.github/dependabot.yml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..778ea2a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+# 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.
+
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
[maven-plugin-tools] 07/11: [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 master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 9ff352cc5680fe4e672dd99d0ff9160fc51a1317
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] 03/11: [MPLUGIN-387] Upgrade Doxia/Doxia Tools to 1.11.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 86d870fbc4a3aa1cd3b8da8a2fde015e5e8dfe43
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 8 14:12:00 2022 +0100
[MPLUGIN-387] Upgrade Doxia/Doxia Tools to 1.11.1
---
maven-plugin-plugin/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 737d911..4a8a715 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -42,8 +42,8 @@
</prerequisites>
<properties>
- <doxiaVersion>1.9.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.9.2</doxia-sitetoolsVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<it.debug>true</it.debug>
</properties>
[maven-plugin-tools] 11/11: [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 master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit c8ddcdcb10d342a5a5e2f38245bb569af5730c7c
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] 01/11: [MPLUGIN-387] Upgrade plexus-component-metadata to 2.1.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 7e7de4f1075225dbd07c9ea4e366077f237daf76
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 8 13:42:54 2022 +0100
[MPLUGIN-387] Upgrade plexus-component-metadata to 2.1.1
---
pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 962c12f..f0ae843 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,13 +185,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
- <version>2.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -286,7 +280,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<executions>
<execution>
<goals>
[maven-plugin-tools] 02/11: [MPLUGIN-387] Upgrade ASM to 9.2 (Java 18 support)
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 3615973c63525eace1d53d11727a0b354ac4c32f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 8 14:07:59 2022 +0100
[MPLUGIN-387] Upgrade ASM to 9.2 (Java 18 support)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f0ae843..af80d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<sisuVersion>0.3.5</sisuVersion>
<mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
- <asmVersion>9.1</asmVersion>
+ <asmVersion>9.2</asmVersion>
<project.build.outputTimestamp>2022-01-08T11:20:47Z</project.build.outputTimestamp>
</properties>
[maven-plugin-tools] 10/11: [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 master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit f14830dba00667fc661a520557fcdff6a8b0d1ad
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>