[maven-remote-resources-plugin/f16: 3/4] Merge branch 'master' into f16
by tradej@fedoraproject.org
commit 1cbf69aa8b561f3bdbeb54c5d68404df5016b216
Merge: db8b98c 6ee40fd
Author: Tomas Radej <tradej(a)redhat.com>
Date: Wed Sep 7 10:19:44 2011 +0200
Merge branch 'master' into f16
.gitignore | 1 +
ProcessRemoteResourcesMojo.java.patch | 38 ++++++++++++++++----------------
maven-remote-resources-plugin.spec | 7 ++++-
sources | 2 +-
4 files changed, 26 insertions(+), 22 deletions(-)
---
12 years, 7 months
[maven-remote-resources-plugin/f16: 2/4] Revert "Updated to 1.2.1, copy license files"
by tradej@fedoraproject.org
commit db8b98c624585efb5ea2835578b5a4c93b64448e
Author: Tomas Radej <tradej(a)redhat.com>
Date: Wed Sep 7 10:19:04 2011 +0200
Revert "Updated to 1.2.1, copy license files"
This reverts commit e700695f3edbd4c38ab86c2d127dbd9d907cb485.
.gitignore | 1 -
...ources-plugin-project-transitivity-filter.patch | 22 --------------------
maven-remote-resources-plugin.spec | 21 +++++-------------
sources | 2 +-
4 files changed, 7 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6677bcd..d1aba0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
maven-remote-resources-plugin-1.1.tar.bz2
maven-remote-resources-plugin-1.2-source-release.zip
-/maven-remote-resources-plugin-1.2.1-source-release.zip
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 2ab14cf..cee8135 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-remote-resources-plugin
-Version: 1.2.1
-Release: 1%{?dist}
+Version: 1.2
+Release: 3%{?dist}
Summary: Maven Remote Resources Plugin
Group: Development/Libraries
@@ -10,8 +10,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%
#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports
#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in
#the version 1.3 of maven-shared-common-artifact-filters package.
-# Version 1.2.1: created new patch with identical functionality
-Patch0: %{name}-project-transitivity-filter.patch
+Patch0: ProcessRemoteResourcesMojo.java.patch
BuildArch: noarch
@@ -24,7 +23,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-filtering
+BuildRequires: maven-shared-filtering
BuildRequires: plexus-container-default
BuildRequires: velocity
BuildRequires: maven-shared-artifact-resolver
@@ -47,7 +46,6 @@ Requires: jpackage-utils
Requires: maven-wagon
Requires: maven-shared-artifact-resolver
Requires: maven-shared-downloader
-Requires: maven-filtering
Obsoletes: maven2-plugin-remote-resources <= 0:2.0.8
Provides: maven2-plugin-remote-resources = 1:%{version}-%{release}
@@ -71,14 +69,14 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
+%patch0 -p0
%build
# fix 613582
# we now use plexus-velocity which has the correct descriptor with a hint.
rm -f src/main/resources/META-INF/plexus/components.xml
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
%install
# jars
@@ -94,21 +92,14 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
-%doc DEPENDENCIES LICENSE NOTICE
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%doc DEPENDENCIES LICENSE NOTICE
%{_javadocdir}/%{name}
-
%changelog
-* Tue Sep 06 2011 Tomas Radej <tradej(a)redhat.com> - 1.2.1-1
-- Updated to 1.2.1
-- Fixed patch
-
* Tue Jul 5 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.2-3
- BR modello.
diff --git a/sources b/sources
index cfe3239..d3a36fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b799cd77a6f65c0c13304d53f0c5367 maven-remote-resources-plugin-1.2.1-source-release.zip
+681e1c7ed5841ef6ee68cffa11e61849 maven-remote-resources-plugin-1.2-source-release.zip
12 years, 7 months
[maven-remote-resources-plugin/f16] (4 commits) ...Added license files
by tradej@fedoraproject.org
Summary of changes:
6ee40fd... Update to latest upstream release. (*)
db8b98c... Revert "Updated to 1.2.1, copy license files"
1cbf69a... Merge branch 'master' into f16
185fd71... Added license files
(*) This commit already existed in another branch; no separate mail sent
12 years, 7 months
[maven-remote-resources-plugin/f16] Updated to 1.2.1, copy license files
by tradej@fedoraproject.org
commit e700695f3edbd4c38ab86c2d127dbd9d907cb485
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Aug 29 14:51:12 2011 +0200
Updated to 1.2.1, copy license files
.gitignore | 1 +
...ources-plugin-project-transitivity-filter.patch | 22 ++++++++++++++++++++
maven-remote-resources-plugin.spec | 21 +++++++++++++-----
sources | 2 +-
4 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1aba0b..6677bcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-remote-resources-plugin-1.1.tar.bz2
maven-remote-resources-plugin-1.2-source-release.zip
+/maven-remote-resources-plugin-1.2.1-source-release.zip
diff --git a/maven-remote-resources-plugin-project-transitivity-filter.patch b/maven-remote-resources-plugin-project-transitivity-filter.patch
new file mode 100644
index 0000000..85b224c
--- /dev/null
+++ b/maven-remote-resources-plugin-project-transitivity-filter.patch
@@ -0,0 +1,22 @@
+diff --git a/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java b/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
+index c62de1f..512ebd2 100644
+--- a/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
++++ b/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
+@@ -47,7 +47,7 @@ import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
+ import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
+ import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
+ import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
+-import org.apache.maven.shared.artifact.filter.collection.TransitivityFilter;
++import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
+ import org.apache.maven.shared.downloader.DownloadException;
+ import org.apache.maven.shared.downloader.DownloadNotFoundException;
+ import org.apache.maven.shared.downloader.Downloader;
+@@ -628,7 +628,7 @@ public class ProcessRemoteResourcesMojo
+ depArtifacts = project.getDependencyArtifacts();
+ }
+
+- filter.addFilter( new TransitivityFilter( depArtifacts, this.excludeTransitive ) );
++ filter.addFilter( new ProjectTransitivityFilter( depArtifacts, this.excludeTransitive ) );
+ filter.addFilter( new ScopeFilter( this.includeScope, this.excludeScope ) );
+ filter.addFilter( new GroupIdFilter( this.includeGroupIds, this.excludeGroupIds ) );
+ filter.addFilter( new ArtifactIdFilter( this.includeArtifactIds, this.excludeArtifactIds ) );
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index cee8135..2ab14cf 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-remote-resources-plugin
-Version: 1.2
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: Maven Remote Resources Plugin
Group: Development/Libraries
@@ -10,7 +10,8 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%
#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports
#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in
#the version 1.3 of maven-shared-common-artifact-filters package.
-Patch0: ProcessRemoteResourcesMojo.java.patch
+# Version 1.2.1: created new patch with identical functionality
+Patch0: %{name}-project-transitivity-filter.patch
BuildArch: noarch
@@ -23,7 +24,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-shared-filtering
+BuildRequires: maven-filtering
BuildRequires: plexus-container-default
BuildRequires: velocity
BuildRequires: maven-shared-artifact-resolver
@@ -46,6 +47,7 @@ Requires: jpackage-utils
Requires: maven-wagon
Requires: maven-shared-artifact-resolver
Requires: maven-shared-downloader
+Requires: maven-filtering
Obsoletes: maven2-plugin-remote-resources <= 0:2.0.8
Provides: maven2-plugin-remote-resources = 1:%{version}-%{release}
@@ -69,14 +71,14 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%build
# fix 613582
# we now use plexus-velocity which has the correct descriptor with a hint.
rm -f src/main/resources/META-INF/plexus/components.xml
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
# jars
@@ -92,14 +94,21 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
+%doc DEPENDENCIES LICENSE NOTICE
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
+%doc DEPENDENCIES LICENSE NOTICE
%{_javadocdir}/%{name}
+
%changelog
+* Tue Sep 06 2011 Tomas Radej <tradej(a)redhat.com> - 1.2.1-1
+- Updated to 1.2.1
+- Fixed patch
+
* Tue Jul 5 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.2-3
- BR modello.
diff --git a/sources b/sources
index d3a36fa..cfe3239 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-681e1c7ed5841ef6ee68cffa11e61849 maven-remote-resources-plugin-1.2-source-release.zip
+9b799cd77a6f65c0c13304d53f0c5367 maven-remote-resources-plugin-1.2.1-source-release.zip
12 years, 7 months
[Bug 715941] New: FTBFS netty-3.2.3-3.fc15
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: FTBFS netty-3.2.3-3.fc15
https://bugzilla.redhat.com/show_bug.cgi?id=715941
Summary: FTBFS netty-3.2.3-3.fc15
Product: Fedora
Version: rawhide
Platform: All
URL: http://linux.dell.com/files/fedora/FixBuildRequires/mo
ck-results/
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: high
Priority: high
Component: netty
AssignedTo: sochotni(a)redhat.com
ReportedBy: ftbfs(a)fedoraproject.org
QAContact: extras-qa(a)fedoraproject.org
CC: sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 713919
Classification: Fedora
Story Points: ---
netty-3.2.3-3.fc15.src.rpm Failed To Build From Source against the rawhide
tree. See http://fedoraproject.org/wiki/FTBFS for more information.
If you believe this is actually a bug in another package, do NOT change the
component in this bug or close this bug. Instead, add the appropriate bug
number from the other package to the "Depends on" line in this bug. If the
other package does not yet have a bug created that you think matches, please
create one. Doing so helps us properly track bugs and their dependencies, just
as we track package dependencies. (If you close this bug, and the other
package is not fixed before the next FTBFS run, a new bug will get created.
Please follow the above advice to avoid such duplication.)
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 7 months
[maven-gpg-plugin] Update to latest upstream version.
by Alexander Kurtakov
commit 6a88444c77f3297f5649467f14cd7284a72731c6
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Sep 6 11:30:01 2011 +0300
Update to latest upstream version.
.gitignore | 1 +
maven-gpg-plugin.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9a4d0a..c7f94dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-gpg-plugin-1.1.tar.xz
maven-gpg-plugin-1.2-source-release.zip
/maven-gpg-plugin-1.3-source-release.zip
+maven-gpg-plugin-1.4-source-release.zip
diff --git a/maven-gpg-plugin.spec b/maven-gpg-plugin.spec
index 5c26e69..74e4330 100644
--- a/maven-gpg-plugin.spec
+++ b/maven-gpg-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-gpg-plugin
-Version: 1.3
+Version: 1.4
Release: 1%{?dist}
Summary: Maven GPG Plugin
@@ -73,6 +73,9 @@ install -dm 755 %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 6 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.4-1
+- Update to latest upstream version.
+
* Mon Jun 13 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.3-1
- Update to latest upstream version
diff --git a/sources b/sources
index 96ba4fc..652cf0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-676528352ea884c302ac9225577ca9fe maven-gpg-plugin-1.3-source-release.zip
+496b90b12953a509f29a370716164b2d maven-gpg-plugin-1.4-source-release.zip
12 years, 7 months