pool/maven-plugin-testing
SHA256
19
0
Fork 2
Code Issues Pull Requests Activity

Compare commits

merge into: pool:leap-16.1
Branches Tags
pool:factory pool:leap-16.0 pool:leap-16.1
...
pull from: pool:factory
Branches Tags
pool:factory pool:leap-16.0 pool:leap-16.1

1 Commits
leap-16.1 ... factory

Author SHA256 Message Date
Fridrich Štrba
99a6fbf4b9 3.4.0 2025-11-04 10:37:21 +01:00
8 changed files with 71 additions and 195 deletions
Expand all files Collapse all files

39
0001-Port-to-plexus-utils-3.0.21.patch
View File

@@ -1,39 +0,0 @@
From a64a54900d64d7f2b699979a8abd46506d6779ad Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 27 Mar 2015 06:51:35 +0100
Subject: [PATCH 1/2] Port to plexus-utils 3.0.21
---
.../main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
index 8b047a7..4d35dc4 100644
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
@@ -156,7 +156,7 @@ public abstract class AbstractMojoTestCase
XmlStreamReader reader = new XmlStreamReader( is );
InterpolationFilterReader interpolationFilterReader =
- new InterpolationFilterReader( new BufferedReader( reader ), container.getContext().getContextData() );
+ new InterpolationFilterReader( new BufferedReader( reader ), ( Map ) container.getContext().getContextData() );
PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationFilterReader );
diff --git a/pom.xml b/pom.xml
index 0aab541..d0f0e7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <version>3.0.21</version>
<scope>provided</scope>
</dependency>
--
2.5.0

75
0002-Port-to-current-maven-artifact.patch
View File

@@ -1,75 +0,0 @@
From c36cd3c3eaad3ce9486d7c49c50b9d309a0d5fe1 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 24 Nov 2015 12:59:13 +0100
Subject: [PATCH 2/2] Port to current maven-artifact
---
.../apache/maven/plugin/testing/stubs/StubArtifactCollector.java | 6 +++---
.../org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
index be7e156..c6a059e 100644
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
@@ -51,7 +51,7 @@ public class StubArtifactCollector
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactResolutionRequest repositoryRequest,
+ Map<String, Artifact> managedVersions, ArtifactResolutionRequest repositoryRequest,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
@@ -60,7 +60,7 @@ public class StubArtifactCollector
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
@@ -70,7 +70,7 @@ public class StubArtifactCollector
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners )
diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
index cc02ec0..2d90152 100644
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
@@ -141,7 +141,7 @@ public class StubArtifactResolver
* @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource)
*/
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -153,7 +153,7 @@ public class StubArtifactResolver
* @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter)
*/
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source,
ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException
@@ -166,7 +166,7 @@ public class StubArtifactResolver
* @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter, java.util.List)
*/
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source,
ArtifactFilter filter, List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException
--
2.5.0

3
maven-plugin-testing-3.3.0-source-release.zip
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e59a7fc8179f0cd659875d94c396020a66f1c8c2b716c00ef9d39623b2926f97
size 135974

BIN
maven-plugin-testing-3.4.0-source-release.zip LFS Normal file
View File

Binary file not shown.

19
maven-plugin-testing-blocked.patch
View File

