From b711238ced26dbe15d1a5e6df1d572e26b9215f1 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 6 Feb 2013 20:42:22 +0100 Subject: [PATCH 01/29] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local --- shrinkwrap.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 2c5b162..1bd128d 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple mechanism to assemble Java archives Group: Development/Libraries License: ASL 2.0 @@ -18,7 +18,7 @@ BuildRequires: jpackage-utils BuildRequires: apiviz BuildRequires: junit4 -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin @@ -96,6 +96,10 @@ cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG - 1.0.0-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Sat Jul 21 2012 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5906745b5fb05be3fc72cfa88603de9963d5225d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 17:54:11 -0600 Subject: [PATCH 02/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 1bd128d..d37c5e4 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simple mechanism to assemble Java archives Group: Development/Libraries License: ASL 2.0 @@ -96,6 +96,9 @@ cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Feb 06 2013 Java SIG - 1.0.0-3 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local From 152d3fc285a0690044cade84d407e0e551b1fc32 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 19 Feb 2013 06:42:45 +0100 Subject: [PATCH 03/29] added maven-common-artifact-filters and maven-shared-components as BR --- shrinkwrap.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index d37c5e4..f629562 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simple mechanism to assemble Java archives Group: Development/Libraries License: ASL 2.0 @@ -10,13 +10,15 @@ Url: http://www.jboss.org/shrinkwrap/ # git clone git://github.com/shrinkwrap/shrinkwrap.git shrinkwrap-1.0.0 # cd shrinkwrap-1.0.0 && git archive --format=tar --prefix=shrinkwrap-1.0.0/ 1.0.0 | xz > ../shrinkwrap-1.0.0.tar.xz Source0: %{name}-%{namedversion}.tar.xz +# shrinkwrap package don't include the license file +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: java-devel BuildRequires: jboss-parent BuildRequires: jpackage-utils BuildRequires: apiviz -BuildRequires: junit4 +BuildRequires: junit BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin @@ -30,7 +32,11 @@ BuildRequires: maven-source-plugin BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 -Requires: junit4 +# required by enforcer-plugin +BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) + +Requires: junit Requires: java Requires: jpackage-utils @@ -51,11 +57,15 @@ This package contains javadoc for %{name}. %prep %setup -q -n %{name}-%{namedversion} -sed -i "s|dist||" pom.xml +#sed -i "s|dist||" pom.xml +%pom_disable_module dist +cp -p %{SOURCE1} . +sed -i 's/\r//' LICENSE-2.0.txt %build export JAVA5_HOME=%{_jvmdir}/java +export JAVA_HOME=$JAVA5_HOME mvn-rpmbuild install javadoc:aggregate %install @@ -91,11 +101,16 @@ cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadir}/%{name}/*.jar %{_mavenpomdir}/JPP.%{name}-*.pom %{_mavendepmapfragdir}/%{name} +%doc LICENSE-2.0.txt %files javadoc %{_javadocdir}/%{name} +%doc LICENSE-2.0.txt %changelog +* Tue Feb 19 2013 gil cattaneo 1.0.0-5 +- set java.home for enforcer-plugin + * Thu Feb 14 2013 Fedora Release Engineering - 1.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 79dfc31e4e45ba6cdd871ac11045267d61040568 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 19 Feb 2013 07:38:27 +0100 Subject: [PATCH 04/29] added maven-common-artifact-filters and maven-shared-components as BR --- LICENSE-2.0.txt | 202 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE-2.0.txt diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 010cb68e017197b87c95de0c3c74ebc2d8db4082 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 7 May 2013 14:22:47 +0200 Subject: [PATCH 05/29] update to 1.1.2 --- .gitignore | 1 + ....1.2-remove-enforcer-requireProperty.patch | 19 +++++++ shrinkwrap.spec | 49 ++++++++++++------- sources | 2 +- 4 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch diff --git a/.gitignore b/.gitignore index 18d66b1..79902d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /shrinkwrap-1.0.0.tar.xz +/shrinkwrap-1.1.2.tar.xz diff --git a/shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch b/shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch new file mode 100644 index 0000000..eae391c --- /dev/null +++ b/shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch @@ -0,0 +1,19 @@ +--- pom.xml 2013-03-07 10:05:24.000000000 +0100 ++++ pom.xml-gil 2013-05-07 12:49:38.644992397 +0200 +@@ -209,14 +209,14 @@ + + 1.7.0 + +- ++ + + + diff --git a/shrinkwrap.spec b/shrinkwrap.spec index f629562..4e0542d 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,21 +1,21 @@ %global namedreltag %{nil} %global namedversion %{version}%{?namedreltag} Name: shrinkwrap -Version: 1.0.0 -Release: 5%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: A simple mechanism to assemble Java archives Group: Development/Libraries License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ -# git clone git://github.com/shrinkwrap/shrinkwrap.git shrinkwrap-1.0.0 -# cd shrinkwrap-1.0.0 && git archive --format=tar --prefix=shrinkwrap-1.0.0/ 1.0.0 | xz > ../shrinkwrap-1.0.0.tar.xz +# git clone git://github.com/shrinkwrap/shrinkwrap.git shrinkwrap-1.1.2 +# (cd shrinkwrap-1.1.2 && git archive --format=tar --prefix=shrinkwrap-1.1.2/ 1.1.2 | xz > ../shrinkwrap-1.1.2.tar.xz) Source0: %{name}-%{namedversion}.tar.xz -# shrinkwrap package don't include the license file -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +# remove env.JAVA"x"_HOME +# malformed pom file, not able to use pom macros +Patch0: %{name}-%{namedversion}-remove-enforcer-requireProperty.patch BuildRequires: java-devel BuildRequires: jboss-parent -BuildRequires: jpackage-utils BuildRequires: apiviz BuildRequires: junit @@ -24,7 +24,6 @@ BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin @@ -39,7 +38,6 @@ BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) Requires: junit Requires: java -Requires: jpackage-utils BuildArch: noarch %description @@ -49,33 +47,39 @@ like JARs, WARs, and EARs with a friendly, fluent API. %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc This package contains javadoc for %{name}. %prep %setup -q -n %{name}-%{namedversion} +%patch0 -p0 -#sed -i "s|dist||" pom.xml %pom_disable_module dist -cp -p %{SOURCE1} . -sed -i 's/\r//' LICENSE-2.0.txt +# remove env.JAVA"x"_HOME +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" api +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" api-nio2 +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" impl-nio2 +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" impl-base +%pom_xpath_remove "pom:profiles" impl-base + +sed -i 's/\r//' LICENSE %build -export JAVA5_HOME=%{_jvmdir}/java -export JAVA_HOME=$JAVA5_HOME -mvn-rpmbuild install javadoc:aggregate +mvn-rpmbuild package javadoc:aggregate %install mkdir -p %{buildroot}%{_javadir}/%{name} install -pm 644 api/target/%{name}-api-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/api-tests.jar install -pm 644 api/target/%{name}-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/api.jar +install -pm 644 api-nio2/target/%{name}-api-nio2-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/api-nio2.jar install -pm 644 build-resources/target/%{name}-build-resources-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/build-resources.jar install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/impl-base-tests.jar install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/impl-base.jar +install -pm 644 impl-nio2/target/%{name}-impl-nio2-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/impl-nio2.jar install -pm 644 spi/target/%{name}-spi-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/spi.jar mkdir -p %{buildroot}%{_mavenpomdir} @@ -85,12 +89,18 @@ install -pm 644 bom/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-bom.pom %add_maven_depmap JPP.%{name}-bom.pom install -pm 644 depchain/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-depchain.pom %add_maven_depmap JPP.%{name}-depchain.pom +install -pm 644 depchain-java7/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-depchain-java7.pom +%add_maven_depmap JPP.%{name}-depchain-java7.pom install -pm 644 api/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-api.pom %add_maven_depmap JPP.%{name}-api.pom %{name}/api.jar +install -pm 644 api-nio2/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-api-nio2.pom +%add_maven_depmap JPP.%{name}-api-nio2.pom %{name}/api-nio2.jar install -pm 644 build-resources/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-build-resources.pom %add_maven_depmap JPP.%{name}-build-resources.pom %{name}/build-resources.jar install -pm 644 impl-base/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-impl-base.pom %add_maven_depmap JPP.%{name}-impl-base.pom %{name}/impl-base.jar +install -pm 644 impl-nio2/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-impl-nio2.pom +%add_maven_depmap JPP.%{name}-impl-nio2.pom %{name}/impl-nio2.jar install -pm 644 spi/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-spi.pom %add_maven_depmap JPP.%{name}-spi.pom %{name}/spi.jar @@ -101,13 +111,16 @@ cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadir}/%{name}/*.jar %{_mavenpomdir}/JPP.%{name}-*.pom %{_mavendepmapfragdir}/%{name} -%doc LICENSE-2.0.txt +%doc LICENSE %files javadoc %{_javadocdir}/%{name} -%doc LICENSE-2.0.txt +%doc LICENSE %changelog +* Tue May 07 2013 gil cattaneo 1.1.2-1 +- update to 1.1.2 + * Tue Feb 19 2013 gil cattaneo 1.0.0-5 - set java.home for enforcer-plugin diff --git a/sources b/sources index 8a10c31..330168e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12a861a091ebedfeb830ece9b4e516de shrinkwrap-1.0.0.tar.xz +1ab222f83a8445ceaca182cd55079cc5 shrinkwrap-1.1.2.tar.xz From d4df393c490116bb43cf9627f611c6f97de4adc5 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 2 Jul 2013 16:03:38 +0200 Subject: [PATCH 06/29] build with XMvn --- .gitignore | 1 + shrinkwrap.spec | 79 ++++++++++++++----------------------------------- sources | 2 +- 3 files changed, 25 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 79902d9..31c5668 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /shrinkwrap-1.0.0.tar.xz /shrinkwrap-1.1.2.tar.xz +/1.1.2.tar.gz diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 4e0542d..80dca55 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,42 +2,31 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple mechanism to assemble Java archives -Group: Development/Libraries License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ -# git clone git://github.com/shrinkwrap/shrinkwrap.git shrinkwrap-1.1.2 -# (cd shrinkwrap-1.1.2 && git archive --format=tar --prefix=shrinkwrap-1.1.2/ 1.1.2 | xz > ../shrinkwrap-1.1.2.tar.xz) -Source0: %{name}-%{namedversion}.tar.xz +Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{namedversion}.tar.gz # remove env.JAVA"x"_HOME # malformed pom file, not able to use pom macros Patch0: %{name}-%{namedversion}-remove-enforcer-requireProperty.patch BuildRequires: java-devel -BuildRequires: jboss-parent +BuildRequires: mvn(org.jboss:jboss-parent) -BuildRequires: apiviz -BuildRequires: junit +BuildRequires: mvn(org.jboss.apiviz:apiviz) +BuildRequires: mvn(junit:junit) BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin -BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin BuildRequires: maven-source-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) -Requires: junit - -Requires: java BuildArch: noarch %description @@ -45,7 +34,6 @@ Shrinkwrap provides a simple mechanism to assemble archives like JARs, WARs, and EARs with a friendly, fluent API. %package javadoc -Group: Documentation Summary: Javadoc for %{name} %description javadoc @@ -66,58 +54,37 @@ This package contains javadoc for %{name}. sed -i 's/\r//' LICENSE +%mvn_file :%{name}-api %{name}/api +%mvn_file :%{name}-api-nio2 %{name}/api-nio2 +%mvn_file :%{name}-build-resources %{name}/build-resources +%mvn_file :%{name}-impl-base %{name}/impl-base +%mvn_file :%{name}-impl-nio2 %{name}/impl-nio2 +%mvn_file :%{name}-spi %{name}/spi + %build -mvn-rpmbuild package javadoc:aggregate +%mvn_build %install +%mvn_install -mkdir -p %{buildroot}%{_javadir}/%{name} install -pm 644 api/target/%{name}-api-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/api-tests.jar -install -pm 644 api/target/%{name}-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/api.jar -install -pm 644 api-nio2/target/%{name}-api-nio2-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/api-nio2.jar -install -pm 644 build-resources/target/%{name}-build-resources-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/build-resources.jar install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/impl-base-tests.jar -install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/impl-base.jar -install -pm 644 impl-nio2/target/%{name}-impl-nio2-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/impl-nio2.jar -install -pm 644 spi/target/%{name}-spi-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/spi.jar -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom -%add_maven_depmap JPP.%{name}-parent.pom -install -pm 644 bom/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-bom.pom -%add_maven_depmap JPP.%{name}-bom.pom -install -pm 644 depchain/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-depchain.pom -%add_maven_depmap JPP.%{name}-depchain.pom -install -pm 644 depchain-java7/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-depchain-java7.pom -%add_maven_depmap JPP.%{name}-depchain-java7.pom -install -pm 644 api/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-api.pom -%add_maven_depmap JPP.%{name}-api.pom %{name}/api.jar -install -pm 644 api-nio2/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-api-nio2.pom -%add_maven_depmap JPP.%{name}-api-nio2.pom %{name}/api-nio2.jar -install -pm 644 build-resources/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-build-resources.pom -%add_maven_depmap JPP.%{name}-build-resources.pom %{name}/build-resources.jar -install -pm 644 impl-base/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-impl-base.pom -%add_maven_depmap JPP.%{name}-impl-base.pom %{name}/impl-base.jar -install -pm 644 impl-nio2/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-impl-nio2.pom -%add_maven_depmap JPP.%{name}-impl-nio2.pom %{name}/impl-nio2.jar -install -pm 644 spi/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-spi.pom -%add_maven_depmap JPP.%{name}-spi.pom %{name}/spi.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/JPP.%{name}-*.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles +%dir %{_javadir}/%{name} +%{_javadir}/%{name}/api-tests.jar +%{_javadir}/%{name}/impl-base-tests.jar %doc LICENSE -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE %changelog +* Tue Jul 02 2013 gil cattaneo 1.1.2-2 +- build with XMvn +- minor changes to adapt to current guideline + * Tue May 07 2013 gil cattaneo 1.1.2-1 - update to 1.1.2 diff --git a/sources b/sources index 330168e..44e4246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ab222f83a8445ceaca182cd55079cc5 shrinkwrap-1.1.2.tar.xz +a967b3ee4aa6d61724f608944e425604 1.1.2.tar.gz From 4c5ca1798d1649e465d8066b683945844570dbd5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 09:25:09 -0500 Subject: [PATCH 07/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 80dca55..88d5700 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ @@ -81,6 +81,9 @@ install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{b %doc LICENSE %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 02 2013 gil cattaneo 1.1.2-2 - build with XMvn - minor changes to adapt to current guideline From 50888792fe4f8d156ea80c000053f221f8997772 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 15:11:04 +0100 Subject: [PATCH 08/29] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 88d5700..57cf64d 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ @@ -81,6 +81,9 @@ install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{b %doc LICENSE %changelog +* Fri Mar 28 2014 Michael Simacek - 1.1.2-4 +- Use Requires: java-headless rebuild (#1067528) + * Sun Aug 04 2013 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From f8ddab4c682921e2bc36c84802a574df54bb3b77 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:18:46 -0500 Subject: [PATCH 09/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 57cf64d..36dbb69 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ @@ -81,6 +81,9 @@ install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{b %doc LICENSE %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 28 2014 Michael Simacek - 1.1.2-4 - Use Requires: java-headless rebuild (#1067528) From 1a6f73565b89571f7dd139e34ed8c139e02e8c33 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 10 Jun 2014 02:24:38 +0200 Subject: [PATCH 10/29] fix BR list --- shrinkwrap.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 36dbb69..afdb8e6 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -12,7 +12,7 @@ Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{namedversion}. Patch0: %{name}-%{namedversion}-remove-enforcer-requireProperty.patch BuildRequires: java-devel -BuildRequires: mvn(org.jboss:jboss-parent) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.apiviz:apiviz) BuildRequires: mvn(junit:junit) @@ -21,11 +21,11 @@ BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-source-plugin -BuildRequires: maven-surefire-provider-junit4 +BuildRequires: maven-surefire-provider-junit # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch From d41ebb9f30f5c91bb93d5f3447471b5e70ed9a58 Mon Sep 17 00:00:00 2001 From: gil Date: Wed, 11 Feb 2015 21:05:02 +0100 Subject: [PATCH 11/29] introduce license macro --- shrinkwrap.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index afdb8e6..1027237 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ @@ -11,17 +11,13 @@ Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{namedversion}. # malformed pom file, not able to use pom macros Patch0: %{name}-%{namedversion}-remove-enforcer-requireProperty.patch -BuildRequires: java-devel BuildRequires: mvn(org.jboss:jboss-parent:pom:) - BuildRequires: mvn(org.jboss.apiviz:apiviz) BuildRequires: mvn(junit:junit) - BuildRequires: maven-local BuildRequires: maven-checkstyle-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-source-plugin -BuildRequires: maven-surefire-provider-junit # required by enforcer-plugin BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) @@ -75,12 +71,15 @@ install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{b %dir %{_javadir}/%{name} %{_javadir}/%{name}/api-tests.jar %{_javadir}/%{name}/impl-base-tests.jar -%doc LICENSE +%license LICENSE %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license LICENSE %changelog +* Wed Feb 11 2015 gil cattaneo 1.1.2-6 +- introduce license macro + * Sun Jun 08 2014 Fedora Release Engineering - 1.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f750ae1d3123907948c27618bba349c7d9fba358 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 00:48:44 +0000 Subject: [PATCH 12/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 1027237..0549290 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ @@ -77,6 +77,9 @@ install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{b %license LICENSE %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Feb 11 2015 gil cattaneo 1.1.2-6 - introduce license macro From 5cf57718aa5be65433714df53cc9c951d0fdb87d Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 19 Jun 2015 17:44:13 +0200 Subject: [PATCH 13/29] disable checkstyle plugin --- shrinkwrap.spec | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 0549290..4e6d719 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -15,7 +15,7 @@ BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.apiviz:apiviz) BuildRequires: mvn(junit:junit) BuildRequires: maven-local -BuildRequires: maven-checkstyle-plugin +#BuildRequires: maven-checkstyle-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-source-plugin @@ -41,13 +41,25 @@ This package contains javadoc for %{name}. %pom_disable_module dist # remove env.JAVA"x"_HOME -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" api -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" api-nio2 -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" impl-nio2 -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" impl-base +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" api +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" api-nio2 +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" impl-nio2 +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" impl-base %pom_xpath_remove "pom:profiles" impl-base +# [ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.12:check +# (checkstyle-report) on project shrinkwrap-api: Failed during checkstyle configuration: +# cannot initialize module TreeWalker - Unable to instantiate RedundantThrows: +# Unable to instantiate RedundantThrowsCheck +%pom_remove_plugin :maven-checkstyle-plugin +%pom_remove_plugin :maven-checkstyle-plugin api +%pom_remove_plugin :maven-checkstyle-plugin api-nio2 +%pom_remove_plugin :maven-checkstyle-plugin impl-base +%pom_remove_plugin :maven-checkstyle-plugin impl-nio2 +%pom_remove_plugin :maven-checkstyle-plugin spi + + sed -i 's/\r//' LICENSE %mvn_file :%{name}-api %{name}/api @@ -57,6 +69,9 @@ sed -i 's/\r//' LICENSE %mvn_file :%{name}-impl-nio2 %{name}/impl-nio2 %mvn_file :%{name}-spi %{name}/spi +%mvn_package :%{name}-api::tests: +%mvn_package :%{name}-impl-base::tests: + %build %mvn_build @@ -64,13 +79,8 @@ sed -i 's/\r//' LICENSE %install %mvn_install -install -pm 644 api/target/%{name}-api-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/api-tests.jar -install -pm 644 impl-base/target/%{name}-impl-base-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/impl-base-tests.jar - %files -f .mfiles %dir %{_javadir}/%{name} -%{_javadir}/%{name}/api-tests.jar -%{_javadir}/%{name}/impl-base-tests.jar %license LICENSE %files javadoc -f .mfiles-javadoc From 82977e3d7f009978db533665dc2618229929c1cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:58:44 +0000 Subject: [PATCH 14/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 4e6d719..b47cde0 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 Url: http://www.jboss.org/shrinkwrap/ @@ -87,6 +87,9 @@ sed -i 's/\r//' LICENSE %license LICENSE %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From ecb768663eb2c641b0fec80adab6af791dd6fe3f Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 10 Mar 2016 11:55:35 +0100 Subject: [PATCH 15/29] update to 1.2.3 --- .gitignore | 1 + LICENSE-2.0.txt | 202 ------------------ ....1.2-remove-enforcer-requireProperty.patch | 19 -- shrinkwrap.spec | 152 +++++++++---- sources | 2 +- 5 files changed, 108 insertions(+), 268 deletions(-) delete mode 100644 LICENSE-2.0.txt delete mode 100644 shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch diff --git a/.gitignore b/.gitignore index 31c5668..83b19e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /shrinkwrap-1.0.0.tar.xz /shrinkwrap-1.1.2.tar.xz /1.1.2.tar.gz +/1.2.3.tar.gz diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt deleted file mode 100644 index d645695..0000000 --- a/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch b/shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch deleted file mode 100644 index eae391c..0000000 --- a/shrinkwrap-1.1.2-remove-enforcer-requireProperty.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- pom.xml 2013-03-07 10:05:24.000000000 +0100 -+++ pom.xml-gil 2013-05-07 12:49:38.644992397 +0200 -@@ -209,14 +209,14 @@ - - 1.7.0 - -- -+ - - - diff --git a/shrinkwrap.spec b/shrinkwrap.spec index b47cde0..9e274ee 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,27 +1,22 @@ %global namedreltag %{nil} %global namedversion %{version}%{?namedreltag} Name: shrinkwrap -Version: 1.1.2 -Release: 8%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: A simple mechanism to assemble Java archives License: ASL 2.0 -Url: http://www.jboss.org/shrinkwrap/ +Url: http://arquillian.org/modules/shrinkwrap-shrinkwrap/ Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{namedversion}.tar.gz -# remove env.JAVA"x"_HOME -# malformed pom file, not able to use pom macros -Patch0: %{name}-%{namedversion}-remove-enforcer-requireProperty.patch +BuildRequires: maven-local +BuildRequires: mvn(jdepend:jdepend) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.apiviz:apiviz) -BuildRequires: mvn(junit:junit) -BuildRequires: maven-local -#BuildRequires: maven-checkstyle-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-source-plugin - -# required by enforcer-plugin -BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) BuildArch: noarch @@ -29,6 +24,62 @@ BuildArch: noarch Shrinkwrap provides a simple mechanism to assemble archives like JARs, WARs, and EARs with a friendly, fluent API. +%package api-nio2 +Summary: ShrinkWrap NIO.2 API + +%description api-nio2 +ShrinkWrap NIO.2 API. + +%package bom +Summary: ShrinkWrap Bill of Materials + +%description bom +Centralized dependency Management for the ShrinkWrap Project. + +%package build-resources +Summary: Shrinkwrap Build Resources + +%description build-resources +Shrinkwrap Build Resources. + +%package depchain +Summary: ShrinkWrap Dependency Chain + +%description depchain +Single-POM Definition to export the ShrinkWrap artifacts +in proper scope. + +%package depchain-java7 +Summary: ShrinkWrap Dependency Chain for Java7 Environments + +%description depchain-java7 +Single-POM Definition to export the ShrinkWrap artifacts +in proper scope for Java 7 Environments. + +%package impl-base +Summary: ShrinkWrap Implementation Base + +%description impl-base +Common Base for Implementations of the ShrinkWrap Project. + +%package impl-nio2 +Summary: ShrinkWrap NIO.2 Implementation + +%description impl-nio2 +ShrinkWrap NIO.2 Implementation. + +%package parent +Summary: ShrinkWrap Aggregator and Build Parent + +%description parent +ShrinkWrap Aggregator POM. + +%package spi +Summary: ShrinkWrap SPI + +%description spi +Generic Service Provider Contract of the ShrinkWrap Project. + %package javadoc Summary: Javadoc for %{name} @@ -37,56 +88,66 @@ This package contains javadoc for %{name}. %prep %setup -q -n %{name}-%{namedversion} -%patch0 -p0 %pom_disable_module dist + # remove env.JAVA"x"_HOME -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" api -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" api-nio2 -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:executable" impl-nio2 -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:configuration/pom:jvm" impl-base +%pom_xpath_remove "pom:requireProperty" +# Option UseSplitVerifier support was removed in 8.0 +# -XX:-UseSplitVerifier +%pom_xpath_remove "pom:configuration/pom:argLine" +%pom_xpath_remove "pom:configuration/pom:jvm" api +%pom_xpath_remove "pom:configuration/pom:jvm" impl-base %pom_xpath_remove "pom:profiles" impl-base -# [ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.12:check -# (checkstyle-report) on project shrinkwrap-api: Failed during checkstyle configuration: -# cannot initialize module TreeWalker - Unable to instantiate RedundantThrows: -# Unable to instantiate RedundantThrowsCheck -%pom_remove_plugin :maven-checkstyle-plugin -%pom_remove_plugin :maven-checkstyle-plugin api -%pom_remove_plugin :maven-checkstyle-plugin api-nio2 -%pom_remove_plugin :maven-checkstyle-plugin impl-base -%pom_remove_plugin :maven-checkstyle-plugin impl-nio2 -%pom_remove_plugin :maven-checkstyle-plugin spi +%pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin -r org.eclipse.m2e:lifecycle-mapping +# Convert from dos to unix line ending +sed -i.orig 's|\r||g' LICENSE +touch -r LICENSE.orig LICENSE +rm LICENSE.orig -sed -i 's/\r//' LICENSE - -%mvn_file :%{name}-api %{name}/api -%mvn_file :%{name}-api-nio2 %{name}/api-nio2 -%mvn_file :%{name}-build-resources %{name}/build-resources -%mvn_file :%{name}-impl-base %{name}/impl-base -%mvn_file :%{name}-impl-nio2 %{name}/impl-nio2 -%mvn_file :%{name}-spi %{name}/spi - -%mvn_package :%{name}-api::tests: -%mvn_package :%{name}-impl-base::tests: +%mvn_package :%{name}-api::tests: %{name}-api +%mvn_package :%{name}-impl-base::tests: %{name}-impl-base %build -%mvn_build +%mvn_build -s %install %mvn_install -%files -f .mfiles -%dir %{_javadir}/%{name} +%files -f .mfiles-%{name}-api +%license LICENSE + +%files api-nio2 -f .mfiles-%{name}-api-nio2 +%files impl-base -f .mfiles-%{name}-impl-base +%files impl-nio2 -f .mfiles-%{name}-impl-nio2 +%files spi -f .mfiles-%{name}-spi + +%files bom -f .mfiles-%{name}-bom +%license LICENSE + +%files build-resources -f .mfiles-%{name}-build-resources +%license LICENSE + +%files depchain -f .mfiles-%{name}-depchain +%license LICENSE + +%files depchain-java7 -f .mfiles-%{name}-depchain-java7 +%license LICENSE + +%files parent -f .mfiles-%{name}-parent %license LICENSE %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Wed Mar 09 2016 gil cattaneo 1.2.3-1 +- update to 1.2.3 + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -127,4 +188,3 @@ sed -i 's/\r//' LICENSE * Sat Apr 21 2012 gil cattaneo 1.0.0-1 - initial rpm - diff --git a/sources b/sources index 44e4246..7f4d5b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a967b3ee4aa6d61724f608944e425604 1.1.2.tar.gz +51ca4c3e0336a661e47cf14163f9b7da 1.2.3.tar.gz From befa5bde1a43ab97cfdfd28e3e0dc9c2d08aad41 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 11 Mar 2016 10:40:47 +0100 Subject: [PATCH 16/29] fix impl-base license field --- shrinkwrap.spec | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 9e274ee..cc6890c 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,8 +2,10 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple mechanism to assemble Java archives +# Some file are without license headers +# reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 License: ASL 2.0 Url: http://arquillian.org/modules/shrinkwrap-shrinkwrap/ Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{namedversion}.tar.gz @@ -34,7 +36,7 @@ ShrinkWrap NIO.2 API. Summary: ShrinkWrap Bill of Materials %description bom -Centralized dependency Management for the ShrinkWrap Project. +Centralized dependencyManagement for the ShrinkWrap Project. %package build-resources Summary: Shrinkwrap Build Resources @@ -46,18 +48,32 @@ Shrinkwrap Build Resources. Summary: ShrinkWrap Dependency Chain %description depchain -Single-POM Definition to export the ShrinkWrap artifacts -in proper scope. +Single-POM Definition to export the +ShrinkWrap artifacts in proper scope. %package depchain-java7 Summary: ShrinkWrap Dependency Chain for Java7 Environments %description depchain-java7 -Single-POM Definition to export the ShrinkWrap artifacts -in proper scope for Java 7 Environments. +Single-POM Definition to export the +ShrinkWrap artifacts in proper scope +for Java 7 Environments. %package impl-base Summary: ShrinkWrap Implementation Base +# Public Domain: +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/InvalidHeaderException.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarArchive.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarBuffer.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarEntry.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarGzOutputStream.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarHeader.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarInputStream.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarOutputStream.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarOutputStreamImpl.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarProgressDisplay.java +# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarTransFileTyper.java +License: ASL 2.0 and Public Domain %description impl-base Common Base for Implementations of the ShrinkWrap Project. @@ -145,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Wed Mar 09 2016 gil cattaneo 1.2.3-2 +- fix impl-base license field + * Wed Mar 09 2016 gil cattaneo 1.2.3-1 - update to 1.2.3 From fc2acb7eed2b304059c2dc105c977167f6f6ce37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:25:37 +0000 Subject: [PATCH 17/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index cc6890c..76539c7 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple mechanism to assemble Java archives # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -161,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Mar 09 2016 gil cattaneo 1.2.3-2 - fix impl-base license field From d2e6c83d6762f80a63088e419acd7eb728d8a512 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:34:54 +0000 Subject: [PATCH 18/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 76539c7..0a802ff 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simple mechanism to assemble Java archives # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -161,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 958287db87a5d5978240b357710e5193429e3d5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:41:55 +0000 Subject: [PATCH 19/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 0a802ff..8489ef7 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simple mechanism to assemble Java archives # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -161,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 2953f342592aea74475a5b1c8d8928367e489dae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:06:03 +0000 Subject: [PATCH 20/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 8489ef7..f2cd9d3 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simple mechanism to assemble Java archives # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -161,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.2.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3ff22e56ef904476774211e6ab9b4ca65f012ba0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:22:36 +0000 Subject: [PATCH 21/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index f2cd9d3..6d05d18 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A simple mechanism to assemble Java archives # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -161,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a1154f040a2c168d9086511af616655617729c10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:16:17 +0000 Subject: [PATCH 22/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 6d05d18..c1598de 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: shrinkwrap Version: 1.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A simple mechanism to assemble Java archives # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -161,6 +161,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.2.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0833bac0b2fd8d3ccbcef5452550cbe658de18cc Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 11 Oct 2019 12:29:47 +0200 Subject: [PATCH 23/29] update to version 1.2.6 --- .gitignore | 4 ++++ shrinkwrap.spec | 27 ++++++++++++--------------- sources | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 83b19e6..0c4f1fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ +/results_* +/*.src.rpm + /shrinkwrap-1.0.0.tar.xz /shrinkwrap-1.1.2.tar.xz /1.1.2.tar.gz /1.2.3.tar.gz +/shrinkwrap-1.2.6.tar.gz diff --git a/shrinkwrap.spec b/shrinkwrap.spec index c1598de..affe856 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,24 +1,18 @@ -%global namedreltag %{nil} -%global namedversion %{version}%{?namedreltag} Name: shrinkwrap -Version: 1.2.3 -Release: 8%{?dist} -Summary: A simple mechanism to assemble Java archives +Version: 1.2.6 +Release: 1%{?dist} +Summary: Java API for Archive Manipulation # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 License: ASL 2.0 -Url: http://arquillian.org/modules/shrinkwrap-shrinkwrap/ -Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{namedversion}.tar.gz + +URL: http://arquillian.org/modules/shrinkwrap-shrinkwrap/ +Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: maven-local -BuildRequires: mvn(jdepend:jdepend) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.jboss:jboss-parent:pom:) -BuildRequires: mvn(org.jboss.apiviz:apiviz) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildArch: noarch @@ -103,7 +97,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n %{name}-%{namedversion} +%autosetup -p1 %pom_disable_module dist @@ -117,6 +111,7 @@ This package contains javadoc for %{name}. %pom_xpath_remove "pom:profiles" impl-base %pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin -r :maven-release-plugin %pom_remove_plugin -r org.eclipse.m2e:lifecycle-mapping # Convert from dos to unix line ending @@ -128,7 +123,6 @@ rm LICENSE.orig %mvn_package :%{name}-impl-base::tests: %{name}-impl-base %build - %mvn_build -s %install @@ -161,6 +155,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Fri Oct 11 2019 Fabio Valentini - 1.2.6-1 +- Update to version 1.2.6. + * Fri Jul 26 2019 Fedora Release Engineering - 1.2.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7f4d5b5..1cf90d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51ca4c3e0336a661e47cf14163f9b7da 1.2.3.tar.gz +SHA512 (shrinkwrap-1.2.6.tar.gz) = 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c From 027d17c7fc470905c9eae29bfee070325e43191c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:25:01 +0000 Subject: [PATCH 24/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index affe856..89db2d8 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,6 +1,6 @@ Name: shrinkwrap Version: 1.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java API for Archive Manipulation # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -155,6 +155,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Oct 11 2019 Fabio Valentini - 1.2.6-1 - Update to version 1.2.6. From 03d62f280e4f78b32cd9262be737677b46836d46 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 06:30:00 +0200 Subject: [PATCH 25/29] Rebuilt for JDK-11 --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 89db2d8..81c231f 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,6 +1,6 @@ Name: shrinkwrap Version: 1.2.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java API for Archive Manipulation # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -155,6 +155,9 @@ rm LICENSE.orig %license LICENSE %changelog +* Sat Jul 11 2020 Jiri Vanek - 1.2.6-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jan 30 2020 Fedora Release Engineering - 1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d53860539f63e58d5d17a7b83873849e8e12f621 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 22 Jul 2020 22:38:30 +0200 Subject: [PATCH 26/29] various adaptations to make the package build with Java 11 --- shrinkwrap.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 81c231f..936d0a9 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,6 +1,6 @@ Name: shrinkwrap Version: 1.2.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java API for Archive Manipulation # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -10,6 +10,7 @@ URL: http://arquillian.org/modules/shrinkwrap-shrinkwrap/ Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: maven-local +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.jboss:jboss-parent:pom:) @@ -103,6 +104,7 @@ This package contains javadoc for %{name}. # remove env.JAVA"x"_HOME %pom_xpath_remove "pom:requireProperty" + # Option UseSplitVerifier support was removed in 8.0 # -XX:-UseSplitVerifier %pom_xpath_remove "pom:configuration/pom:argLine" @@ -110,6 +112,11 @@ This package contains javadoc for %{name}. %pom_xpath_remove "pom:configuration/pom:jvm" impl-base %pom_xpath_remove "pom:profiles" impl-base +%pom_add_dep jakarta.activation:jakarta.activation-api impl-base + +# remove maven-compiler-plugin configuration that is broken with Java 11 +%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' + %pom_remove_plugin -r :maven-checkstyle-plugin %pom_remove_plugin -r :maven-release-plugin %pom_remove_plugin -r org.eclipse.m2e:lifecycle-mapping @@ -119,11 +126,17 @@ sed -i.orig 's|\r||g' LICENSE touch -r LICENSE.orig LICENSE rm LICENSE.orig +# remove a few tests that are broken with Java 9+ class loading changes +rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java +rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java +rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java +rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java + %mvn_package :%{name}-api::tests: %{name}-api %mvn_package :%{name}-impl-base::tests: %{name}-impl-base %build -%mvn_build -s +%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -155,6 +168,11 @@ rm LICENSE.orig %license LICENSE %changelog +* Wed Jul 22 2020 Fabio Valentini - 1.2.6-4 +- Override javac source / target versions with 1.8 to fix building with Java 11. +- Add missing dependency for javax.activation (removed with Java 11). +- Drop a few tests that are broken with Java 9+ class loading changes. + * Sat Jul 11 2020 Jiri Vanek - 1.2.6-3 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From dddbd9620c612c05df1700387d51a4ab6f9bd4ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:41:33 +0000 Subject: [PATCH 27/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 936d0a9..1af4c6b 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,6 +1,6 @@ Name: shrinkwrap Version: 1.2.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java API for Archive Manipulation # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -168,6 +168,9 @@ rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTes %license LICENSE %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 22 2020 Fabio Valentini - 1.2.6-4 - Override javac source / target versions with 1.8 to fix building with Java 11. - Add missing dependency for javax.activation (removed with Java 11). From 16fc90707b23597941dd2619959f4f1deb65734b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:21:16 +0000 Subject: [PATCH 28/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shrinkwrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shrinkwrap.spec b/shrinkwrap.spec index 1af4c6b..b6a8a94 100644 --- a/shrinkwrap.spec +++ b/shrinkwrap.spec @@ -1,6 +1,6 @@ Name: shrinkwrap Version: 1.2.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java API for Archive Manipulation # Some file are without license headers # reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 @@ -168,6 +168,9 @@ rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTes %license LICENSE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ab977bb05c112cd07cd5b7f51d6a007a726802b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 8 Jun 2021 21:25:23 +0200 Subject: [PATCH 29/29] Orphaned for 6+ weeks --- .gitignore | 8 -- dead.package | 1 + shrinkwrap.spec | 254 ------------------------------------------------ sources | 1 - 4 files changed, 1 insertion(+), 263 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 shrinkwrap.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0c4f1fd..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/results_* -/*.src.rpm - -/shrinkwrap-1.0.0.tar.xz -/shrinkwrap-1.1.2.tar.xz -/1.1.2.tar.gz -/1.2.3.tar.gz -/shrinkwrap-1.2.6.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/shrinkwrap.spec b/shrinkwrap.spec deleted file mode 100644 index b6a8a94..0000000 --- a/shrinkwrap.spec +++ /dev/null @@ -1,254 +0,0 @@ -Name: shrinkwrap -Version: 1.2.6 -Release: 6%{?dist} -Summary: Java API for Archive Manipulation -# Some file are without license headers -# reported @ https://issues.jboss.org/browse/SHRINKWRAP-501 -License: ASL 2.0 - -URL: http://arquillian.org/modules/shrinkwrap-shrinkwrap/ -Source0: https://github.com/shrinkwrap/shrinkwrap/archive/%{version}/%{name}-%{version}.tar.gz - -BuildRequires: maven-local -BuildRequires: mvn(jakarta.activation:jakarta.activation-api) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.jboss:jboss-parent:pom:) - -BuildArch: noarch - -%description -Shrinkwrap provides a simple mechanism to assemble archives -like JARs, WARs, and EARs with a friendly, fluent API. - -%package api-nio2 -Summary: ShrinkWrap NIO.2 API - -%description api-nio2 -ShrinkWrap NIO.2 API. - -%package bom -Summary: ShrinkWrap Bill of Materials - -%description bom -Centralized dependencyManagement for the ShrinkWrap Project. - -%package build-resources -Summary: Shrinkwrap Build Resources - -%description build-resources -Shrinkwrap Build Resources. - -%package depchain -Summary: ShrinkWrap Dependency Chain - -%description depchain -Single-POM Definition to export the -ShrinkWrap artifacts in proper scope. - -%package depchain-java7 -Summary: ShrinkWrap Dependency Chain for Java7 Environments - -%description depchain-java7 -Single-POM Definition to export the -ShrinkWrap artifacts in proper scope -for Java 7 Environments. - -%package impl-base -Summary: ShrinkWrap Implementation Base -# Public Domain: -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/InvalidHeaderException.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarArchive.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarBuffer.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarEntry.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarGzOutputStream.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarHeader.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarInputStream.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarOutputStream.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarOutputStreamImpl.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarProgressDisplay.java -# ./impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/tar/TarTransFileTyper.java -License: ASL 2.0 and Public Domain - -%description impl-base -Common Base for Implementations of the ShrinkWrap Project. - -%package impl-nio2 -Summary: ShrinkWrap NIO.2 Implementation - -%description impl-nio2 -ShrinkWrap NIO.2 Implementation. - -%package parent -Summary: ShrinkWrap Aggregator and Build Parent - -%description parent -ShrinkWrap Aggregator POM. - -%package spi -Summary: ShrinkWrap SPI - -%description spi -Generic Service Provider Contract of the ShrinkWrap Project. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains javadoc for %{name}. - -%prep -%autosetup -p1 - -%pom_disable_module dist - -# remove env.JAVA"x"_HOME -%pom_xpath_remove "pom:requireProperty" - -# Option UseSplitVerifier support was removed in 8.0 -# -XX:-UseSplitVerifier -%pom_xpath_remove "pom:configuration/pom:argLine" -%pom_xpath_remove "pom:configuration/pom:jvm" api -%pom_xpath_remove "pom:configuration/pom:jvm" impl-base -%pom_xpath_remove "pom:profiles" impl-base - -%pom_add_dep jakarta.activation:jakarta.activation-api impl-base - -# remove maven-compiler-plugin configuration that is broken with Java 11 -%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' - -%pom_remove_plugin -r :maven-checkstyle-plugin -%pom_remove_plugin -r :maven-release-plugin -%pom_remove_plugin -r org.eclipse.m2e:lifecycle-mapping - -# Convert from dos to unix line ending -sed -i.orig 's|\r||g' LICENSE -touch -r LICENSE.orig LICENSE -rm LICENSE.orig - -# remove a few tests that are broken with Java 9+ class loading changes -rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java -rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java -rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java -rm impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java - -%mvn_package :%{name}-api::tests: %{name}-api -%mvn_package :%{name}-impl-base::tests: %{name}-impl-base - -%build -%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 - -%install -%mvn_install - -%files -f .mfiles-%{name}-api -%license LICENSE - -%files api-nio2 -f .mfiles-%{name}-api-nio2 -%files impl-base -f .mfiles-%{name}-impl-base -%files impl-nio2 -f .mfiles-%{name}-impl-nio2 -%files spi -f .mfiles-%{name}-spi - -%files bom -f .mfiles-%{name}-bom -%license LICENSE - -%files build-resources -f .mfiles-%{name}-build-resources -%license LICENSE - -%files depchain -f .mfiles-%{name}-depchain -%license LICENSE - -%files depchain-java7 -f .mfiles-%{name}-depchain-java7 -%license LICENSE - -%files parent -f .mfiles-%{name}-parent -%license LICENSE - -%files javadoc -f .mfiles-javadoc -%license LICENSE - -%changelog -* Wed Jan 27 2021 Fedora Release Engineering - 1.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Fabio Valentini - 1.2.6-4 -- Override javac source / target versions with 1.8 to fix building with Java 11. -- Add missing dependency for javax.activation (removed with Java 11). -- Drop a few tests that are broken with Java 9+ class loading changes. - -* Sat Jul 11 2020 Jiri Vanek - 1.2.6-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Oct 11 2019 Fabio Valentini - 1.2.6-1 -- Update to version 1.2.6. - -* Fri Jul 26 2019 Fedora Release Engineering - 1.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Mar 09 2016 gil cattaneo 1.2.3-2 -- fix impl-base license field - -* Wed Mar 09 2016 gil cattaneo 1.2.3-1 -- update to 1.2.3 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 11 2015 gil cattaneo 1.1.2-6 -- introduce license macro - -* Sun Jun 08 2014 Fedora Release Engineering - 1.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 1.1.2-4 -- Use Requires: java-headless rebuild (#1067528) - -* Sun Aug 04 2013 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 02 2013 gil cattaneo 1.1.2-2 -- build with XMvn -- minor changes to adapt to current guideline - -* Tue May 07 2013 gil cattaneo 1.1.2-1 -- update to 1.1.2 - -* Tue Feb 19 2013 gil cattaneo 1.0.0-5 -- set java.home for enforcer-plugin - -* Thu Feb 14 2013 Fedora Release Engineering - 1.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.0.0-3 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Sat Jul 21 2012 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Apr 21 2012 gil cattaneo 1.0.0-1 -- initial rpm diff --git a/sources b/sources deleted file mode 100644 index 1cf90d6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (shrinkwrap-1.2.6.tar.gz) = 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c