[jetty/f19] Update to upstream version 9.0.3
by Michal Srb
commit 4669eb7341acfe387c4ef32b6c4453a793720a72
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu May 9 13:19:17 2013 +0200
Update to upstream version 9.0.3
.gitignore | 1 +
jetty.spec | 16 +++++++++++++---
sources | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80aebd5..549b8a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ jetty-6.1.26-src.zip
/jetty-9.0.0.RC3.tar.gz
/jetty-9.0.0.v20130308.tar.gz
/jetty-9.0.2.v20130417.tar.gz
+/jetty-9.0.3.v20130506.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 99b90a9..47722e4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20130417
+%global addver v20130506
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,7 +54,7 @@
%endif
Name: jetty
-Version: 9.0.2
+Version: 9.0.3
Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
@@ -455,7 +455,7 @@ License: (ASL 2.0 or EPL) and MIT
%{summary}.
%prep
-%setup -q -n %{jettyname}.project-%{jettyname}-%{version}.%{addver}
+%setup -q -n %{jettyname}-%{version}.%{addver}
for f in $(find . -name "*.?ar"); do rm $f; done
find . -name "*.class" -exec rm {} \;
@@ -481,10 +481,17 @@ find . -name "*.class" -exec rm {} \;
%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jetty-webapp']]" jetty-distribution/pom.xml
%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-proxy-webapp']]" jetty-distribution/pom.xml
%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='example-async-rest-webapp']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jaas-webapp']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jndi-webapp']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-spec-webapp']]" jetty-distribution/pom.xml
# Missing jars (jetty-setuid-java-1.0.0.jar,jetty-setuid-java-1.0.0-config.jar)
%pom_xpath_remove "pom:execution[pom:id[text()='unpack-setuid-config']]" jetty-distribution/pom.xml
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-distribution/pom.xml
+# test-jaas-webapp artifact is disabled
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-jaas-config']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-jndi-config']]" jetty-distribution/pom.xml
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-spec-config']]" jetty-distribution/pom.xml
# We don't have this plugin yet
%pom_remove_plugin :findbugs-maven-plugin jetty-websocket/pom.xml
@@ -789,6 +796,9 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%doc NOTICE.txt LICENSE*
%changelog
+* Thu May 09 2013 Michal Srb <msrb(a)redhat.com> - 9.0.3-1
+- Update to upstream version 9.0.3
+
* Mon Apr 22 2013 Michal Srb <msrb(a)redhat.com> - 9.0.2-1
- Update to upstream version 9.0.2
diff --git a/sources b/sources
index fb0cb46..f8a3788 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b93bf93b1ef3f2c96f272742d3fcc154 jetty-9.0.2.v20130417.tar.gz
+c012ca221b6f41a760a2900dbd912f0b jetty-9.0.3.v20130506.tar.gz
11 years
[shrinkwrap] update to 1.1.2
by gil
commit 010cb68e017197b87c95de0c3c74ebc2d8db4082
Author: gil <puntogil(a)libero.it>
Date: Tue May 7 14:22:47 2013 +0200
update to 1.1.2
.gitignore | 1 +
...rap-1.1.2-remove-enforcer-requireProperty.patch | 19 ++++++++
shrinkwrap.spec | 49 ++++++++++++-------
sources | 2 +-
4 files changed, 52 insertions(+), 19 deletions(-)
---
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 @@
+ <requireJavaVersion>
+ <version>1.7.0</version> <!-- Must be JDK7 -->
+ </requireJavaVersion>
+- <requireProperty>
++ <!--requireProperty>
+ <property>env.JAVA_HOME</property>
+ <message>"JAVA_HOME needs to be set (to Java7)"</message>
+ </requireProperty>
+ <requireProperty>
+ <property>env.JAVA5_HOME</property>
+ <message>"JAVA5_HOME needs to be set to run some tests in the JRE5 runtime"</message>
+- </requireProperty>
++ </requireProperty-->
+ </rules>
+ </configuration>
+ </plugin>
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|<module>dist</module>|<!--module>dist</module-->|" 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 <puntogil(a)libero.it> 1.1.2-1
+- update to 1.1.2
+
* Tue Feb 19 2013 gil cattaneo <puntogil(a)libero.it> 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
11 years
Broken dependencies: maven-dependency-plugin
by Fedora Koji Build System
maven-dependency-plugin has broken dependencies in the F-19 tree:
On x86_64:
maven-dependency-plugin-2.7-1.fc19.noarch requires mvn(org.apache.commons:commons-io)
On i386:
maven-dependency-plugin-2.7-1.fc19.noarch requires mvn(org.apache.commons:commons-io)
Please resolve this as soon as possible.
11 years