[maven-reporting-exec] Update to upstream version 1.2
Michal Srb
msrb at fedoraproject.org
Thu Jul 3 11:26:49 UTC 2014
commit c06e953fe99b6a2729379ed8f605bc82a9e88c56
Author: Michal Srb <msrb at redhat.com>
Date: Thu Jul 3 13:24:17 2014 +0200
Update to upstream version 1.2
.gitignore | 1 +
...ven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch | 133 +-------------------
maven-reporting-exec.spec | 16 ++-
sources | 2 +-
4 files changed, 17 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 228734d..8841e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/maven-reporting-exec-1.0.2-source-release.zip
/maven-reporting-exec-1.1-source-release.zip
+/maven-reporting-exec-1.2-source-release.zip
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
index 183266d..1c9c638 100644
--- 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
@@ -1,102 +1,8 @@
-From fe3428ea40a0d7bb7097e971a07cdc965dabbf33 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 | 39 ++++++++--------------
- .../exec/DefaultMavenPluginManagerHelper.java | 29 ++--------------
- .../reporting/exec/DefaultMavenReportExecutor.java | 6 ++--
- .../reporting/exec/MavenPluginManagerHelper.java | 2 +-
- .../exec/TestDefaultMavenReportExecutor.java | 10 +++---
- 5 files changed, 24 insertions(+), 62 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index c9f3247..e282198 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,16 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.sonatype.aether</groupId>
-- <artifactId>aether-connector-wagon</artifactId>
-- <version>1.7</version>
-+ <groupId>org.eclipse.aether</groupId>
-+ <artifactId>aether-transport-wagon</artifactId>
-+ <version>0.9.0.M3</version>
-+ <scope>test</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.eclipse.aether</groupId>
-+ <artifactId>aether-connector-basic</artifactId>
-+ <version>0.9.0.M3</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 +204,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
+index 5be4eea..b15879c 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
+@@ -91,34 +91,9 @@ public class DefaultMavenPluginManagerHelper
}
}
@@ -131,37 +37,7 @@ index 0fe9fca..2913bd6 100644
+ 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.
+ public PluginDescriptor getPluginDescriptor( Plugin plugin, MavenSession session )
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
@@ -183,6 +59,3 @@ index a6c37bf..adfe03a 100644
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 217de13..61c69d5 100644
--- a/maven-reporting-exec.spec
+++ b/maven-reporting-exec.spec
@@ -1,6 +1,6 @@
Name: maven-reporting-exec
-Version: 1.1
-Release: 8%{?dist}
+Version: 1.2
+Release: 1%{?dist}
BuildArch: noarch
Summary: Classes to manage report plugin executions with Maven 3
@@ -24,7 +24,7 @@ BuildRequires: mvn(org.apache.maven:maven-settings-builder)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.apache.maven.wagon:wagon-http-lightweight)
BuildRequires: mvn(org.apache.velocity:velocity)
@@ -32,7 +32,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
BuildRequires: mvn(org.eclipse.aether:aether-api)
-BuildRequires: mvn(org.eclipse.aether:aether-connector-basic)
BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon)
BuildRequires: mvn(org.eclipse.aether:aether-util)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
@@ -63,6 +62,12 @@ sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin
+# Build against Maven 3.x, Eclipse Aether and Eclipse Sisu
+%pom_remove_dep org.sonatype.aether:aether-api
+%pom_remove_dep org.sonatype.aether:aether-util
+%pom_change_dep org.sonatype.aether:aether-connector-wagon org.eclipse.aether:aether-transport-wagon
+%pom_change_dep org.sonatype.sisu:sisu-inject-plexus org.eclipse.sisu:org.eclipse.sisu.plexus
+
%build
# Test are skipped because there are errors with PlexusLogger
# More info possibly here:
@@ -81,6 +86,9 @@ sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/*
%changelog
+* Thu Jul 03 2014 Michal Srb <msrb at redhat.com> - 1.2-1
+- Update to upstream version 1.2
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index b469858..efd3241 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c18a90d6d7b35552a73a71fae5a16526 maven-reporting-exec-1.1-source-release.zip
+843363e3a546bbb08e13ac4904824c3c maven-reporting-exec-1.2-source-release.zip
More information about the scm-commits
mailing list