[jetty] Keep license files only in jetty-project and jetty-javadoc packages
by Mikolaj Izdebski
commit 1e7b3b2f8a0d5eccd292a0bf9f50e24a1513da6e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Apr 27 11:41:44 2012 +0200
Keep license files only in jetty-project and jetty-javadoc packages
jetty.spec | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 95fccba..63a20f7 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -824,7 +824,6 @@ fi
%files
-%doc NOTICE.txt README.txt VERSION.txt LICENSE*
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}
%{_bindir}/*
@@ -842,170 +841,143 @@ fi
%{_mavendepmapfragdir}/%{name}
%files project
-%doc NOTICE.txt LICENSE*
+%doc NOTICE.txt README.txt VERSION.txt LICENSE*
%dir %{_javadir}/%{name}
%{_mavenpomdir}/JPP.%{name}-project.pom
%{_mavendepmapfragdir}/%{name}-project
%files ajp
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-ajp.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-ajp.pom
%{_mavendepmapfragdir}/%{name}-%{name}-ajp
%files annotations
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-annotations.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-annotations.pom
%{_mavendepmapfragdir}/%{name}-%{name}-annotations
%files client
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-client.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-client.pom
%{_mavendepmapfragdir}/%{name}-%{name}-client
%files continuation
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-continuation.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-continuation.pom
%{_mavendepmapfragdir}/%{name}-%{name}-continuation
%files deploy
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-deploy.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-deploy.pom
%{_mavendepmapfragdir}/%{name}-%{name}-deploy
%files http
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-http.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-http.pom
%{_mavendepmapfragdir}/%{name}-%{name}-http
%files http-spi
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-http-spi.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-http-spi.pom
%{_mavendepmapfragdir}/%{name}-%{name}-http-spi
%files io
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-io.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-io.pom
%{_mavendepmapfragdir}/%{name}-%{name}-io
%files jaspi
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-jaspi.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-jaspi.pom
%{_mavendepmapfragdir}/%{name}-%{name}-jaspi
%files jmx
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-jmx.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-jmx.pom
%{_mavendepmapfragdir}/%{name}-%{name}-jmx
%files jndi
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-jndi.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-jndi.pom
%{_mavendepmapfragdir}/%{name}-%{name}-jndi
%files monitor
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-monitor.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-monitor.pom
%{_mavendepmapfragdir}/%{name}-%{name}-monitor
%files nested
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-nested.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-nested.pom
%{_mavendepmapfragdir}/%{name}-%{name}-nested
%files nosql
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-nosql.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-nosql.pom
%{_mavendepmapfragdir}/%{name}-%{name}-nosql
%files overlay-deployer
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-overlay-deployer.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-overlay-deployer.pom
%{_mavendepmapfragdir}/%{name}-%{name}-overlay-deployer
%files plus
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-plus.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-plus.pom
%{_mavendepmapfragdir}/%{name}-%{name}-plus
%files policy
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-policy.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-policy.pom
%{_mavendepmapfragdir}/%{name}-%{name}-policy
%files rewrite
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-rewrite.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-rewrite.pom
%{_mavendepmapfragdir}/%{name}-%{name}-rewrite
%files security
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-security.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-security.pom
%{_mavendepmapfragdir}/%{name}-%{name}-security
%files server
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-server.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-server.pom
%{_mavendepmapfragdir}/%{name}-%{name}-server
%files servlet
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-servlet.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-servlet.pom
%{_mavendepmapfragdir}/%{name}-%{name}-servlet
%files servlets
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-servlets.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-servlets.pom
%{_mavendepmapfragdir}/%{name}-%{name}-servlets
%files util
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-util.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-util.pom
%{_mavendepmapfragdir}/%{name}-%{name}-util
%files webapp
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-webapp.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-webapp.pom
%{_mavendepmapfragdir}/%{name}-%{name}-webapp
%files websocket
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-websocket.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-websocket.pom
%{_mavendepmapfragdir}/%{name}-%{name}-websocket
%files xml
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-xml.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-xml.pom
%{_mavendepmapfragdir}/%{name}-%{name}-xml
%if 0%{?rhel} <= 0
%files osgi
-%doc NOTICE.txt LICENSE*
%{_javadir}/%{name}/%{name}-osgi*.jar
%{_javadir}/%{name}/%{name}-httpservice.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-osgi*.pom
@@ -1018,6 +990,9 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Apr 27 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-4
+- Keep license files only in jetty-project and jetty-javadoc packages
+
* Fri Apr 27 2012 Alexander Kurtakov <akurtako(a)redhat.com> 8.1.2-3
- There is no epoch define in jetty.
12 years, 1 month
[jetty] There is no epoch define in jetty.
by Alexander Kurtakov
commit 61f083d013de77bd5e8676cfda55ee01a4f5a98f
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Apr 27 00:09:59 2012 +0300
There is no epoch define in jetty.
jetty.spec | 319 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 161 insertions(+), 158 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index f8ba5f7..95fccba 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -111,33 +111,33 @@ BuildArch: noarch
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-ajp = %{epoch}:%{version}-%{release}
-Requires: jetty-annotations = %{epoch}:%{version}-%{release}
-Requires: jetty-client = %{epoch}:%{version}-%{release}
-Requires: jetty-continuation = %{epoch}:%{version}-%{release}
-Requires: jetty-deploy = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-http-spi = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-jaspi = %{epoch}:%{version}-%{release}
-Requires: jetty-jmx = %{epoch}:%{version}-%{release}
-Requires: jetty-jndi = %{epoch}:%{version}-%{release}
-Requires: jetty-nested = %{epoch}:%{version}-%{release}
-Requires: jetty-nosql = %{epoch}:%{version}-%{release}
-Requires: jetty-overlay-deployer = %{epoch}:%{version}-%{release}
-Requires: jetty-plus = %{epoch}:%{version}-%{release}
-Requires: jetty-policy = %{epoch}:%{version}-%{release}
-Requires: jetty-rewrite = %{epoch}:%{version}-%{release}
-Requires: jetty-security = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-servlet = %{epoch}:%{version}-%{release}
-Requires: jetty-servlets = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
-Requires: jetty-websocket = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-ajp = %{version}-%{release}
+Requires: jetty-annotations = %{version}-%{release}
+Requires: jetty-client = %{version}-%{release}
+Requires: jetty-continuation = %{version}-%{release}
+Requires: jetty-deploy = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-http-spi = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-jaspi = %{version}-%{release}
+Requires: jetty-jmx = %{version}-%{release}
+Requires: jetty-jndi = %{version}-%{release}
+Requires: jetty-nested = %{version}-%{release}
+Requires: jetty-nosql = %{version}-%{release}
+Requires: jetty-overlay-deployer = %{version}-%{release}
+Requires: jetty-plus = %{version}-%{release}
+Requires: jetty-policy = %{version}-%{release}
+Requires: jetty-rewrite = %{version}-%{release}
+Requires: jetty-security = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-servlet = %{version}-%{release}
+Requires: jetty-servlets = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
+Requires: jetty-websocket = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
%if 0%{?rhel} <= 0
-Requires: jetty-osgi = %{epoch}:%{version}-%{release}
+Requires: jetty-osgi = %{version}-%{release}
%endif
Requires(post): systemd-units, systemd-sysv
@@ -179,11 +179,11 @@ Requires: jetty-parent
Summary: ajp module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description ajp
%{extdesc} %{summary}.
@@ -192,13 +192,13 @@ Requires: tomcat-servlet-3.0-api
Summary: annotations module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-plus = %{epoch}:%{version}-%{release}
-Requires: jetty-security = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-servlet = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-plus = %{version}-%{release}
+Requires: jetty-security = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-servlet = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
Requires: objectweb-asm
Requires: geronimo-annotation
Requires: tomcat-lib
@@ -209,10 +209,10 @@ Requires: tomcat-lib
Summary: client module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
%description client
%{extdesc} %{summary}.
@@ -221,8 +221,8 @@ Requires: jetty-util = %{epoch}:%{version}-%{release}
Summary: continuation module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description continuation
%{extdesc} %{summary}.
@@ -231,12 +231,12 @@ Requires: tomcat-servlet-3.0-api
Summary: deploy module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-jmx = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-jmx = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
%description deploy
%{extdesc} %{summary}.
@@ -245,9 +245,9 @@ Requires: jetty-xml = %{epoch}:%{version}-%{release}
Summary: http module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description http
%{extdesc} %{summary}.
@@ -256,9 +256,9 @@ Requires: tomcat-servlet-3.0-api
Summary: http-spi module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description http-spi
@@ -268,8 +268,8 @@ Requires: tomcat-servlet-3.0-api
Summary: io module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
%description io
%{extdesc} %{summary}.
@@ -278,10 +278,10 @@ Requires: jetty-util = %{epoch}:%{version}-%{release}
Summary: jaspi module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-security = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-security = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: geronimo-jaspic-spec
Requires: tomcat-servlet-3.0-api
@@ -292,8 +292,8 @@ Requires: tomcat-servlet-3.0-api
Summary: jmx module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
%description jmx
%{extdesc} %{summary}.
@@ -302,10 +302,10 @@ Requires: jetty-util = %{epoch}:%{version}-%{release}
Summary: jndi module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
Requires: %{_javadir}/javamail/mail.jar
%description jndi
@@ -315,11 +315,11 @@ Requires: %{_javadir}/javamail/mail.jar
Summary: monitor module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-client = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-client = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
%description monitor
%{extdesc} %{summary}.
@@ -328,11 +328,11 @@ Requires: jetty-xml = %{epoch}:%{version}-%{release}
Summary: nested module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description nested
@@ -342,9 +342,9 @@ Requires: tomcat-servlet-3.0-api
Summary: nosql module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: mongo-java-driver >= 2.6.5-4
Requires: tomcat-servlet-3.0-api
@@ -355,15 +355,15 @@ Requires: tomcat-servlet-3.0-api
Summary: overlay-deployer module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-deploy = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-jndi = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-servlet = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-deploy = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-jndi = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-servlet = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
Requires: geronimo-jta
Requires: tomcat-servlet-3.0-api
@@ -374,14 +374,14 @@ Requires: tomcat-servlet-3.0-api
Summary: plus module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-jndi = %{epoch}:%{version}-%{release}
-Requires: jetty-security = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-servlet = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-jndi = %{version}-%{release}
+Requires: jetty-security = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-servlet = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description plus
@@ -391,8 +391,8 @@ Requires: tomcat-servlet-3.0-api
Summary: policy module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
%description policy
%{extdesc} %{summary}.
@@ -401,12 +401,12 @@ Requires: jetty-util = %{epoch}:%{version}-%{release}
Summary: rewrite module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-client = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-client = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description rewrite
@@ -416,10 +416,10 @@ Requires: tomcat-servlet-3.0-api
Summary: security module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description security
@@ -429,12 +429,12 @@ Requires: tomcat-servlet-3.0-api
Summary: server module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-continuation = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-jmx = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-continuation = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-jmx = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description server
@@ -444,14 +444,14 @@ Requires: tomcat-servlet-3.0-api
Summary: servlet module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-continuation = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-jmx = %{epoch}:%{version}-%{release}
-Requires: jetty-security = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-continuation = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-jmx = %{version}-%{release}
+Requires: jetty-security = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description servlet
@@ -461,14 +461,14 @@ Requires: tomcat-servlet-3.0-api
Summary: servlets module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-client = %{epoch}:%{version}-%{release}
-Requires: jetty-continuation = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-client = %{version}-%{release}
+Requires: jetty-continuation = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description servlets
@@ -478,7 +478,7 @@ Requires: tomcat-servlet-3.0-api
Summary: util module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
Requires: slf4j
@@ -489,14 +489,14 @@ Requires: slf4j
Summary: webapp module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-security = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-servlet = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-security = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-servlet = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
Requires: jakarta-taglibs-standard
Requires: tomcat-servlet-3.0-api
@@ -507,11 +507,11 @@ Requires: tomcat-servlet-3.0-api
Summary: websocket module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-http = %{epoch}:%{version}-%{release}
-Requires: jetty-io = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-http = %{version}-%{release}
+Requires: jetty-io = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
Requires: tomcat-servlet-3.0-api
%description websocket
@@ -521,8 +521,8 @@ Requires: tomcat-servlet-3.0-api
Summary: xml module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
%description xml
%{extdesc} %{summary}.
@@ -532,15 +532,15 @@ Requires: jetty-util = %{epoch}:%{version}-%{release}
Summary: OSGi module for Jetty
Requires: java >= 1:1.7.0
Requires: jpackage-utils
-Requires: jetty-project = %{epoch}:%{version}-%{release}
-Requires: jetty-annotations = %{epoch}:%{version}-%{release}
-Requires: jetty-deploy = %{epoch}:%{version}-%{release}
-Requires: jetty-nested = %{epoch}:%{version}-%{release}
-Requires: jetty-server = %{epoch}:%{version}-%{release}
-Requires: jetty-servlet = %{epoch}:%{version}-%{release}
-Requires: jetty-util = %{epoch}:%{version}-%{release}
-Requires: jetty-webapp = %{epoch}:%{version}-%{release}
-Requires: jetty-xml = %{epoch}:%{version}-%{release}
+Requires: jetty-project = %{version}-%{release}
+Requires: jetty-annotations = %{version}-%{release}
+Requires: jetty-deploy = %{version}-%{release}
+Requires: jetty-nested = %{version}-%{release}
+Requires: jetty-server = %{version}-%{release}
+Requires: jetty-servlet = %{version}-%{release}
+Requires: jetty-util = %{version}-%{release}
+Requires: jetty-webapp = %{version}-%{release}
+Requires: jetty-xml = %{version}-%{release}
Requires: eclipse-platform
Requires: eclipse-rcp
Requires: glassfish-jsp
@@ -1018,6 +1018,9 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Apr 27 2012 Alexander Kurtakov <akurtako(a)redhat.com> 8.1.2-3
+- There is no epoch define in jetty.
+
* Thu Apr 26 2012 Alexander Kurtakov <akurtako(a)redhat.com> 8.1.2-2
- Drop envr from jpackage-utils as it was wrong.
12 years, 1 month
[jetty] Drop envr from jpackage-utils as it was wrong.
by Alexander Kurtakov
commit 9d366e2562a5be35be53c95990af2047a7badfb1
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Apr 26 23:05:16 2012 +0300
Drop envr from jpackage-utils as it was wrong.
jetty.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index f0a9601..f8ba5f7 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -428,7 +428,7 @@ Requires: tomcat-servlet-3.0-api
%package server
Summary: server module for Jetty
Requires: java >= 1:1.7.0
-Requires: jpackage-utils = %{epoch}:%{version}-%{release}
+Requires: jpackage-utils
Requires: jetty-project = %{epoch}:%{version}-%{release}
Requires: jetty-continuation = %{epoch}:%{version}-%{release}
Requires: jetty-http = %{epoch}:%{version}-%{release}
@@ -1018,6 +1018,9 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Apr 26 2012 Alexander Kurtakov <akurtako(a)redhat.com> 8.1.2-2
+- Drop envr from jpackage-utils as it was wrong.
+
* Thu Apr 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-1
- Update to 8.1.2 upstream release
12 years, 1 month
[jetty] Update to 8.1.2 upstream release
by Stanislav Ochotnicky
commit ca4ad73fb14ec2ac98a63bd7f511a22189203be4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Apr 26 14:17:02 2012 +0200
Update to 8.1.2 upstream release
.gitignore | 1 +
0001-Remove-javadoc-execution.patch | 12 ++--
0002-Cleaup-distribution-generation.patch | 89 --------------------
...acts.patch => 0002-Disable-test-artifacts.patch | 27 +++----
0003-Change-servelt-groupId-to-javax.servlet.patch | 26 ++++++
0004-Change-servelt-groupId-to-javax.servlet.patch | 25 ------
...dencies.patch => 0004-Modify-dependencies.patch | 30 ++++---
...md-plugin.patch => 0005-Remove-pmd-plugin.patch | 10 +-
...move-unpack-config-deps-from-distribution.patch | 44 ++++++++++
jetty-depmap.xml | 1 +
jetty.spec | 85 ++++++++++++-------
sources | 2 +-
12 files changed, 167 insertions(+), 185 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dbc2473..9993328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ jetty-6.1.26-src.zip
/jetty-8.1.0.RC4.tar.bz2
/jetty-8.1.0.RC5.tar.bz2
/jetty-8.1.0.v20120127.tar.bz2
+/jetty-8.1.2.v20120308.tar.bz2
diff --git a/0001-Remove-javadoc-execution.patch b/0001-Remove-javadoc-execution.patch
index 78051b6..12363e1 100644
--- a/0001-Remove-javadoc-execution.patch
+++ b/0001-Remove-javadoc-execution.patch
@@ -1,4 +1,4 @@
-From 8509de87ff274653abd2f89f8a09c2ebf1840b36 Mon Sep 17 00:00:00 2001
+From c0a15ad5846a980a0031638ad56cfce1dcec8673 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 24 Jan 2012 10:33:17 +0100
Subject: [PATCH 1/6] Remove javadoc execution
@@ -10,10 +10,10 @@ We generate javadoc as a separate step
2 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
-index d0675a7..40f2a91 100644
+index d7126f3..86c693b 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
-@@ -73,19 +73,6 @@
+@@ -76,19 +76,6 @@
</execution>
</executions>
</plugin>
@@ -34,10 +34,10 @@ index d0675a7..40f2a91 100644
</build>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index 105e166..13560e3 100644
+index d9a9da3..bb6aff6 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
-@@ -379,12 +379,5 @@
+@@ -398,12 +398,5 @@
<artifactId>jetty-overlay-deployer</artifactId>
<version>${project.version}</version>
</dependency>
@@ -51,5 +51,5 @@ index 105e166..13560e3 100644
</dependencies>
</project>
--
-1.7.6.2
+1.7.9
diff --git a/0003-Disable-test-artifacts.patch b/0002-Disable-test-artifacts.patch
similarity index 64%
rename from 0003-Disable-test-artifacts.patch
rename to 0002-Disable-test-artifacts.patch
index e93ca0c..a739c90 100644
--- a/0003-Disable-test-artifacts.patch
+++ b/0002-Disable-test-artifacts.patch
@@ -1,19 +1,19 @@
-From 6bebe830eada634485c7c872a1038a3a0a5e06f2 Mon Sep 17 00:00:00 2001
+From b6a6651f548b741a2cc6a930c171c3176e431af7 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 24 Jan 2012 11:09:27 +0100
-Subject: [PATCH 3/6] Disable test artifacts
+Subject: [PATCH 2/6] Disable test artifacts
- they need more dependencies then we have time for right now :-)
---
jetty-osgi/pom.xml | 1 -
- pom.xml | 9 ++-------
- 2 files changed, 2 insertions(+), 8 deletions(-)
+ pom.xml | 5 -----
+ 2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
-index 91bcb2e..2529824 100644
+index e0117fb..3e8c563 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
-@@ -25,7 +25,6 @@
+@@ -23,7 +23,6 @@
<module>jetty-osgi-boot-jsp</module>
<module>jetty-osgi-boot-warurl</module>
<module>jetty-osgi-httpservice</module>
@@ -22,23 +22,18 @@ index 91bcb2e..2529824 100644
<build>
<resources>
diff --git a/pom.xml b/pom.xml
-index 6bcfc31..7be01ea 100644
+index bc5db52..87b391b 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -352,17 +352,12 @@
- <module>jetty-nested</module>
- <module>jetty-overlay-deployer</module>
- <module>jetty-osgi</module>
-- <module>jetty-nosql</module>
-- <module>jetty-http-spi</module>
+@@ -383,14 +383,9 @@
+ <module>jetty-http-spi</module>
+ <module>jetty-jsp</module>
<module>jetty-distribution</module>
- <module>test-continuation</module>
- <!--module>test-continuation-jetty6</module-->
- <module>test-jetty-servlet</module>
<module>test-jetty-webapp</module>
- <module>test-jetty-nested</module>
-+ <module>jetty-nosql</module>
-+ <module>jetty-http-spi</module>
<module>example-jetty-embedded</module>
<module>example-async-rest</module>
- <module>tests</module>
@@ -46,5 +41,5 @@ index 6bcfc31..7be01ea 100644
<dependencyManagement>
<dependencies>
--
-1.7.6.2
+1.7.9
diff --git a/0003-Change-servelt-groupId-to-javax.servlet.patch b/0003-Change-servelt-groupId-to-javax.servlet.patch
new file mode 100644
index 0000000..0159dad
--- /dev/null
+++ b/0003-Change-servelt-groupId-to-javax.servlet.patch
@@ -0,0 +1,26 @@
+From a74ec5b7cd509887b1169aec62c21858bbd6e1e4 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 24 Jan 2012 11:10:12 +0100
+Subject: [PATCH 3/6] Change servelt groupId to javax.servlet
+
+---
+ pom.xml | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 87b391b..564de42 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -14,6 +14,9 @@
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jetty.url>http://www.eclipse.org/jetty</jetty.url>
+ <orbit-servlet-api-version>3.0.0.v201112011016</orbit-servlet-api-version>
++ <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
++ <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
++ <servlet.spec.version>3.0.20100224</servlet.spec.version>
+ <build-support-version>1.1</build-support-version>
+ <slf4j-version>1.6.1</slf4j-version>
+ <jetty-test-policy-version>1.2</jetty-test-policy-version>
+--
+1.7.9
+
diff --git a/0005-Modify-dependencies.patch b/0004-Modify-dependencies.patch
similarity index 64%
rename from 0005-Modify-dependencies.patch
rename to 0004-Modify-dependencies.patch
index ab9741d..783ef3a 100644
--- a/0005-Modify-dependencies.patch
+++ b/0004-Modify-dependencies.patch
@@ -1,17 +1,17 @@
-From 968ec2b8f92311ef6c5e3d17dba2f9bd3bd4df68 Mon Sep 17 00:00:00 2001
+From efe1875615248d81e08142e9fef92ba0a5fab7f6 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 24 Jan 2012 11:13:25 +0100
-Subject: [PATCH 5/6] Modify dependencies
+Subject: [PATCH 4/6] Modify dependencies
- remove sun httpserver
- add tomcat-jasper
---
jetty-http-spi/pom.xml | 6 ------
- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 5 +++++
- 2 files changed, 5 insertions(+), 6 deletions(-)
+ jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 9 +++++++++
+ 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
-index dd64b1f..3df3312 100644
+index 7d97c01..29b19e9 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -17,12 +17,6 @@
@@ -28,21 +28,25 @@ index dd64b1f..3df3312 100644
<artifactId>jetty-server</artifactId>
<version>${project.version}</version>
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
-index 9bc544b..2417dd5 100644
+index 8f56510..3a35489 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
-@@ -53,6 +53,11 @@
- <version>2.2</version>
- </dependency>
- <dependency>
+@@ -41,6 +41,15 @@
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jsp</artifactId>
+ <version>${project.version}</version>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>7.0.23</version>
+ </dependency>
+ <dependency>
- <groupId>${servlet.spec.groupId}</groupId>
- <artifactId>${servlet.spec.artifactId}</artifactId>
++ <groupId>${servlet.spec.groupId}</groupId>
++ <artifactId>${servlet.spec.artifactId}</artifactId>
</dependency>
+ </dependencies>
+
--
-1.7.6.2
+1.7.9
diff --git a/0006-Remove-pmd-plugin.patch b/0005-Remove-pmd-plugin.patch
similarity index 90%
rename from 0006-Remove-pmd-plugin.patch
rename to 0005-Remove-pmd-plugin.patch
index 8427468..b134d8c 100644
--- a/0006-Remove-pmd-plugin.patch
+++ b/0005-Remove-pmd-plugin.patch
@@ -1,7 +1,7 @@
-From d390cf8cbd2ef711a59196534134a12c31057a2d Mon Sep 17 00:00:00 2001
+From 77de1649a07e5c7c117039586b53da748907fac6 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 24 Jan 2012 11:15:56 +0100
-Subject: [PATCH 6/6] Remove pmd plugin
+Subject: [PATCH 5/6] Remove pmd plugin
- prevents problem with "Reporting mojo's can only be called from
ReportDocumentRender". Investigate proper fix some other time?
@@ -10,10 +10,10 @@ Subject: [PATCH 6/6] Remove pmd plugin
1 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
-index e556e89..6e5a47e 100644
+index 564de42..65cf13a 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -152,35 +152,6 @@
+@@ -170,35 +170,6 @@
</dependency>
</dependencies>
</plugin>
@@ -50,5 +50,5 @@ index e556e89..6e5a47e 100644
<pluginManagement>
<plugins>
--
-1.7.6.2
+1.7.9
diff --git a/0006-Remove-unpack-config-deps-from-distribution.patch b/0006-Remove-unpack-config-deps-from-distribution.patch
new file mode 100644
index 0000000..8c45814
--- /dev/null
+++ b/0006-Remove-unpack-config-deps-from-distribution.patch
@@ -0,0 +1,44 @@
+From c20556699d33e3a85329650d9ef21f17190ecf0f Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 27 Mar 2012 10:11:41 +0200
+Subject: [PATCH 6/6] Remove unpack-config-deps from distribution
+
+This is needed because original code used classifiers to select subset
+of artifacts. Unfortunately there seems to be a weird bug affecting even
+upstream maven when this goes outside of reactor resolver. Or perhaps
+this is a weird feature.
+
+Our resolver obviously can't handle this so we have to unpack these
+manually before building distribution
+---
+ jetty-distribution/pom.xml | 14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
+index bb6aff6..00101d0 100644
+--- a/jetty-distribution/pom.xml
++++ b/jetty-distribution/pom.xml
+@@ -216,20 +216,6 @@
+ </configuration>
+ </execution>
+ <execution>
+- <id>unpack-config-deps</id>
+- <phase>generate-resources</phase>
+- <goals>
+- <goal>unpack-dependencies</goal>
+- </goals>
+- <configuration>
+- <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+- <classifier>config</classifier>
+- <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+- <excludes>META-INF/**</excludes>
+- <outputDirectory>${assembly-directory}</outputDirectory>
+- </configuration>
+- </execution>
+- <execution>
+ <id>unpack-javadoc</id>
+ <phase>generate-resources</phase>
+ <goals>
+--
+1.7.9
+
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index b2c4219..f47991a 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -163,4 +163,5 @@
<version>3.0</version>
</maven>
</dependency>
+
</dependencies>
diff --git a/jetty.spec b/jetty.spec
index e27f8f9..f0a9601 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,11 +40,11 @@
%global jettylibdir %{_localstatedir}/lib/%{name}
%global appdir %{jettylibdir}/webapps
-%global addver v20120127
+%global addver v20120308
Name: jetty
-Version: 8.1.0
-Release: 7%{?dist}
+Version: 8.1.2
+Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -57,20 +57,26 @@ Source3: jetty.logrotate
Source4: %{name}-depmap.xml
Source5: %{name}.service
Patch1: 0001-Remove-javadoc-execution.patch
-Patch2: 0002-Cleaup-distribution-generation.patch
-Patch3: 0003-Disable-test-artifacts.patch
-Patch4: 0004-Change-servelt-groupId-to-javax.servlet.patch
-Patch5: 0005-Modify-dependencies.patch
-Patch6: 0006-Remove-pmd-plugin.patch
-Patch8: 0007-disable-jetty-osgi.patch
+Patch2: 0002-Disable-test-artifacts.patch
+Patch3: 0003-Change-servelt-groupId-to-javax.servlet.patch
+Patch4: 0004-Modify-dependencies.patch
+Patch5: 0005-Remove-pmd-plugin.patch
+Patch6: 0006-Remove-unpack-config-deps-from-distribution.patch
+Patch7: 0007-disable-jetty-osgi.patch
%if 0%{?rhel} <= 0
BuildRequires: fedora-usermgmt-devel
%{?FE_USERADD_REQ}
%endif
+BuildRequires: geronimo-annotation
BuildRequires: geronimo-jaspic-spec
+BuildRequires: geronimo-jta
+BuildRequires: glassfish-jsp
+BuildRequires: glassfish-jsp-api
+BuildRequires: jakarta-taglibs-standard
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
+BuildRequires: jvnet-parent
BuildRequires: maven
BuildRequires: maven-dependency-plugin
BuildRequires: maven-enforcer-plugin
@@ -79,17 +85,15 @@ BuildRequires: mongo-java-driver >= 2.6.5-4
BuildRequires: objectweb-asm
BuildRequires: slf4j
BuildRequires: systemd-units
+BuildRequires: tomcat-el-2.2-api
+BuildRequires: tomcat-jsp-2.2-api
BuildRequires: tomcat-lib
BuildRequires: tomcat-servlet-3.0-api
+
%if 0%{?rhel} <= 0
BuildRequires: eclipse-platform
BuildRequires: eclipse-rcp
%endif
-BuildRequires: geronimo-annotation
-BuildRequires: geronimo-jta
-BuildRequires: jakarta-taglibs-standard
-BuildRequires: tomcat-el-2.2-api
-BuildRequires: tomcat-jsp-2.2-api
# we want javamail not classpathx-javamail
BuildRequires: %{_javadir}/javamail/mail.jar
@@ -101,7 +105,7 @@ BuildRequires: jetty-toolchain
BuildRequires: jetty-assembly-descriptors
BuildRequires: jetty-test-policy
BuildRequires: jetty-artifact-remote-resources
-#FIXME: the JSP is probably broken, eclipse-ecj et al. need to be R and BR
+
BuildArch: noarch
@@ -181,7 +185,6 @@ Requires: jetty-io = %{epoch}:%{version}-%{release}
Requires: jetty-server = %{epoch}:%{version}-%{release}
Requires: jetty-util = %{epoch}:%{version}-%{release}
Requires: tomcat-servlet-3.0-api
-
%description ajp
%{extdesc} %{summary}.
@@ -199,7 +202,6 @@ Requires: jetty-webapp = %{epoch}:%{version}-%{release}
Requires: objectweb-asm
Requires: geronimo-annotation
Requires: tomcat-lib
-
%description annotations
%{extdesc} %{summary}.
@@ -222,7 +224,6 @@ Requires: jpackage-utils
Requires: jetty-project = %{epoch}:%{version}-%{release}
Requires: jetty-util = %{epoch}:%{version}-%{release}
Requires: tomcat-servlet-3.0-api
-
%description continuation
%{extdesc} %{summary}.
@@ -248,7 +249,6 @@ Requires: jetty-project = %{epoch}:%{version}-%{release}
Requires: jetty-io = %{epoch}:%{version}-%{release}
Requires: jetty-util = %{epoch}:%{version}-%{release}
Requires: tomcat-servlet-3.0-api
-
%description http
%{extdesc} %{summary}.
@@ -543,6 +543,8 @@ Requires: jetty-webapp = %{epoch}:%{version}-%{release}
Requires: jetty-xml = %{epoch}:%{version}-%{release}
Requires: eclipse-platform
Requires: eclipse-rcp
+Requires: glassfish-jsp
+Requires: glassfish-jsp-api
Requires: tomcat-servlet-3.0-api
Requires: tomcat-el-2.2-api
Requires: tomcat-jsp-2.2-api
@@ -558,13 +560,14 @@ Group: Documentation
Requires: jpackage-utils
%description javadoc
-%{extdesc} %{summary}.
+%{summary}.
%prep
%setup -q -n %{jettyname}-%{version}.%{addver}
for f in $(find . -name "*.?ar"); do rm $f; done
find . -name "*.class" -exec rm {} \;
+
%patch1 -p1 -b .sav
%patch2 -p1 -b .sav
%patch3 -p1 -b .sav
@@ -572,7 +575,7 @@ find . -name "*.class" -exec rm {} \;
%patch5 -p1 -b .sav
%patch6 -p1 -b .sav
%if 0%{?rhel} > 0
-%patch8 -p1 -b .sav
+%patch7 -p1 -b .sav
%endif
cp %{SOURCE1} djetty
@@ -586,9 +589,25 @@ iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \
mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
%build
+#rm -rf ./*
+#ln -sf ~/temp/jetty/jetty-8.1.0.%{addver}.copy/* .
+#exit 0
+# remove previous lines!
sed -i -e "s|/usr/share|%{_datadir}|g" djetty
-mvn-rpmbuild -X \
+mvn-rpmbuild -e \
+ -Dmaven.local.depmap.file=%{SOURCE4} \
+ -Dmaven.test.skip=true \
+ install javadoc:aggregate
+cd jetty-distribution
+rm -rf target/distribution
+mkdir -p target/distribution
+find .. -ipath '*target/*config.jar' | ( while read; do
+ unzip $REPLY -x 'META-INF/*' -d target/distribution
+done)
+
+mvn-rpmbuild \
+ -Dmaven.repo.local=$(pwd)/../.m2 \
-Dmaven.local.depmap.file=%{SOURCE4} \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -615,7 +634,7 @@ cp %{SOURCE5} %{buildroot}%{_unitdir}/
# main pkg
tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir}
mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/
-rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}
+rm -rf %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}
chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
chmod +x djetty
@@ -633,7 +652,7 @@ for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \
jetty-rewrite jetty-security jetty-server jetty-servlet \
jetty-servlets jetty-util jetty-webapp jetty-websocket \
jetty-xml; do
- mv %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar \
+ mv %{buildroot}%{homedir}/lib/$module-*.jar \
%{buildroot}%{_javadir}/%{name}/$module.jar
ln -s %{_javadir}/%{name}/$module.jar \
%{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar
@@ -675,6 +694,9 @@ popd
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom
%add_maven_depmap JPP.%{name}-project.pom -f project
+# purge bundled jars
+rm %{buildroot}%{homedir}/lib/{annotations,jndi,jsp,jta}/*
+
# recreat tarball structure in lib
ln -sf $(build-classpath tomcat-servlet-3.0-api) \
%{buildroot}%{homedir}/lib/servlet-api-3.0.jar
@@ -684,10 +706,10 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
-build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \
- taglibs-core taglibs-standard tomcat/jasper-el eclipse-ecj \
- tomcat/jasper tomcat/tomcat-api tomcat/tomcat-jsp-2.2-api \
- tomcat/tomcat-juli
+build-jar-repository %{buildroot}%{homedir}/lib/jsp \
+ taglibs-core taglibs-standard glassfish-jsp \
+ tomcat/jasper tomcat/tomcat-api \
+ tomcat/tomcat-juli glassfish-jsp
ln -sf $(build-classpath geronimo-jta) \
@@ -763,8 +785,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-g %username %username &>/dev/null || :
%post
-if [ $1 -eq 1 ] ; then
- # Initial installation
+if [ $1 -eq 1 ] ; then
+ # Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
@@ -996,6 +1018,9 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Apr 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-1
+- Update to 8.1.2 upstream release
+
* Wed Apr 25 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.0-7
- Split into number of subpackages
diff --git a/sources b/sources
index adb0fc7..6c400aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-662e42ac878578c69c79140e2733498a jetty-8.1.0.v20120127.tar.bz2
+faf96761ba634974e6545793cadea498 jetty-8.1.2.v20120308.tar.bz2
12 years, 1 month
[jvnet-parent] Remove maven from requires to simplify other deps
by Stanislav Ochotnicky
commit 2519daae123c235b4e7c1222183e30095ce6d40b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Apr 26 16:13:28 2012 +0200
Remove maven from requires to simplify other deps
jvnet-parent.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/jvnet-parent.spec b/jvnet-parent.spec
index c7c957a..a5c9b6b 100644
--- a/jvnet-parent.spec
+++ b/jvnet-parent.spec
@@ -1,6 +1,6 @@
Name: jvnet-parent
Version: 3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java.net parent POM file
Group: Development/Libraries
@@ -15,7 +15,6 @@ BuildRequires: maven
BuildRequires: maven-enforcer-plugin
Requires: jpackage-utils
-Requires: maven
%description
Java.net parent POM file used by most Java.net subprojects such as
@@ -41,6 +40,9 @@ install -pm 644 pom.xml \
%{_mavendepmapfragdir}/%{name}
%changelog
+* Thu Apr 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3-2
+- Remove maven from requires to simplify other deps
+
* Wed Mar 21 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3-1
- Update to version 3
12 years, 1 month