@@ -1,19 +0,0 @@
--- maven-plugin-testing-3.3.0/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java 2014-12-17 20:13:58.000000000 +0100
+++ maven-plugin-testing-3.3.0/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java 2021-04-23 11:59:52.418851409 +0200
@@ -228,6 +228,16 @@
}
+ public void setBlocked( boolean blocked)
+ {
+
+ }
+
+ public boolean isBlocked()
+ {
+ return false;
+ }
+
public List<String> findVersions( Artifact artifact )
{
return Collections.emptyList();

BIN
maven-plugin-testing-build.tar.xz LFS
View File

Binary file not shown.

45
maven-plugin-testing.changes
View File

@@ -1,3 +1,48 @@
-------------------------------------------------------------------
Tue Nov 4 09:30:53 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Update to version 3.4.0
* New features and improvements
+ Use default pom.xml when Basedir is set
+ Add MavenProject, MojoExecution to session scope
+ Support classpath in Basedir
+ Add MavenSession to session scope
+ Add default mock for MavenProject
+ Use plexus-testing 2.0.0 and improvements
+ Add support for Provides annotation
+ Improve JUnit5 extension, make similar to Maven 4
implementation
+ Add release-drafter and automation GitHub Action
+ MPLUGINTESTING-91: Maven 3 compatible and improvements
+ MPLUGINTESTING-90: Get rid of maven-compat
+ MPLUGINTESTING-84: Support Junit 5 + Maven 3
+ MPLUGINTESTING-78: Switch to maven 4 and the new api
+ MPLUGINTESTING-74: Using generics to return the matched type
for lookup and getVariableValue methods
+ MPLUGINTESTING-71: Require Java 8
* Documentation updates
+ Add migration notes for 3.4.0
+ Update documentation
+ Convert current documentation to markdown
* Maintenance
+ Update site descriptor to 2.0.0, simple update faq
+ Add more tests for MojoParameter and Basedir
+ Cleanups dependencies
+ Remove unused ResolverExpressionEvaluatorStub in JUnit5
implementation
+ Use getters and setters for testBasedir instead of reflection
+ MPLUGINTESTING-92: Refresh download page
+ MNG-6829: Replace any StringUtils#isEmpty(String) and
#isNotEmpty(String)
+ MPLUGINTESTING-70: Move maven-compat to test scope
+ Get rid of warnings, cleanup
+ MPLUGINTESTING-67: fix mailing list links
- Removed patches:
* 0001-Port-to-plexus-utils-3.0.21.patch
* 0002-Port-to-current-maven-artifact.patch
* maven-plugin-testing-blocked.patch
+ not needed any more with this version
-------------------------------------------------------------------
Mon Jun 10 16:38:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>

78
maven-plugin-testing.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package maven-plugin-testing
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: maven-plugin-testing
Version: 3.3.0
Version: 3.4.0
Release: 0
Summary: Maven Plugin Testing
License: Apache-2.0
@@ -25,27 +25,25 @@ Group: Development/Libraries/Java
URL: https://maven.apache.org/plugin-testing/
Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.tar.xz
Patch0: 0001-Port-to-plexus-utils-3.0.21.patch
Patch1: 0002-Port-to-current-maven-artifact.patch
Patch2: %{name}-blocked.patch
BuildRequires: ant
BuildRequires: apache-commons-io
BuildRequires: easymock
BuildRequires: apiguardian
BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: google-guice
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: maven-invoker
BuildRequires: junit5-minimal
BuildRequires: maven-lib
BuildRequires: maven-resolver-api
BuildRequires: maven-wagon-provider-api
BuildRequires: mockito
BuildRequires: plexus-archiver
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-testing >= 2.0.0
BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: sisu-plexus
BuildRequires: slf4j
BuildRequires: unzip
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
@@ -66,42 +64,16 @@ API documentation for %{name}.
%package harness
Summary: Maven Plugin Testing Mechanism
Group: Development/Libraries/Java
Obsoletes: %{name}-tools < %{version}
Obsoletes: maven-test-tools < %{version}
%description harness
The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
%package tools
Summary: Maven Plugin Testing Tools
Group: Development/Libraries/Java
%description tools
A set of useful tools to help the Maven Plugin testing.
%package -n maven-test-tools
Summary: Maven Testing Tool
Group: Development/Libraries/Java
%description -n maven-test-tools
Framework to test Maven Plugins with Easymock objects.
%prep
%setup -q -a1
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :maven-site-plugin
for i in maven-plugin-testing-harness maven-plugin-testing-tools; do
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i}
done
sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
# needs network for some reason
rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 maven-plugin-testing-harness
%{mvn_alias} : org.apache.maven.shared:
@@ -110,41 +82,37 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/
%build
mkdir -p lib
build-jar-repository -s lib \
commons-io \
easymock \
apiguardian/apiguardian-api \
atinject \
google-guice \
junit \
maven-invoker/maven-invoker \
junit5/junit-jupiter-api \
junit5/junit-platform-commons \
maven/maven-artifact \
maven/maven-compat \
maven/maven-core \
maven/maven-model-builder \
maven/maven-model \
maven/maven-plugin-api \
maven/maven-resolver-provider \
maven/maven-settings \
maven-resolver/maven-resolver-api \
maven-shared-utils/maven-shared-utils \
maven-wagon/provider-api \
mockito/mockito-core \
org.eclipse.sisu.plexus \
plexus/archiver \
plexus-classworlds \
plexus-containers/plexus-component-annotations \
plexus/testing \
plexus/utils \
plexus/xml
plexus/xml \
slf4j/api
%{ant} \
-Dtest.skip=true \
package javadoc
%{mvn_artifact} pom.xml
mkdir -p target/site/apidocs
for i in maven-plugin-testing-harness maven-plugin-testing-tools maven-test-tools; do
cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
%{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar
done
%{mvn_artifact} maven-plugin-testing-harness/pom.xml maven-plugin-testing-harness/target/maven-plugin-testing-harness-%{version}.jar
%install
%mvn_install
%mvn_install -J maven-plugin-testing-harness/target/site/apidocs
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles-%{name}
@@ -153,10 +121,6 @@ done
%files harness -f .mfiles-%{name}-harness
%files tools -f .mfiles-%{name}-tools
%files -n maven-test-tools -f .mfiles-maven-test-tools
%files javadoc -f .mfiles-javadoc
%license LICENSE
%doc NOTICE