[maven-reporting-exec] Port to Maven 3.1.0, Eclipse Aether and Eclipse Sisu
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Jul 24 11:13:15 UTC 2013
commit e9221b5b9a75bf05bd5de4eaaade1047bec04ff5
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed Jul 24 13:00:53 2013 +0200
Port to Maven 3.1.0, Eclipse Aether and Eclipse Sisu
...ven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch | 181 ++++++++++++++++++++
maven-reporting-exec.spec | 23 ++-
2 files changed, 194 insertions(+), 10 deletions(-)
---
diff --git a/0001-Port-to-Maven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch b/0001-Port-to-Maven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch
new file mode 100644
index 0000000..f9f1831
--- /dev/null
+++ b/0001-Port-to-Maven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch
@@ -0,0 +1,181 @@
+From 24e6e7924f028ff69da7d25547e2de1c58a3ecd1 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Wed, 24 Jul 2013 12:53:37 +0200
+Subject: [PATCH] Port to Maven 3.1.0, Eclipse Aether and Eclipse Sisu
+
+---
+ pom.xml | 31 +++++-----------------
+ .../exec/DefaultMavenPluginManagerHelper.java | 29 ++------------------
+ .../reporting/exec/DefaultMavenReportExecutor.java | 6 ++---
+ .../reporting/exec/MavenPluginManagerHelper.java | 2 +-
+ .../exec/TestDefaultMavenReportExecutor.java | 10 +++----
+ 5 files changed, 17 insertions(+), 61 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c9f3247..441377d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -51,7 +51,7 @@
+ </distributionManagement>
+
+ <properties>
+- <mavenVersion>3.0</mavenVersion>
++ <mavenVersion>3.1.0</mavenVersion>
+ <plexusVersion>1.5.4</plexusVersion>
+ <maven.site.path>shared-archives/maven-reporting-exec-LATEST</maven.site.path>
+ </properties>
+@@ -104,19 +104,6 @@
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+
+- <!-- Sonatype Aether for Maven 3.0.x -->
+- <dependency>
+- <groupId>org.sonatype.aether</groupId>
+- <artifactId>aether-api</artifactId>
+- <version>1.7</version>
+- <optional>true</optional>
+- </dependency>
+- <dependency>
+- <groupId>org.sonatype.aether</groupId>
+- <artifactId>aether-util</artifactId>
+- <version>1.7</version>
+- </dependency>
+-
+ <!-- Eclipse Aether for Maven 3.1.x -->
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+@@ -168,16 +155,10 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.sonatype.aether</groupId>
++ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+- <version>1.7</version>
++ <version>0.9.0.M2</version>
+ <scope>test</scope>
+- <exclusions>
+- <exclusion>
+- <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
+- </exclusion>
+- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+@@ -217,9 +198,9 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.sonatype.sisu</groupId>
+- <artifactId>sisu-inject-plexus</artifactId>
+- <version>2.2.0</version>
++ <groupId>org.eclipse.sisu</groupId>
++ <artifactId>org.eclipse.sisu.plexus</artifactId>
++ <version>0.0.0.M2a</version>
+ <scope>provided</scope>
+ </dependency>
+
+diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
+index 0fe9fca..2913bd6 100644
+--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
++++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
+@@ -34,7 +34,7 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor;
+ import org.codehaus.plexus.component.annotations.Component;
+ import org.codehaus.plexus.component.annotations.Requirement;
+ import org.codehaus.plexus.logging.Logger;
+-import org.sonatype.aether.repository.RemoteRepository;
++import org.eclipse.aether.repository.RemoteRepository;
+
+ /**
+ * {@link MavenPluginManager} helper to deal with API changes between Maven 3.0.x and 3.1.x, ie switch from Sonatype Aether
+@@ -99,34 +99,9 @@ public class DefaultMavenPluginManagerHelper
+ }
+ }
+
+- private boolean isEclipseAether()
+- {
+- if ( isEclipseAether == null )
+- {
+- try
+- {
+- Thread.currentThread().getContextClassLoader().loadClass( "org.sonatype.aether.graph.DependencyFilter" );
+- isEclipseAether = false;
+- }
+- catch ( ClassNotFoundException e )
+- {
+- isEclipseAether = true;
+- }
+- }
+-
+- return isEclipseAether.booleanValue();
+- }
+-
+ private Object createExclusionsDependencyFilter( List<String> artifactIdsList )
+ {
+- if ( isEclipseAether() )
+- {
+- return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList );
+- }
+- else
+- {
+- return new org.sonatype.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList );
+- }
++ return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList );
+ }
+
+ public PluginDescriptor getPluginDescriptor( Plugin plugin, List<RemoteRepository> repositories,
+diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+index e8bba45..c1c4047 100644
+--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
++++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+@@ -53,9 +53,9 @@ import org.codehaus.plexus.logging.Logger;
+ import org.apache.maven.shared.utils.StringUtils;
+ import org.codehaus.plexus.util.xml.Xpp3Dom;
+ import org.codehaus.plexus.util.xml.Xpp3DomUtils;
+-import org.sonatype.aether.RepositorySystemSession;
+-import org.sonatype.aether.graph.DependencyFilter;
+-import org.sonatype.aether.repository.RemoteRepository;
++import org.eclipse.aether.RepositorySystemSession;
++import org.eclipse.aether.graph.DependencyFilter;
++import org.eclipse.aether.repository.RemoteRepository;
+
+ /**
+ * <p>
+diff --git a/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java b/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java
+index 2d6bc97..e8868cd 100644
+--- a/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java
++++ b/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java
+@@ -29,7 +29,7 @@ import org.apache.maven.plugin.PluginContainerException;
+ import org.apache.maven.plugin.PluginDescriptorParsingException;
+ import org.apache.maven.plugin.PluginResolutionException;
+ import org.apache.maven.plugin.descriptor.PluginDescriptor;
+-import org.sonatype.aether.repository.RemoteRepository;
++import org.eclipse.aether.repository.RemoteRepository;
+
+ /**
+ * {@link MavenPluginManager} helper to deal with API changes between Maven 3.0.x and 3.1.x.
+diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+index a6c37bf..adfe03a 100644
+--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
++++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+@@ -44,11 +44,11 @@ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.classworlds.realm.ClassRealm;
+ import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+ import org.codehaus.plexus.logging.Logger;
+-import org.sonatype.aether.RepositorySystemSession;
+-import org.sonatype.aether.artifact.Artifact;
+-import org.sonatype.aether.repository.RemoteRepository;
+-import org.sonatype.aether.repository.WorkspaceReader;
+-import org.sonatype.aether.repository.WorkspaceRepository;
++import org.eclipse.aether.RepositorySystemSession;
++import org.eclipse.aether.artifact.Artifact;
++import org.eclipse.aether.repository.RemoteRepository;
++import org.eclipse.aether.repository.WorkspaceReader;
++import org.eclipse.aether.repository.WorkspaceRepository;
+
+ import java.io.File;
+ import java.util.Collections;
+--
+1.8.1.4
+
diff --git a/maven-reporting-exec.spec b/maven-reporting-exec.spec
index 9803111..69cf25d 100644
--- a/maven-reporting-exec.spec
+++ b/maven-reporting-exec.spec
@@ -1,6 +1,6 @@
Name: maven-reporting-exec
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
BuildArch: noarch
Summary: Classes to manage report plugin executions with Maven 3
@@ -8,14 +8,17 @@ License: ASL 2.0
URL: http://maven.apache.org/shared/maven-reporting-exec/
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: maven-local
+BuildRequires: aether-api >= 1:0
+BuildRequires: aether-util >= 1:0
+BuildRequires: aether-connector-wagon >= 1:0
+BuildRequires: sisu-plexus >= 1:0
BuildRequires: maven-invoker-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
BuildRequires: plexus-containers-component-metadata
+Patch0001: 0001-Port-to-Maven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch
+
Requires: java
%description
@@ -24,8 +27,6 @@ managing and configuring reports and their execution.
%package javadoc
Summary: API documentation for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
The API documentation of %{name}.
@@ -34,13 +35,11 @@ The API documentation of %{name}.
%prep
%setup -qn %{name}-%{version}
+%patch0001 -p1
+
# convert CR+LF to LF
sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
-# We have different sonatype groupId and java package name
-find -iname '*.java' -exec sed -i 's/org.eclipse.aether/org.sonatype.aether/g' '{}' ';'
-
-%pom_xpath_set "pom:groupId[text()='org.eclipse.aether']" org.sonatype.aether
%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin
%build
@@ -61,6 +60,10 @@ find -iname '*.java' -exec sed -i 's/org.eclipse.aether/org.sonatype.aether/g' '
%changelog
+* Wed Jul 24 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-4
+- Port to Maven 3.1.0, Eclipse Aether and Eclipse Sisu
+- Resolves: rhbz#985706
+
* Mon Jun 10 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1-3
- Remove unused source
More information about the scm-commits
mailing list