java-sig-commits September 2014

java-sig-commits@lists.fedoraproject.org

17 participants
611 discussions

[Bug 1129074] CVE-2014-3577 Apache HttpComponents client: SSL hostname verification bypass, incomplete CVE-2012-6153 fix
by Red Hat Bugzilla 29 Sep '14

29 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1129074 --- Comment #37 from errata-xmlrpc <errata-xmlrpc(a)redhat.com> --- This issue has been addressed in the following products: JBEWP 5 for RHEL 5 JBEWP 5 for RHEL 6 JBEWP 5 for RHEL 4 Via RHSA-2014:1320 https://rhn.redhat.com/errata/RHSA-2014-1320.html -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=EQ9VZsAHov&a=cc_unsubscribe

1 0

[Bug 1129916] CVE-2012-6153 Apache HttpComponents client: SSL hostname verification bypass, incomplete CVE-2012-5783 fix
by Red Hat Bugzilla 29 Sep '14

29 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1129916 --- Comment #32 from errata-xmlrpc <errata-xmlrpc(a)redhat.com> --- This issue has been addressed in the following products: Via RHSA-2014:1322 https://rhn.redhat.com/errata/RHSA-2014-1322.html -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=5piB7xNlru&a=cc_unsubscribe

1 0

[Bug 1129074] CVE-2014-3577 Apache HttpComponents client: SSL hostname verification bypass, incomplete CVE-2012-6153 fix
by Red Hat Bugzilla 29 Sep '14

29 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1129074 --- Comment #36 from errata-xmlrpc <errata-xmlrpc(a)redhat.com> --- This issue has been addressed in the following products: Via RHSA-2014:1322 https://rhn.redhat.com/errata/RHSA-2014-1322.html -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=e7MhdjBWgo&a=cc_unsubscribe

1 0

[Bug 1146920] New: stapler-1.230 is available
by Red Hat Bugzilla 29 Sep '14

29 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1146920 Bug ID: 1146920 Summary: stapler-1.230 is available Product: Fedora Version: rawhide Component: stapler Keywords: FutureFeature, Triaged Assignee: msrb(a)redhat.com Reporter: upstream-release-monitoring(a)fedoraproject.org QA Contact: extras-qa(a)fedoraproject.org CC: java-sig-commits(a)lists.fedoraproject.org, mizdebsk(a)redhat.com, msrb(a)redhat.com Latest upstream release: 1.230 Current version/release in Fedora Rawhide: 1.229-1.fc22 URL: https://github.com/stapler/stapler/tags Please consult the package updates policy before you issue an update to a stable branch: https://fedoraproject.org/wiki/Updates_Policy More information about the service that created this bug can be found at: https://fedoraproject.org/wiki/Upstream_release_monitoring Soon this service will be implemented by a new system: https://github.com/fedora-infra/anitya/ It will require to manage monitored projects via a new web interface. Please make yourself familiar with the new system to ease the transition. -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=lDnI1BaM8u&a=cc_unsubscribe

1 2

[stapler] Update to upstream version 1.230
by Michal Srb 29 Sep '14

29 Sep '14

commit efeb3bced5fc057c8b2b5965f981ab3031c2cfb6 Author: Michal Srb <msrb(a)redhat.com> Date: Mon Sep 29 13:57:55 2014 +0200 Update to upstream version 1.230 .gitignore | 1 + sources | 2 +- stapler.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index e1f97e7..278ac31 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /stapler-1.227-clean.tar.gz /stapler-1.228-clean.tar.gz /stapler-1.229-clean.tar.gz +/stapler-1.230-clean.tar.gz diff --git a/sources b/sources index 0f0fda9..a7ef294 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -ab612da71662e6c50606113fe4466cad stapler-1.229-clean.tar.gz +a8aee68952d03f46ea2f3070d60a8669 stapler-1.230-clean.tar.gz diff --git a/stapler.spec b/stapler.spec index 58f0cf2..af8332e 100644 --- a/stapler.spec +++ b/stapler.spec @@ -1,5 +1,5 @@ Name: stapler -Version: 1.229 +Version: 1.230 Release: 1%{?dist} Summary: Stapler Java web framework @@ -171,6 +171,9 @@ sed -i 's/org.kohsuke.asm5/org.objectweb.asm/' core/src/main/java/org/kohsuke/st %changelog +* Mon Sep 29 2014 Michal Srb <msrb(a)redhat.com> - 1.230-1 +- Update to upstream version 1.230 + * Fri Sep 19 2014 Michal Srb <msrb(a)redhat.com> - 1.229-1 - Update to upstream version 1.229

