[java-sig-commits] [maven-eclipse-plugin/f17] Updated to 2.9
Tomas Radej
tradej at fedoraproject.org
Wed Mar 7 09:48:14 UTC 2012
commit 3e93a6a37f973262829788915debffa166d79cc3
Author: Tomas Radej <tradej at redhat.com>
Date: Mon Mar 5 16:35:20 2012 +0100
Updated to 2.9
.gitignore | 1 +
add_compat.patch | 14 ----
kill-bsh.patch | 45 -----------
maven-eclipse-plugin-compat.patch | 16 ++++
...n.patch => maven-eclipse-plugin-exception.patch | 82 +++++++++-----------
maven-eclipse-plugin-ioexception.patch | 15 ++++
maven-eclipse-plugin.spec | 22 +++--
sources | 2 +-
8 files changed, 82 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2071ba3..8af6c5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-eclipse-plugin-2.8.tgz
maven-eclipse-plugin-2.8-source-release.zip
+/maven-eclipse-plugin-2.9-source-release.zip
diff --git a/maven-eclipse-plugin-compat.patch b/maven-eclipse-plugin-compat.patch
new file mode 100644
index 0000000..3acbb26
--- /dev/null
+++ b/maven-eclipse-plugin-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index 3501c0d..0c31661 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -34,6 +34,11 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/reduced_exception.patch b/maven-eclipse-plugin-exception.patch
similarity index 63%
rename from reduced_exception.patch
rename to maven-eclipse-plugin-exception.patch
index 670c6f6..a0db013 100644
--- a/reduced_exception.patch
+++ b/maven-eclipse-plugin-exception.patch
@@ -1,46 +1,36 @@
---- src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java.sav 2010-02-22 02:02:12.000000000 +0200
-+++ src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java 2011-12-05 23:38:30.132320878 +0200
-@@ -545,8 +545,6 @@ public abstract class AbstractIdeSupport
-
- ArtifactResolutionResult artifactResolutionResult = null;
-
-- try
-- {
-
- List listeners = new ArrayList();
-
-@@ -561,21 +559,6 @@ public abstract class AbstractIdeSupport
- artifactCollector.collect( getProjectArtifacts(), project.getArtifact(), managedVersions,
- localRepo, project.getRemoteArtifactRepositories(),
- getArtifactMetadataSource(), null, listeners );
-- }
-- catch ( ArtifactResolutionException e )
-- {
-- getLog().debug( e.getMessage(), e );
-- getLog().error(
-- Messages.getString( "AbstractIdeSupportMojo.artifactresolution", new Object[] { //$NON-NLS-1$
-- e.getGroupId(), e.getArtifactId(), e.getVersion(),
-- e.getMessage() } ) );
--
-- // if we are here artifactResolutionResult is null, create a project without dependencies but
-- // don't fail
-- // (this could be a reactor projects, we don't want to fail everything)
-- // Causes MECLIPSE-185. Not sure if it should be handled this way??
-- return new IdeDependency[0];
-- }
-
- // keep track of added reactor projects in order to avoid duplicates
- Set emittedReactorProjectId = new HashSet();
---- src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java.sav 2010-02-22 02:02:14.000000000 +0200
-+++ src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java 2011-12-05 23:45:06.631581161 +0200
-@@ -407,10 +407,6 @@ public class InstallPluginsMojo
- {
- throw new MojoExecutionException( "Could not extract: " + artifactFile, e );
- }
-- catch ( IOException e )
-- {
-- throw new MojoExecutionException( "Could not extract: " + artifactFile, e );
-- }
- }
- }
-
+diff --git a/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java b/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
+index fcab66c..87782cb 100644
+--- a/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
++++ b/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
+@@ -545,9 +545,6 @@ public abstract class AbstractIdeSupportMojo
+
+ ArtifactResolutionResult artifactResolutionResult = null;
+
+- try
+- {
+-
+ List listeners = new ArrayList();
+
+ if ( logger.isDebugEnabled() )
+@@ -561,21 +558,6 @@ public abstract class AbstractIdeSupportMojo
+ artifactCollector.collect( getProjectArtifacts(), project.getArtifact(), managedVersions,
+ localRepo, project.getRemoteArtifactRepositories(),
+ getArtifactMetadataSource(), null, listeners );
+- }
+- catch ( ArtifactResolutionException e )
+- {
+- getLog().debug( e.getMessage(), e );
+- getLog().error(
+- Messages.getString( "AbstractIdeSupportMojo.artifactresolution", new Object[] { //$NON-NLS-1$
+- e.getGroupId(), e.getArtifactId(), e.getVersion(),
+- e.getMessage() } ) );
+-
+- // if we are here artifactResolutionResult is null, create a project without dependencies but
+- // don't fail
+- // (this could be a reactor projects, we don't want to fail everything)
+- // Causes MECLIPSE-185. Not sure if it should be handled this way??
+- return new IdeDependency[0];
+- }
+
+ // keep track of added reactor projects in order to avoid duplicates
+ Set emittedReactorProjectId = new HashSet();
diff --git a/maven-eclipse-plugin-ioexception.patch b/maven-eclipse-plugin-ioexception.patch
new file mode 100644
index 0000000..c56b62c
--- /dev/null
+++ b/maven-eclipse-plugin-ioexception.patch
@@ -0,0 +1,15 @@
+diff --git a/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java b/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
+index d2a543a..4a15a45 100644
+--- a/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
++++ b/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
+@@ -407,10 +407,6 @@ public class InstallPluginsMojo
+ {
+ throw new MojoExecutionException( "Could not extract: " + artifactFile, e );
+ }
+- catch ( IOException e )
+- {
+- throw new MojoExecutionException( "Could not extract: " + artifactFile, e );
+- }
+ }
+ }
+
diff --git a/maven-eclipse-plugin.spec b/maven-eclipse-plugin.spec
index 5a5b82a..1edf3ea 100644
--- a/maven-eclipse-plugin.spec
+++ b/maven-eclipse-plugin.spec
@@ -1,15 +1,15 @@
Name: maven-eclipse-plugin
-Version: 2.8
-Release: 8%{?dist}
+Version: 2.9
+Release: 1%{?dist}
Summary: Maven Eclipse Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-eclipse-plugin/
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Patch0: add_compat.patch
-Patch1: reduced_exception.patch
-Patch2: kill-bsh.patch
+Patch0: %{name}-compat.patch
+Patch1: %{name}-exception.patch
+Patch2: %{name}-ioexception.patch
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@@ -81,9 +81,10 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0
-%patch1
-%patch2
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
sed -i -e "s|3.3.0-v20070604|3.7.100.v20110510-0712|g" pom.xml
%build
@@ -100,7 +101,7 @@ ln -s "$plugin_file" $CORE_PLUGIN_DIR/resources-$CORE_FAKE_VERSION.jar
mvn-rpmbuild -e \
-Dmaven.test.skip=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
# jars
@@ -126,6 +127,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Mar 06 2012 Tomas Radej <tradej at redhat.com> - 2.9-1
+- Updated to the upstream version
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 0bfd9a8..2302f76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95f33b7bf0e902d18253b707001787fb maven-eclipse-plugin-2.8-source-release.zip
+bdfc2f32efbbed7b8b1466c8c1870bf4 maven-eclipse-plugin-2.9-source-release.zip
More information about the java-sig-commits
mailing list