1 0

[maven] Update patches
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit 26ebec7ce08d025267a61d3b3ec00598b8f539a4 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 13:07:49 2014 +0200 Update patches ...01-MNG-5696-Remove-dependency-on-Easymock.patch | 68 +++++++++++--------- 0001-Use-generics-in-modello-generated-code.patch | 47 -------------- ...3.patch => 0002-Update-Aether-to-0.9.0.M3.patch | 18 +++--- ...0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch | 22 +++--- maven.spec | 19 +++--- 5 files changed, 66 insertions(+), 108 deletions(-) --- diff --git a/0002-Migrate-from-easymock-1-to-easymock-3.patch b/0001-MNG-5696-Remove-dependency-on-Easymock.patch similarity index 77% rename from 0002-Migrate-from-easymock-1-to-easymock-3.patch rename to 0001-MNG-5696-Remove-dependency-on-Easymock.patch index 86ba5ec..62df034 100644 --- a/0002-Migrate-from-easymock-1-to-easymock-3.patch +++ b/0001-MNG-5696-Remove-dependency-on-Easymock.patch @@ -1,29 +1,33 @@ -From 3d875b067847d00519f960bf83469b85685a4ec5 Mon Sep 17 00:00:00 2001 +From 44bd2d20c196427c66577236ec62aaa77ecbd974 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 29 Aug 2013 10:11:48 +0200 -Subject: [PATCH 2/4] Migrate from easymock 1 to easymock 3 +Subject: [PATCH 1/3] [MNG-5696] Remove dependency on Easymock +Easymock is not really used for anything, so it can be removed. --- - maven-compat/pom.xml | 2 +- + maven-compat/pom.xml | 5 -- .../maven/artifact/testutils/MockManager.java | 58 ---------------------- - .../repository/legacy/DefaultWagonManagerTest.java | 7 ++- - pom.xml | 4 +- - 4 files changed, 6 insertions(+), 65 deletions(-) + .../repository/legacy/DefaultWagonManagerTest.java | 6 --- + pom.xml | 9 ---- + 4 files changed, 78 deletions(-) delete mode 100644 maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index 9758d79..be2a927 100644 +index 02ac0d3..28db8ba 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml -@@ -83,7 +83,7 @@ +@@ -82,11 +82,6 @@ + <artifactId>aether-connector-wagon</artifactId> <scope>test</scope> </dependency> - <dependency> +- <dependency> - <groupId>easymock</groupId> -+ <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> +- <artifactId>easymock</artifactId> +- <scope>test</scope> +- </dependency> + </dependencies> + + <build> diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java deleted file mode 100644 index 4b6f637..0000000 @@ -89,58 +93,60 @@ index 4b6f637..0000000 - -} diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java -index bcda50a..37a281c 100644 +index bcda50a..068c0e0 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java -@@ -45,7 +45,7 @@ +@@ -45,7 +45,6 @@ import org.apache.maven.wagon.observers.Debug; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; -import org.easymock.MockControl; -+import org.easymock.EasyMock; /** * @author <a href="michal.maczka(a)dimatics.com">Michal Maczka</a> -@@ -162,15 +162,14 @@ public void testGetRemoteJar() +@@ -162,15 +161,10 @@ public void testGetRemoteJar() StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" ); wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" ); - MockControl control = MockControl.createControl( UpdateCheckManager.class ); - control.replay(); -+ EasyMock.replay(); - +- wagonManager.getArtifact( artifact, repo, null, false ); assertTrue( artifact.getFile().exists() ); assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) ); - +- - control.verify(); -+ EasyMock.verify(); } private Artifact createTestPomArtifact( String directory ) diff --git a/pom.xml b/pom.xml -index ccf6f36..760e6c2 100644 +index 6015e4d..b4c5ebf 100644 --- a/pom.xml +++ b/pom.xml -@@ -46,7 +46,7 @@ +@@ -46,7 +46,6 @@ <maven.compiler.target>1.6</maven.compiler.target> <classWorldsVersion>2.5.1</classWorldsVersion> <commonsCliVersion>1.2</commonsCliVersion> - <easyMockVersion>1.2_Java1.3</easyMockVersion> -+ <easyMockVersion>3.2</easyMockVersion> <junitVersion>3.8.2</junitVersion> <plexusVersion>1.5.5</plexusVersion> <plexusInterpolationVersion>1.19</plexusInterpolationVersion> -@@ -344,7 +344,7 @@ +@@ -342,14 +341,6 @@ + <artifactId>plexus-cipher</artifactId> + <version>${cipherVersion}</version> </dependency> -  - <dependency> +-  +- <dependency> - <groupId>easymock</groupId> -+ <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>${easyMockVersion}</version> - <scope>test</scope> +- <artifactId>easymock</artifactId> +- <version>${easyMockVersion}</version> +- <scope>test</scope> +- </dependency> +-  + </dependencies> +  + </dependencyManagement> -- 1.9.3 diff --git a/0003-Update-Aether-to-0.9.0.M3.patch b/0002-Update-Aether-to-0.9.0.M3.patch similarity index 91% rename from 0003-Update-Aether-to-0.9.0.M3.patch rename to 0002-Update-Aether-to-0.9.0.M3.patch index 25e6140..6a15ad5 100644 --- a/0003-Update-Aether-to-0.9.0.M3.patch +++ b/0002-Update-Aether-to-0.9.0.M3.patch @@ -1,7 +1,7 @@ -From ff559645842bf21e3bfee6810ed2808657120396 Mon Sep 17 00:00:00 2001 +From d1a44fdad163b1bd4a052979f824ffd4522b0780 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon, 12 Aug 2013 08:49:19 +0200 -Subject: [PATCH 3/4] Update Aether to 0.9.0.M3 +Subject: [PATCH 2/3] Update Aether to 0.9.0.M3 --- apache-maven/pom.xml | 6 +++++- @@ -11,7 +11,7 @@ Subject: [PATCH 3/4] Update Aether to 0.9.0.M3 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml -index 738c6e5..9c77d18 100644 +index 1def243..2923435 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -87,7 +87,11 @@ @@ -28,7 +28,7 @@ index 738c6e5..9c77d18 100644 <dependency> <groupId>org.slf4j</groupId> diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index 74a7c71..ed264ab 100644 +index 130805c..801f9fb 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -91,7 +91,12 @@ under the License. @@ -46,7 +46,7 @@ index 74a7c71..ed264ab 100644 </dependency> <dependency> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index be2a927..afeab8c 100644 +index 28db8ba..348ce29 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -79,7 +79,12 @@ @@ -62,12 +62,12 @@ index be2a927..afeab8c 100644 + <artifactId>aether-connector-basic</artifactId> <scope>test</scope> </dependency> - <dependency> + </dependencies> diff --git a/pom.xml b/pom.xml -index 760e6c2..148b8ce 100644 +index b4c5ebf..9d858fa 100644 --- a/pom.xml +++ b/pom.xml -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ <cipherVersion>1.7</cipherVersion> <modelloVersion>1.8.1</modelloVersion> <jxpathVersion>1.3</jxpathVersion> @@ -76,7 +76,7 @@ index 760e6c2..148b8ce 100644 <slf4jVersion>1.7.5</slf4jVersion> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>  -@@ -308,7 +308,12 @@ +@@ -307,7 +307,12 @@ </dependency> <dependency> <groupId>org.eclipse.aether</groupId> diff --git a/0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch b/0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch similarity index 94% rename from 0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch rename to 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch index f619111..f941124 100644 --- a/0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch +++ b/0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch @@ -1,7 +1,7 @@ -From b6c25c221f9020a5bc3cfc28bc627a4fff10ff73 Mon Sep 17 00:00:00 2001 +From e3eb56ada370c18c1539e29b929139598a366611 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Wed, 13 Nov 2013 14:32:23 +0100 -Subject: [PATCH 4/4] Update to Sisu 0.1.0 and Guice 3.1.6 +Subject: [PATCH 3/3] Update to Sisu 0.1.0 and Guice 3.1.6 Sisu depends on Guice, but dependency scope changed from "compile" to "provided" in Sisu 0.1.0. As a Sisu user, Maven needs to have runtime @@ -18,7 +18,7 @@ dependency on Guice. 8 files changed, 77 insertions(+), 3 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml -index 9c77d18..10339e9 100644 +index 2923435..16393cb 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -57,6 +57,18 @@ @@ -41,7 +41,7 @@ index 9c77d18..10339e9 100644 <dependency> <groupId>commons-cli</groupId> diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index ed264ab..a44404c 100644 +index 801f9fb..4fbca7d 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -80,7 +80,6 @@ under the License. @@ -65,7 +65,7 @@ index ed264ab..a44404c 100644 <dependency> <groupId>org.eclipse.aether</groupId> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index afeab8c..a67e35f 100644 +index 348ce29..7884159 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -64,6 +64,18 @@ @@ -88,7 +88,7 @@ index afeab8c..a67e35f 100644 <artifactId>plexus-component-annotations</artifactId> </dependency> diff --git a/maven-core/pom.xml b/maven-core/pom.xml -index 5e5c2c1..eb7220e 100644 +index fae2904..dc788d2 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -82,6 +82,17 @@ @@ -110,7 +110,7 @@ index 5e5c2c1..eb7220e 100644 <artifactId>plexus-interpolation</artifactId> </dependency> diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml -index 6f99129..7e6efee 100644 +index 2da52a9..f246fe1 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -65,6 +65,17 @@ @@ -132,7 +132,7 @@ index 6f99129..7e6efee 100644 <artifactId>plexus-component-annotations</artifactId> </dependency> diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml -index 2b5b1a2..a560a2b 100644 +index 81cd9d9..c1ca303 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -54,6 +54,18 @@ @@ -155,7 +155,7 @@ index 2b5b1a2..a560a2b 100644 <artifactId>xmlunit</artifactId> <version>1.3</version> diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml -index fafb0b4..e8bb273 100644 +index 1019ae4..e018cc0 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -58,6 +58,18 @@ under the License. @@ -178,10 +178,10 @@ index fafb0b4..e8bb273 100644 <build> diff --git a/pom.xml b/pom.xml -index 148b8ce..58727df 100644 +index 9d858fa..3787a42 100644 --- a/pom.xml +++ b/pom.xml -@@ -53,8 +53,8 @@ +@@ -52,8 +52,8 @@ <plexusUtilsVersion>3.0.17</plexusUtilsVersion>  <guavaVersion>14.0.1</guavaVersion> diff --git a/maven.spec b/maven.spec index 271eda3..abceee6 100644 --- a/maven.spec +++ b/maven.spec @@ -1,25 +1,22 @@ Name: maven Version: 3.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java project management and project comprehension tool License: ASL 2.0 URL: http://maven.apache.org/ +BuildArch: noarch Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%… Source1: maven-bash-completion Source2: mvn.1 Source200: %{name}-script -# Could be upstreamed probably -Patch0001: 0001-Use-generics-in-modello-generated-code.patch -# Could be upstreamed probably -Patch0002: 0002-Migrate-from-easymock-1-to-easymock-3.patch +# Forwarded upstream (MNG-5696) +Patch0001: 0001-MNG-5696-Remove-dependency-on-Easymock.patch # Merged upstream (MNG-5502) -Patch0003: 0003-Update-Aether-to-0.9.0.M3.patch +Patch0002: 0002-Update-Aether-to-0.9.0.M3.patch # Merged upstream (MNG-5534) -Patch0004: 0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch - -BuildArch: noarch +Patch0003: 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch # If XMvn is part of the same RPM transaction then it should be # installed first to avoid triggering rhbz#1014355. @@ -148,7 +145,6 @@ Group: Documentation %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 -%patch0004 -p1 # not really used during build, but a precaution rm maven-ant-tasks-*.jar @@ -274,6 +270,9 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.2.3-2 +- Update patches + * Fri Aug 22 2014 Michal Srb <msrb(a)redhat.com> - 3.2.3-1 - Update to upstream version 3.2.3

1 0

[Bug 1131027] New: google-guice-3.2.3 is available
by Red Hat Bugzilla 29 Sep '14

29 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1131027 Bug ID: 1131027 Summary: google-guice-3.2.3 is available Product: Fedora Version: rawhide Component: google-guice Keywords: FutureFeature, Triaged Assignee: mizdebsk(a)redhat.com Reporter: upstream-release-monitoring(a)fedoraproject.org QA Contact: extras-qa(a)fedoraproject.org CC: java-sig-commits(a)lists.fedoraproject.org, mizdebsk(a)redhat.com, msimacek(a)redhat.com, msrb(a)redhat.com Latest upstream release: 3.2.3 Current version/release in Fedora Rawhide: 3.2.2-1.fc21 URL: http://repo2.maven.org/maven2/org/sonatype/sisu/sisu-guice/ Please consult the package updates policy before you issue an update to a stable branch: https://fedoraproject.org/wiki/Updates_Policy More information about the service that created this bug can be found at: https://fedoraproject.org/wiki/Upstream_release_monitoring -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=INVDTVcCcU&a=cc_unsubscribe

1 4

[maven-assembly-plugin] Update to plexus-archiver 2.6.1 and plexus-io 2.1.1
by Mikolaj Izdebski 29 Sep '14

29 Sep '14

commit 8e983f9bc7fd2a0fd3868245b49b48aeed5559ef Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Sep 29 11:38:35 2014 +0200 Update to plexus-archiver 2.6.1 and plexus-io 2.1.1 ...plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch | 306 ++++++++++++++++++++ maven-assembly-plugin.spec | 11 +- 2 files changed, 315 insertions(+), 2 deletions(-) --- diff --git a/0001-Update-to-plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch b/0001-Update-to-plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch new file mode 100644 index 0000000..0760ac0 --- /dev/null +++ b/0001-Update-to-plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch @@ -0,0 +1,306 @@ +From 7c775e719a8f19aaa6ca6a4427f302ed2ddd9af8 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski <mizdebsk(a)redhat.com> +Date: Mon, 29 Sep 2014 11:27:56 +0200 +Subject: [PATCH] Update to plexus-archiver 2.6.1 and plexus-io 2.1.1 + +--- + pom.xml | 4 +- + .../assembly/archive/DefaultAssemblyArchiver.java | 16 +++--- + .../archive/archiver/AssemblyProxyArchiver.java | 59 ++++++++++++++++++++++ + .../archive/DefaultAssemblyArchiverTest.java | 32 ++++++++---- + .../ComponentsXmlArchiverFileFilterTest.java | 12 +++++ + .../assembly/testutils/TrackingArchiverStub.java | 12 +++++ + 6 files changed, 115 insertions(+), 20 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 56de47a..01c0d6f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -122,7 +122,7 @@ under the License. + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-archiver</artifactId> +- <version>2.4.4</version> ++ <version>2.6.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> +@@ -148,7 +148,7 @@ under the License. + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-io</artifactId> +- <version>2.0.9</version> ++ <version>2.1.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> +diff --git a/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java b/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java +index 2347e91..d90c2d1 100644 +--- a/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java ++++ b/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java +@@ -486,23 +486,29 @@ public class DefaultAssemblyArchiver + protected Archiver createTarArchiver( final String format, final String tarLongFileMode ) + throws NoSuchArchiverException, ArchiverException + { ++ return createTarArchiver( format, TarLongFileMode.valueOf( tarLongFileMode ) ); ++ } ++ ++ protected Archiver createTarArchiver( final String format, final TarLongFileMode tarFileMode ) ++ throws NoSuchArchiverException, ArchiverException ++ { + final TarArchiver tarArchiver = (TarArchiver) archiverManager.getArchiver( "tar" ); + final int index = format.indexOf( '.' ); + if ( index >= 0 ) + { + // TODO: this needs a cleanup in plexus archiver - use a real + // typesafe enum +- final TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod(); ++ final TarArchiver.TarCompressionMethod tarCompressionMethod; + // TODO: this should accept gz and bz2 as well so we can skip + // over the switch + final String compression = format.substring( index + 1 ); + if ( "gz".equals( compression ) ) + { +- tarCompressionMethod.setValue( "gzip" ); ++ tarCompressionMethod = TarArchiver.TarCompressionMethod.gzip; + } + else if ( "bz2".equals( compression ) ) + { +- tarCompressionMethod.setValue( "bzip2" ); ++ tarCompressionMethod = TarArchiver.TarCompressionMethod.bzip2; + } + else + { +@@ -512,10 +518,6 @@ public class DefaultAssemblyArchiver + tarArchiver.setCompression( tarCompressionMethod ); + } + +- final TarLongFileMode tarFileMode = new TarLongFileMode(); +- +- tarFileMode.setValue( tarLongFileMode ); +- + tarArchiver.setLongfile( tarFileMode ); + + return tarArchiver; +diff --git a/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java +index 56783b6..a9b061e 100644 +--- a/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java ++++ b/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java +@@ -39,6 +39,7 @@ import java.io.File; + import java.io.FileInputStream; + import java.io.IOException; + import java.io.InputStream; ++import java.nio.file.Files; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.HashSet; +@@ -490,6 +491,58 @@ public class AssemblyProxyArchiver + } + } + ++ public void addSymlink( final String symlinkName, final int permissions, final String symlinkDestination ) ++ throws ArchiverException ++ { ++ if ( acceptFile( new File(symlinkName ) )) ++ { ++ inPublicApi.set( Boolean.TRUE ); ++ try ++ { ++ debug( "Adding file: " + symlinkName + " to archive location: " + rootPrefix + symlinkDestination ); ++ ++ if ( dryRun ) ++ { ++ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() ); ++ } ++ else ++ { ++ delegate.addSymlink( symlinkName, permissions, rootPrefix + symlinkDestination ); ++ } ++ } ++ finally ++ { ++ inPublicApi.set( null ); ++ } ++ } ++ } ++ ++ public void addSymlink( final String symlinkName, final String symlinkDestination ) ++ throws ArchiverException ++ { ++ if ( acceptFile( new File(symlinkName ) )) ++ { ++ inPublicApi.set( Boolean.TRUE ); ++ try ++ { ++ debug( "Adding file: " + symlinkName + " to archive location: " + rootPrefix + symlinkDestination ); ++ ++ if ( dryRun ) ++ { ++ debug( "DRY RUN: Skipping delegated call to: " + getMethodName() ); ++ } ++ else ++ { ++ delegate.addSymlink( symlinkName, rootPrefix + symlinkDestination ); ++ } ++ } ++ finally ++ { ++ inPublicApi.set( null ); ++ } ++ } ++ } ++ + public void createArchive() + throws ArchiverException, IOException + { +@@ -862,6 +915,12 @@ public class AssemblyProxyArchiver + return inputFile.isFile(); + } + ++ public boolean isSymbolicLink() ++ { ++ // return Files.isSymbolicLink( inputFile.toPath() ); ++ return false; ++ } ++ + } + + public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions ) +diff --git a/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java b/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java +index 9e52aff..0786021 100644 +--- a/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java ++++ b/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java +@@ -299,7 +299,7 @@ public class DefaultAssemblyArchiverTest + final AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock(); + + configSource.getTarLongFileMode(); +- configCtl.setReturnValue( TarLongFileMode.FAIL, MockControl.ZERO_OR_MORE ); ++ configCtl.setReturnValue( TarLongFileMode.fail.toString(), MockControl.ZERO_OR_MORE ); + + configSource.isDryRun(); + configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE ); +@@ -332,7 +332,7 @@ public class DefaultAssemblyArchiverTest + subject.createArchiver( "tar", false, "finalName", configSource, null, false); + + assertNull( ttArchiver.compressionMethod ); +- assertEquals( TarLongFileMode.FAIL, ttArchiver.longFileMode.getValue() ); ++ assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode ); + + mm.verifyAll(); + } +@@ -571,10 +571,10 @@ public class DefaultAssemblyArchiverTest + final DefaultAssemblyArchiver subject = + createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null ); + +- subject.createTarArchiver( "tar", TarLongFileMode.FAIL ); ++ subject.createTarArchiver( "tar", TarLongFileMode.fail ); + + assertNull( ttArchiver.compressionMethod ); +- assertEquals( TarLongFileMode.FAIL, ttArchiver.longFileMode.getValue() ); ++ assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode ); + + mm.verifyAll(); + } +@@ -596,10 +596,10 @@ public class DefaultAssemblyArchiverTest + final DefaultAssemblyArchiver subject = + createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null ); + +- subject.createTarArchiver( "tar.gz", TarLongFileMode.FAIL ); ++ subject.createTarArchiver( "tar.gz", TarLongFileMode.fail ); + +- assertEquals( "gzip", ttArchiver.compressionMethod.getValue() ); +- assertEquals( TarLongFileMode.FAIL, ttArchiver.longFileMode.getValue() ); ++ assertEquals( "gzip", ttArchiver.compressionMethod.toString() ); ++ assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode ); + + mm.verifyAll(); + } +@@ -621,10 +621,10 @@ public class DefaultAssemblyArchiverTest + final DefaultAssemblyArchiver subject = + createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null ); + +- subject.createTarArchiver( "tar.bz2", TarLongFileMode.FAIL ); ++ subject.createTarArchiver( "tar.bz2", TarLongFileMode.fail ); + +- assertEquals( "bzip2", ttArchiver.compressionMethod.getValue() ); +- assertEquals( TarLongFileMode.FAIL, ttArchiver.longFileMode.getValue() ); ++ assertEquals( "bzip2", ttArchiver.compressionMethod.toString() ); ++ assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode ); + + mm.verifyAll(); + } +@@ -648,7 +648,7 @@ public class DefaultAssemblyArchiverTest + + try + { +- subject.createTarArchiver( "tar.Z", null ); ++ subject.createTarArchiver( "tar.Z", (TarLongFileMode) null ); + + fail( "Invalid compression formats should throw an error." ); + } +@@ -904,6 +904,16 @@ public class DefaultAssemblyArchiverTest + { + } + ++ public void addSymlink( String arg0, String arg1 ) ++ throws ArchiverException ++ { ++ } ++ ++ public void addSymlink( String arg0, int arg1, String arg2 ) ++ throws ArchiverException ++ { ++ } ++ + public void addResource( final PlexusIoResource arg0, final String arg1, final int arg2 ) + throws ArchiverException + { +diff --git a/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java +index dc89740..4580748 100644 +--- a/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java ++++ b/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java +@@ -441,6 +441,18 @@ public class ComponentsXmlArchiverFileFilterTest + throw new UnsupportedOperationException( "not supported" ); + } + ++ public void addSymlink( final String symlinkName, final int permissions, final String symlinkDestination ) ++ throws ArchiverException ++ { ++ throw new UnsupportedOperationException( "not supported" ); ++ } ++ ++ public void addSymlink( final String symlinkName, final String symlinkDestination ) ++ throws ArchiverException ++ { ++ throw new UnsupportedOperationException( "not supported" ); ++ } ++ + public void createArchive() + throws ArchiverException, IOException + { +diff --git a/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java b/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java +index 8279a82..27cde88 100644 +--- a/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java ++++ b/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java +@@ -106,6 +106,18 @@ public class TrackingArchiverStub + added.add( new Addition( inputFile, destFileName, null, null, permissions ) ); + } + ++ public void addSymlink( final String symlinkName, final String symlinkDestination ) ++ throws ArchiverException ++ { ++ added.add( new Addition( symlinkName, symlinkDestination, null, null, -1 ) ); ++ } ++ ++ public void addSymlink( final String symlinkName, final int permissions, final String symlinkDestination ) ++ throws ArchiverException ++ { ++ added.add( new Addition( symlinkName, symlinkDestination, null, null, permissions ) ); ++ } ++ + public void addArchivedFileSet( final File archiveFile ) + throws ArchiverException + { +-- +1.9.3 + diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index 020b030..d608bdb 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,12 +1,15 @@ Name: maven-assembly-plugin Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Assembly Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-assembly-plugin/ -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%… BuildArch: noarch +Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%… + +Patch0: 0001-Update-to-plexus-archiver-2.6.1-and-plexus-io-2.1.1.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) @@ -44,6 +47,7 @@ This package provides %{summary}. %prep %setup -q +%patch0 -p1 %build # Tests need easymockclassextension version 2.x, which is incompatible @@ -61,6 +65,9 @@ This package provides %{summary}. %doc LICENSE NOTICE %changelog +* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.4.1-2 +- Update to plexus-archiver 2.6.1 and plexus-io 2.1.1 + * Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.4.1-1 - Update to upstream version 2.4.1

1 0

File stapler-1.230-clean.tar.gz uploaded to lookaside cache by msrb
by Michal Srb 29 Sep '14

29 Sep '14

A file has been added to the lookaside cache for stapler: a8aee68952d03f46ea2f3070d60a8669 stapler-1.230-clean.tar.gz

1 0

[Bug 1147424] New: maven-changes-plugin-2.11 is available
by Red Hat Bugzilla 29 Sep '14

29 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1147424 Bug ID: 1147424 Summary: maven-changes-plugin-2.11 is available Product: Fedora Version: rawhide Component: maven-changes-plugin Keywords: FutureFeature, Triaged Assignee: mizdebsk(a)redhat.com Reporter: upstream-release-monitoring(a)fedoraproject.org QA Contact: extras-qa(a)fedoraproject.org CC: java-sig-commits(a)lists.fedoraproject.org, jcapik(a)redhat.com, mizdebsk(a)redhat.com, msimacek(a)redhat.com, msrb(a)redhat.com Latest upstream release: 2.11 Current version/release in Fedora Rawhide: 2.8-9.fc22 URL: http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-changes-plugin/ Please consult the package updates policy before you issue an update to a stable branch: https://fedoraproject.org/wiki/Updates_Policy More information about the service that created this bug can be found at: https://fedoraproject.org/wiki/Upstream_release_monitoring Soon this service will be implemented by a new system: https://github.com/fedora-infra/anitya/ It will require to manage monitored projects via a new web interface. Please make yourself familiar with the new system to ease the transition. -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=RJAjn4AyLe&a=cc_unsubscribe

1 1

← Newer
1
...
13
14
15
16
17
18
19
...
62
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits September 2014