From 47b8c903c37e4617a1e057125d56fd5f1c29369f Mon Sep 17 00:00:00 2001 From: yaacov Date: Tue, 3 Apr 2018 15:15:15 +0300 Subject: [PATCH 01/16] add spec file --- client_java.spec | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 client_java.spec diff --git a/client_java.spec b/client_java.spec new file mode 100644 index 000000000..2c2b807f1 --- /dev/null +++ b/client_java.spec @@ -0,0 +1,97 @@ +Name: prometheus-java-simpleclient +Version: 0.3.0 +Release: 1%{?dist} +Summary: Prometheus instrumentation library for JVM applications +License: ASL 2.0 and CC0 +URL: https://github.com/yaacov/client_java/ +Source0: https://github.com/yaacov/client_java/archive/parent-%{version}.tar.gz +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: maven-plugin-bundle +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: jetty8-servlet +BuildRequires: jetty8-http +BuildRequires: glassfish-servlet-api +BuildRequires: sonatype-oss-parent + +%description +Prometheus JVM Client supports Java, Clojure, Scala, +JRuby, and anything else that runs on the JVM. + +%package common +Summary: Prometheus Java Simpleclient Common + +%description common +Common code used by various modules of the Simpleclient. + +%package parent +Summary: Prometheus Java Suite Parent POM + +%description parent +Prometheus Java Suite Parent POM. + +%package servlet +Summary: Prometheus Java Simpleclient Servlet + +%description servlet +HTTP servlet exporter for the simpleclient. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -n client_java-parent-%{version} + +%pom_disable_module simpleclient_caffeine +%pom_disable_module simpleclient_dropwizard +%pom_disable_module simpleclient_graphite_bridge +%pom_disable_module simpleclient_hibernate +%pom_disable_module simpleclient_guava +%pom_disable_module simpleclient_hotspot +%pom_disable_module simpleclient_httpserver +%pom_disable_module simpleclient_log4j +%pom_disable_module simpleclient_log4j2 +%pom_disable_module simpleclient_logback +%pom_disable_module simpleclient_pushgateway +#%pom_disable_module simpleclient_servlet +%pom_disable_module simpleclient_spring_web +%pom_disable_module simpleclient_spring_boot +%pom_disable_module simpleclient_jetty +%pom_disable_module simpleclient_jetty_jdk8 +%pom_disable_module simpleclient_vertx +%pom_disable_module benchmark + +%pom_remove_plugin :maven-deploy-plugin +%pom_remove_plugin :maven-release-plugin + +%build +%mvn_build -s + +%install +%mvn_install + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%files parent -f .mfiles-parent +%license LICENSE NOTICE + +%files -f .mfiles-simpleclient +%doc README.md +%doc LICENSE NOTICE +%dir %{_javadir}/%{name} + +%files common -f .mfiles-simpleclient_common + +%files servlet -f .mfiles-simpleclient_servlet + +%changelog +* Mon Apr 2 2018 Yaacov Zamir - 0.3.0-1 +- Initial packaging From 424357f292133cf93ede86d5ac0e751f286c1dd6 Mon Sep 17 00:00:00 2001 From: yaacov Date: Tue, 3 Apr 2018 15:39:10 +0300 Subject: [PATCH 02/16] fix gz path --- client_java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_java.spec b/client_java.spec index 2c2b807f1..95507cf98 100644 --- a/client_java.spec +++ b/client_java.spec @@ -47,7 +47,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n client_java-parent-%{version} +%setup -q -n parent-%{version} %pom_disable_module simpleclient_caffeine %pom_disable_module simpleclient_dropwizard From c996e3406b342f6ca29d14d4d8d3edd97366971c Mon Sep 17 00:00:00 2001 From: yaacov Date: Tue, 3 Apr 2018 15:55:46 +0300 Subject: [PATCH 03/16] fix spec ii --- client_java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_java.spec b/client_java.spec index 95507cf98..2c2b807f1 100644 --- a/client_java.spec +++ b/client_java.spec @@ -47,7 +47,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n parent-%{version} +%setup -q -n client_java-parent-%{version} %pom_disable_module simpleclient_caffeine %pom_disable_module simpleclient_dropwizard From a807d3c8d110840fc569cac5818804e56639e47a Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 12:34:17 +0300 Subject: [PATCH 04/16] add patch --- base-0.3.0.patch | 11 +++++++++++ client_java.spec | 26 +++++++++++++------------- simpleclient_servlet/pom.xml | 2 +- 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 base-0.3.0.patch diff --git a/base-0.3.0.patch b/base-0.3.0.patch new file mode 100644 index 000000000..c7d0b0885 --- /dev/null +++ b/base-0.3.0.patch @@ -0,0 +1,11 @@ +--- simpleclient_servlet/pom.xml.old 2018-04-09 12:10:59.146679962 +0300 ++++ simpleclient_servlet/pom.xml 2018-04-09 12:05:56.880608875 +0300 +@@ -70,7 +70,7 @@ + + org.eclipse.jetty + jetty-servlet +- 8.1.7.v20120910 ++ 8.1.17.v20150415 + test + + diff --git a/client_java.spec b/client_java.spec index 2c2b807f1..0797a5c2d 100644 --- a/client_java.spec +++ b/client_java.spec @@ -7,33 +7,32 @@ URL: https://github.com/yaacov/client_java/ Source0: https://github.com/yaacov/client_java/archive/parent-%{version}.tar.gz BuildArch: noarch +Patch1: base-0.3.0.patch + BuildRequires: maven-local BuildRequires: maven-plugin-bundle -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-surefire-plugin +BuildRequires: mockito +BuildRequires: assertj-core BuildRequires: jetty8-servlet -BuildRequires: jetty8-http -BuildRequires: glassfish-servlet-api +BuildRequires: jboss-servlet-3.0-api BuildRequires: sonatype-oss-parent %description Prometheus JVM Client supports Java, Clojure, Scala, JRuby, and anything else that runs on the JVM. -%package common -Summary: Prometheus Java Simpleclient Common - -%description common -Common code used by various modules of the Simpleclient. - %package parent Summary: Prometheus Java Suite Parent POM %description parent Prometheus Java Suite Parent POM. +%package common +Summary: Prometheus Java Simpleclient Common + +%description common +Common code used by various modules of the Simpleclient. + %package servlet Summary: Prometheus Java Simpleclient Servlet @@ -60,7 +59,6 @@ This package provides %{summary}. %pom_disable_module simpleclient_log4j2 %pom_disable_module simpleclient_logback %pom_disable_module simpleclient_pushgateway -#%pom_disable_module simpleclient_servlet %pom_disable_module simpleclient_spring_web %pom_disable_module simpleclient_spring_boot %pom_disable_module simpleclient_jetty @@ -71,6 +69,8 @@ This package provides %{summary}. %pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :maven-release-plugin +%patch1 -p0 + %build %mvn_build -s diff --git a/simpleclient_servlet/pom.xml b/simpleclient_servlet/pom.xml index d5170e3c7..cb6cfe36b 100644 --- a/simpleclient_servlet/pom.xml +++ b/simpleclient_servlet/pom.xml @@ -70,7 +70,7 @@ org.eclipse.jetty jetty-servlet - 8.1.7.v20120910 + 8.1.17.v20150415 test From b925dae9bf54db8fc1dd10e0a07c3f439434c0ec Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 12:36:14 +0300 Subject: [PATCH 05/16] revert pom jetty version --- simpleclient_servlet/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpleclient_servlet/pom.xml b/simpleclient_servlet/pom.xml index cb6cfe36b..d5170e3c7 100644 --- a/simpleclient_servlet/pom.xml +++ b/simpleclient_servlet/pom.xml @@ -70,7 +70,7 @@ org.eclipse.jetty jetty-servlet - 8.1.17.v20150415 + 8.1.7.v20120910 test From ad1c16731c4f8adda90f2ef5ff021d98f883f45b Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 12:42:05 +0300 Subject: [PATCH 06/16] use patch from git --- client_java.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client_java.spec b/client_java.spec index 0797a5c2d..d17a63830 100644 --- a/client_java.spec +++ b/client_java.spec @@ -7,7 +7,7 @@ URL: https://github.com/yaacov/client_java/ Source0: https://github.com/yaacov/client_java/archive/parent-%{version}.tar.gz BuildArch: noarch -Patch1: base-0.3.0.patch +Patch0: https://raw.githubusercontent.com/yaacov/client_java/master/base-0.3.0.patch BuildRequires: maven-local BuildRequires: maven-plugin-bundle @@ -69,7 +69,7 @@ This package provides %{summary}. %pom_remove_plugin :maven-deploy-plugin %pom_remove_plugin :maven-release-plugin -%patch1 -p0 +%patch0 -p0 %build %mvn_build -s From 431eee9ab89767f9041b0ad4d7e2064305375fcd Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 12:59:12 +0300 Subject: [PATCH 07/16] add license to pkg --- client_java.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/client_java.spec b/client_java.spec index d17a63830..2c9f48d8d 100644 --- a/client_java.spec +++ b/client_java.spec @@ -77,20 +77,21 @@ This package provides %{summary}. %install %mvn_install -%files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%files -f .mfiles-simpleclient +%doc README.md +%license LICENSE NOTICE %files parent -f .mfiles-parent %license LICENSE NOTICE -%files -f .mfiles-simpleclient -%doc README.md -%doc LICENSE NOTICE -%dir %{_javadir}/%{name} - %files common -f .mfiles-simpleclient_common +%license LICENSE NOTICE %files servlet -f .mfiles-simpleclient_servlet +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE %changelog * Mon Apr 2 2018 Yaacov Zamir - 0.3.0-1 From 1da1cd51fcfdcb6a965709122c908b9069c05849 Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 14:16:18 +0300 Subject: [PATCH 08/16] add servlet requirment --- base-0.3.0.patch | 49 +++++++++++++++++++++++++++++------- client_java.spec | 2 +- simpleclient_servlet/pom.xml | 2 +- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/base-0.3.0.patch b/base-0.3.0.patch index c7d0b0885..13cd9e345 100644 --- a/base-0.3.0.patch +++ b/base-0.3.0.patch @@ -1,11 +1,42 @@ ---- simpleclient_servlet/pom.xml.old 2018-04-09 12:10:59.146679962 +0300 -+++ simpleclient_servlet/pom.xml 2018-04-09 12:05:56.880608875 +0300 -@@ -70,7 +70,7 @@ +diff --git a/base-0.3.0.patch b/base-0.3.0.patch +index c7d0b08..e69de29 100644 +--- a/base-0.3.0.patch ++++ b/base-0.3.0.patch +@@ -1,11 +0,0 @@ +---- simpleclient_servlet/pom.xml.old 2018-04-09 12:10:59.146679962 +0300 +-+++ simpleclient_servlet/pom.xml 2018-04-09 12:05:56.880608875 +0300 +-@@ -70,7 +70,7 @@ +- +- org.eclipse.jetty +- jetty-servlet +-- 8.1.7.v20120910 +-+ 8.1.17.v20150415 +- test +- +- +diff --git a/client_java.spec b/client_java.spec +index 2c9f48d..5acffa0 100644 +--- a/client_java.spec ++++ b/client_java.spec +@@ -14,7 +14,7 @@ BuildRequires: maven-plugin-bundle + BuildRequires: mockito + BuildRequires: assertj-core + BuildRequires: jetty8-servlet +-BuildRequires: jboss-servlet-3.0-api ++BuildRequires: glassfish-servlet-api + BuildRequires: sonatype-oss-parent + + %description +diff --git a/simpleclient_servlet/pom.xml b/simpleclient_servlet/pom.xml +index d5170e3..54b0bf6 100644 +--- a/simpleclient_servlet/pom.xml ++++ b/simpleclient_servlet/pom.xml +@@ -51,7 +51,7 @@ - org.eclipse.jetty - jetty-servlet -- 8.1.7.v20120910 -+ 8.1.17.v20150415 - test + javax.servlet + javax.servlet-api +- 3.0.1 ++ 3.1.0 + provided - + diff --git a/client_java.spec b/client_java.spec index 2c9f48d8d..5acffa034 100644 --- a/client_java.spec +++ b/client_java.spec @@ -14,7 +14,7 @@ BuildRequires: maven-plugin-bundle BuildRequires: mockito BuildRequires: assertj-core BuildRequires: jetty8-servlet -BuildRequires: jboss-servlet-3.0-api +BuildRequires: glassfish-servlet-api BuildRequires: sonatype-oss-parent %description diff --git a/simpleclient_servlet/pom.xml b/simpleclient_servlet/pom.xml index d5170e3c7..54b0bf628 100644 --- a/simpleclient_servlet/pom.xml +++ b/simpleclient_servlet/pom.xml @@ -51,7 +51,7 @@ javax.servlet javax.servlet-api - 3.0.1 + 3.1.0 provided From a11608a2b80466f3a02067637ed4ec98eef342a6 Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 14:56:18 +0300 Subject: [PATCH 09/16] fix patch --- base-0.3.0.patch | 44 +++++++++--------------------------- simpleclient_servlet/pom.xml | 2 +- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/base-0.3.0.patch b/base-0.3.0.patch index 13cd9e345..67ff4fa98 100644 --- a/base-0.3.0.patch +++ b/base-0.3.0.patch @@ -1,36 +1,5 @@ -diff --git a/base-0.3.0.patch b/base-0.3.0.patch -index c7d0b08..e69de29 100644 ---- a/base-0.3.0.patch -+++ b/base-0.3.0.patch -@@ -1,11 +0,0 @@ ----- simpleclient_servlet/pom.xml.old 2018-04-09 12:10:59.146679962 +0300 --+++ simpleclient_servlet/pom.xml 2018-04-09 12:05:56.880608875 +0300 --@@ -70,7 +70,7 @@ -- -- org.eclipse.jetty -- jetty-servlet --- 8.1.7.v20120910 --+ 8.1.17.v20150415 -- test -- -- -diff --git a/client_java.spec b/client_java.spec -index 2c9f48d..5acffa0 100644 ---- a/client_java.spec -+++ b/client_java.spec -@@ -14,7 +14,7 @@ BuildRequires: maven-plugin-bundle - BuildRequires: mockito - BuildRequires: assertj-core - BuildRequires: jetty8-servlet --BuildRequires: jboss-servlet-3.0-api -+BuildRequires: glassfish-servlet-api - BuildRequires: sonatype-oss-parent - - %description -diff --git a/simpleclient_servlet/pom.xml b/simpleclient_servlet/pom.xml -index d5170e3..54b0bf6 100644 ---- a/simpleclient_servlet/pom.xml -+++ b/simpleclient_servlet/pom.xml +--- simpleclient_servlet/pom.xml.old 2018-04-09 14:54:52.334492919 +0300 ++++ simpleclient_servlet/pom.xml 2018-04-09 14:54:40.914566196 +0300 @@ -51,7 +51,7 @@ javax.servlet @@ -40,3 +9,12 @@ index d5170e3..54b0bf6 100644 provided +@@ -70,7 +70,7 @@ + + org.eclipse.jetty + jetty-servlet +- 8.1.7.v20120910 ++ 8.1.17.v20150415 + test + + diff --git a/simpleclient_servlet/pom.xml b/simpleclient_servlet/pom.xml index 54b0bf628..d5170e3c7 100644 --- a/simpleclient_servlet/pom.xml +++ b/simpleclient_servlet/pom.xml @@ -51,7 +51,7 @@ javax.servlet javax.servlet-api - 3.1.0 + 3.0.1 provided From 741000ad4a32a0a0dfe91e1551b49a02ef79c205 Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 15:23:09 +0300 Subject: [PATCH 10/16] add el7 test to spec file --- base-0.3.0.patch | 9 --------- client_java.spec | 7 ++++++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/base-0.3.0.patch b/base-0.3.0.patch index 67ff4fa98..91e174594 100644 --- a/base-0.3.0.patch +++ b/base-0.3.0.patch @@ -9,12 +9,3 @@ provided -@@ -70,7 +70,7 @@ - - org.eclipse.jetty - jetty-servlet -- 8.1.7.v20120910 -+ 8.1.17.v20150415 - test - - diff --git a/client_java.spec b/client_java.spec index 5acffa034..1c092c054 100644 --- a/client_java.spec +++ b/client_java.spec @@ -13,8 +13,13 @@ BuildRequires: maven-local BuildRequires: maven-plugin-bundle BuildRequires: mockito BuildRequires: assertj-core -BuildRequires: jetty8-servlet +%if 0%{?el7} +BuildRequires: devtoolset-3-glassfish-servlet-api +%else BuildRequires: glassfish-servlet-api +%endif + + BuildRequires: sonatype-oss-parent %description From 1ff4608ae01637f3b4def967ab5da7724d4045af Mon Sep 17 00:00:00 2001 From: yaacov Date: Mon, 9 Apr 2018 15:38:51 +0300 Subject: [PATCH 11/16] use new jetty version --- base-0.3.0.patch | 13 +++++++++++-- client_java.spec | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/base-0.3.0.patch b/base-0.3.0.patch index 91e174594..9993f0d55 100644 --- a/base-0.3.0.patch +++ b/base-0.3.0.patch @@ -1,5 +1,5 @@ ---- simpleclient_servlet/pom.xml.old 2018-04-09 14:54:52.334492919 +0300 -+++ simpleclient_servlet/pom.xml 2018-04-09 14:54:40.914566196 +0300 +--- simpleclient_servlet/pom.xml 2018-04-09 15:33:02.856762335 +0300 ++++ simpleclient_servlet/pom.xml.old 2018-04-09 15:35:18.255891022 +0300 @@ -51,7 +51,7 @@ javax.servlet @@ -9,3 +9,12 @@ provided +@@ -70,7 +70,7 @@ + + org.eclipse.jetty + jetty-servlet +- 8.1.7.v20120910 ++ 9.0-1 + test + + diff --git a/client_java.spec b/client_java.spec index 1c092c054..5247c8740 100644 --- a/client_java.spec +++ b/client_java.spec @@ -13,6 +13,7 @@ BuildRequires: maven-local BuildRequires: maven-plugin-bundle BuildRequires: mockito BuildRequires: assertj-core +BuildRequires: jetty-servlet %if 0%{?el7} BuildRequires: devtoolset-3-glassfish-servlet-api %else From d1696bed58d171e5b1700a498669d68239adf826 Mon Sep 17 00:00:00 2001 From: yaacov Date: Tue, 10 Apr 2018 10:28:02 +0300 Subject: [PATCH 12/16] use require mvn macro --- base-0.3.0.patch | 2 +- client_java.spec | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/base-0.3.0.patch b/base-0.3.0.patch index 9993f0d55..c092d3844 100644 --- a/base-0.3.0.patch +++ b/base-0.3.0.patch @@ -14,7 +14,7 @@ org.eclipse.jetty jetty-servlet - 8.1.7.v20120910 -+ 9.0-1 ++ 8.1.17.v20150415 test diff --git a/client_java.spec b/client_java.spec index 5247c8740..a8b04d2db 100644 --- a/client_java.spec +++ b/client_java.spec @@ -11,17 +11,11 @@ Patch0: https://raw.githubusercontent.com/yaacov/client_java/master/base-0.3.0.p BuildRequires: maven-local BuildRequires: maven-plugin-bundle -BuildRequires: mockito -BuildRequires: assertj-core -BuildRequires: jetty-servlet -%if 0%{?el7} -BuildRequires: devtoolset-3-glassfish-servlet-api -%else -BuildRequires: glassfish-servlet-api -%endif - - -BuildRequires: sonatype-oss-parent +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.assertj:assertj-core) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:pom:8.1) %description Prometheus JVM Client supports Java, Clojure, Scala, From b5049f14e31eeb0e5aed738a27fa57e91b1a1e44 Mon Sep 17 00:00:00 2001 From: yaacov Date: Wed, 11 Apr 2018 11:01:33 +0300 Subject: [PATCH 13/16] add jetty8 spec file --- jetty8.spec | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+) create mode 100644 jetty8.spec diff --git a/jetty8.spec b/jetty8.spec new file mode 100644 index 000000000..711dbc27a --- /dev/null +++ b/jetty8.spec @@ -0,0 +1,273 @@ +# jetty8 is a compat package and as such it shouldn't have any OSGi provides +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^osgi\\( + +%global addver v20150415 + +Name: jetty8 +Version: 8.1.17 +Release: 5%{?dist} +Summary: Java Webserver and Servlet Container +# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt +# some MIT-licensed code (from Utf8Appendable) is used too +License: (ASL 2.0 or EPL) and MIT +URL: http://www.eclipse.org/jetty +BuildArch: noarch + +Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/org.eclipse.jetty.project-jetty-%{version}.%{addver}.tar.gz + +BuildRequires: maven-local +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-parent:pom:) +BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) +BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-assembly-descriptors) +BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-build-support) +BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-version-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) +BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-jdk14) + +Requires: %{name}-rewrite = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-xml = %{version}-%{release} +Requires: %{name}-websocket = %{version}-%{release} +Requires: %{name}-webapp = %{version}-%{release} +Requires: %{name}-util = %{version}-%{release} +Requires: %{name}-servlet = %{version}-%{release} +Requires: %{name}-server = %{version}-%{release} +Requires: %{name}-security = %{version}-%{release} +Requires: %{name}-jmx = %{version}-%{release} +Requires: %{name}-io = %{version}-%{release} +Requires: %{name}-http = %{version}-%{release} +Requires: %{name}-continuation = %{version}-%{release} + +%description +Jetty is a 100% Java HTTP Server and Servlet Container. This means that you +do not need to configure and run a separate web server (like Apache) in order +to use Java, servlets and JSPs to generate dynamic content. Jetty is a fully +featured web server for static and dynamic content. Unlike separate +server/container solutions, this means that your web server and web +application run in the same process, without interconnection overheads +and complications. Furthermore, as a pure java component, Jetty can be simply +included in your application for demonstration, distribution or deployment. +Jetty is available on all Java supported platforms. + +%package rewrite +Summary: Jetty rewrite handler +%description rewrite +This package contains %{summary}. + +%package client +Summary: Jetty asynchronous HTTP client +%description client +This package contains %{summary}. + +%package xml +Summary: Jetty XML utilities +%description xml +This package contains %{summary}. + +%package websocket +Summary: Jetty websocket +%description websocket +This package contains %{summary}. + +%package webapp +Summary: Jetty web application support +%description webapp +This package contains %{summary}. + +%package util +Summary: Jetty utility classes +%description util +This package contains %{summary}. + +%package servlet +Summary: Jetty servlet container +%description servlet +This package contains %{summary}. + +%package server +Summary: Jetty server artifact +%description server +This package contains %{summary}. + +%package security +Summary: Jetty security infrastructure +%description security +This package contains %{summary}. + +%package jmx +Summary: Jetty JMX management artifact +%description jmx +This package contains %{summary}. + +%package io +Summary: Jetty IO utility +%description io +This package contains %{summary}. + +%package http +Summary: Jetty HTTP utility +%description http +This package contains %{summary}. + +%package continuation +Summary: Jetty asynchronous API +%description continuation +This package contains %{summary}. + +%package deploy +Summary: Jetty deployers +%description deploy +This package contains %{summary}. + +%package servlets +Summary: Jetty utility servlets and filters +%description servlets +This package contains %{summary}. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -n jetty-%{version}.%{addver} +find -name "*.jar" -delete +find -name "*.war" -delete +find -name "*.class" -delete + +%mvn_compat_version : 8.1 %{version}.%{addver} 8.1.14.v20131031 + +# aggregating POM belongs to main package +%mvn_package :jetty-project::pom + +%pom_change_dep -r org.eclipse.jetty.orbit:javax.servlet org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec + +# Disable unneeded modules. This is a compat package and only a +# minimal set of modules are being built. +%pom_xpath_remove "pom:modules" +%pom_xpath_inject "pom:project" "" +for mod in continuation deploy http io jmx security server servlet servlets util webapp websocket xml client rewrite; do + %pom_xpath_inject pom:modules "jetty-$mod" + %pom_xpath_inject 'pom:plugin[pom:artifactId="maven-bundle-plugin"]/pom:executions/pom:execution' ' + process-classes' jetty-$mod +done + +# PMD plugin is not useful in Fedora. +%pom_remove_plugin -r :maven-pmd-plugin + +%pom_remove_plugin -r :maven-license-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :maven-release-plugin +%pom_remove_plugin -r :maven-source-plugin +%pom_remove_plugin -r :maven-site-plugin + +# this needs jetty6 things, so just remove it +# shouldn't cause any trouble since it handled only in loadClass elsewhere +%pom_remove_dep org.mortbay.jetty:jetty-util jetty-continuation +rm jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Jetty6Continuation.java + +# Disable default-jar executions of maven-jar-plugin in certain Jetty +# modules, which define their own executions of the plugin. This +# avoids problems with version 3.0.0 of the plugin. +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" " + + default-jar + skip + " \ + jetty-continuation \ + jetty-http \ + jetty-io \ + jetty-server \ + jetty-websocket \ + +# CCLAs and CLAs, we don't want to install these +rm -Rf LICENSE-CONTRIBUTOR/ + +%build +# Tests disabled because of missing dependencies +%mvn_build -f -s + +%install +%mvn_install + +%files -f .mfiles-jetty-project +%{!?_licensedir:%global license %%doc} +%license NOTICE.txt README.txt VERSION.txt LICENSE* + +%files rewrite -f .mfiles-jetty-rewrite +%files client -f .mfiles-jetty-client +%files deploy -f .mfiles-jetty-deploy +%files xml -f .mfiles-jetty-xml +%files websocket -f .mfiles-jetty-websocket +%files webapp -f .mfiles-jetty-webapp +%files util -f .mfiles-jetty-util +%license NOTICE.txt LICENSE* +%files servlet -f .mfiles-jetty-servlet +%files servlets -f .mfiles-jetty-servlets +%files server -f .mfiles-jetty-server +%files security -f .mfiles-jetty-security +%files jmx -f .mfiles-jetty-jmx +%files io -f .mfiles-jetty-io +%files http -f .mfiles-jetty-http +%files continuation -f .mfiles-jetty-continuation + +%files javadoc -f .mfiles-javadoc +%license NOTICE.txt LICENSE* + +%changelog +* Tue May 31 2016 Mikolaj Izdebski - 8.1.17-5 +- Fix build issue with maven-jar-plugin 3.0.0 + +* Thu Mar 24 2016 Mikolaj Izdebski - 8.1.17-4 +- Enable deploy and servlets modules + +* Thu Feb 04 2016 Fedora Release Engineering - 8.1.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Aug 04 2015 Michael Simacek - 8.1.17-2 +- Adjust bundle-plugin configuration + +* Fri Jul 03 2015 Michal Srb - 8.1.17-1 +- Update to upstream release 8.1.17 + +* Fri Jul 03 2015 Michal Srb - 8.1.14-11 +- Move artifacts into subpackages + +* Wed Jun 17 2015 Fedora Release Engineering - 8.1.14-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 30 2015 Michael Simacek - 8.1.14-9 +- Use jboss-servlet-3.0-api as tomcat no longer provides 3.0 + +* Mon Jul 21 2014 Mikolaj Izdebski - 8.1.14-8 +- Don't generate OSGi provides +- Resolves: rhbz#1079675 + +* Sun Jun 08 2014 Fedora Release Engineering - 8.1.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Jun 03 2014 Timothy St. Clair - 8.1.14-6 +- Rebuild for metadata change from xmvn + +* Tue Mar 04 2014 Stanislav Ochotnicky - 8.1.14-5 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Feb 4 2014 Peter MacKinnon - 8.1.14-4 +- Add maven-dependency-plugin, jetty-test-policy deps + +* Tue Feb 4 2014 Peter MacKinnon - 8.1.14-3 +- Enable rewrite, client modules + +* Fri Jan 31 2014 Mikolaj Izdebski - 8.1.14-2 +- Enable websocket module + +* Mon Jan 27 2014 Mikolaj Izdebski - 8.1.14-1 +- Initial packaging From f8d7dd5e34afadec5a47ec91e4ea5b307779db15 Mon Sep 17 00:00:00 2001 From: yaacov Date: Wed, 11 Apr 2018 14:07:12 +0300 Subject: [PATCH 14/16] add patch --- base1-0.3.0.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++ client_java.spec | 2 ++ 2 files changed, 92 insertions(+) create mode 100644 base1-0.3.0.patch diff --git a/base1-0.3.0.patch b/base1-0.3.0.patch new file mode 100644 index 000000000..29cde2fda --- /dev/null +++ b/base1-0.3.0.patch @@ -0,0 +1,90 @@ +--- simpleclient_servlet/src/test/java/io/prometheus/client/filter/MetricsFilterTest.java 2018-04-11 14:05:02.972748642 +0300 ++++ simpleclient_servlet/src/test/java/io/prometheus/client/filter/MetricsFilterTest.java.old 2018-04-11 14:04:52.880818559 +0300 +@@ -2,7 +2,6 @@ + + import io.prometheus.client.Collector; + import io.prometheus.client.CollectorRegistry; +-import org.eclipse.jetty.http.HttpMethods; + import org.junit.After; + import org.junit.Test; + import org.mockito.invocation.InvocationOnMock; +@@ -48,7 +47,7 @@ + HttpServletRequest req = mock(HttpServletRequest.class); + + when(req.getRequestURI()).thenReturn("/foo/bar/baz/bang/zilch/zip/nada"); +- when(req.getMethod()).thenReturn(HttpMethods.GET); ++ when(req.getMethod()).thenReturn("GET"); + + HttpServletResponse res = mock(HttpServletResponse.class); + FilterChain c = mock(FilterChain.class); +@@ -57,7 +56,7 @@ + + verify(c).doFilter(req, res); + +- final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(metricName + "_count", new String[]{"path", "method"}, new String[]{"/foo/bar/baz/bang", HttpMethods.GET}); ++ final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(metricName + "_count", new String[]{"path", "method"}, new String[]{"/foo/bar/baz/bang", "GET"}); + assertNotNull(sampleValue); + assertEquals(1, sampleValue, 0.0001); + } +@@ -68,7 +67,7 @@ + final String path = "/foo/bar/baz/bang/zilch/zip/nada"; + + when(req.getRequestURI()).thenReturn(path); +- when(req.getMethod()).thenReturn(HttpMethods.GET); ++ when(req.getMethod()).thenReturn("GET"); + + HttpServletResponse res = mock(HttpServletResponse.class); + FilterChain c = mock(FilterChain.class); +@@ -84,7 +83,7 @@ + verify(c).doFilter(req, res); + + +- final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(name + "_count", new String[]{"path", "method"}, new String[]{path, HttpMethods.GET}); ++ final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(name + "_count", new String[]{"path", "method"}, new String[]{path, "GET"}); + assertNotNull(sampleValue); + assertEquals(1, sampleValue, 0.0001); + } +@@ -94,7 +93,7 @@ + HttpServletRequest req = mock(HttpServletRequest.class); + final String path = "/foo/bar/baz/bang"; + when(req.getRequestURI()).thenReturn(path); +- when(req.getMethod()).thenReturn(HttpMethods.POST); ++ when(req.getMethod()).thenReturn("POST"); + + FilterChain c = mock(FilterChain.class); + doAnswer(new Answer() { +@@ -116,7 +115,7 @@ + HttpServletResponse res = mock(HttpServletResponse.class); + constructed.doFilter(req, res, c); + +- final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foobar_baz_filter_duration_seconds_sum", new String[]{"path", "method"}, new String[]{path, HttpMethods.POST}); ++ final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foobar_baz_filter_duration_seconds_sum", new String[]{"path", "method"}, new String[]{path, "POST"}); + assertNotNull(sum); + assertEquals(0.1, sum, 0.01); + } +@@ -126,7 +125,7 @@ + HttpServletRequest req = mock(HttpServletRequest.class); + final String path = "/foo/bar/baz/bang"; + when(req.getRequestURI()).thenReturn(path); +- when(req.getMethod()).thenReturn(HttpMethods.POST); ++ when(req.getMethod()).thenReturn("POST"); + + FilterChain c = mock(FilterChain.class); + doAnswer(new Answer() { +@@ -148,13 +147,13 @@ + + f.doFilter(req, res, c); + +- final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foo_sum", new String[]{"path", "method"}, new String[]{"/foo", HttpMethods.POST}); ++ final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foo_sum", new String[]{"path", "method"}, new String[]{"/foo", "POST"}); + assertEquals(0.1, sum, 0.01); + +- final Double le05 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", HttpMethods.POST, "0.05"}); ++ final Double le05 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", "POST", "0.05"}); + assertNotNull(le05); + assertEquals(0, le05, 0.01); +- final Double le15 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", HttpMethods.POST, "0.15"}); ++ final Double le15 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", "POST", "0.15"}); + assertNotNull(le15); + assertEquals(1, le15, 0.01); + diff --git a/client_java.spec b/client_java.spec index a8b04d2db..d8e03a3b5 100644 --- a/client_java.spec +++ b/client_java.spec @@ -8,6 +8,7 @@ Source0: https://github.com/yaacov/client_java/archive/parent-%{version}.t BuildArch: noarch Patch0: https://raw.githubusercontent.com/yaacov/client_java/master/base-0.3.0.patch +Patch1: https://raw.githubusercontent.com/yaacov/client_java/master/base1-0.3.0.patch BuildRequires: maven-local BuildRequires: maven-plugin-bundle @@ -70,6 +71,7 @@ This package provides %{summary}. %pom_remove_plugin :maven-release-plugin %patch0 -p0 +%patch1 -p0 %build %mvn_build -s From 10dfeafffaa53d50618aa46d9e662a04099e6c5f Mon Sep 17 00:00:00 2001 From: yaacov Date: Wed, 11 Apr 2018 14:25:28 +0300 Subject: [PATCH 15/16] patch1 update --- base1-0.3.0.patch | 31 +++++++++++++++---------------- client_java.spec | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/base1-0.3.0.patch b/base1-0.3.0.patch index 29cde2fda..b0dcf031e 100644 --- a/base1-0.3.0.patch +++ b/base1-0.3.0.patch @@ -1,7 +1,7 @@ --- simpleclient_servlet/src/test/java/io/prometheus/client/filter/MetricsFilterTest.java 2018-04-11 14:05:02.972748642 +0300 +++ simpleclient_servlet/src/test/java/io/prometheus/client/filter/MetricsFilterTest.java.old 2018-04-11 14:04:52.880818559 +0300 @@ -2,7 +2,6 @@ - + import io.prometheus.client.Collector; import io.prometheus.client.CollectorRegistry; -import org.eclipse.jetty.http.HttpMethods; @@ -10,17 +10,17 @@ import org.mockito.invocation.InvocationOnMock; @@ -48,7 +47,7 @@ HttpServletRequest req = mock(HttpServletRequest.class); - + when(req.getRequestURI()).thenReturn("/foo/bar/baz/bang/zilch/zip/nada"); - when(req.getMethod()).thenReturn(HttpMethods.GET); + when(req.getMethod()).thenReturn("GET"); - + HttpServletResponse res = mock(HttpServletResponse.class); FilterChain c = mock(FilterChain.class); @@ -57,7 +56,7 @@ - + verify(c).doFilter(req, res); - + - final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(metricName + "_count", new String[]{"path", "method"}, new String[]{"/foo/bar/baz/bang", HttpMethods.GET}); + final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(metricName + "_count", new String[]{"path", "method"}, new String[]{"/foo/bar/baz/bang", "GET"}); assertNotNull(sampleValue); @@ -28,17 +28,17 @@ } @@ -68,7 +67,7 @@ final String path = "/foo/bar/baz/bang/zilch/zip/nada"; - + when(req.getRequestURI()).thenReturn(path); - when(req.getMethod()).thenReturn(HttpMethods.GET); + when(req.getMethod()).thenReturn("GET"); - + HttpServletResponse res = mock(HttpServletResponse.class); FilterChain c = mock(FilterChain.class); @@ -84,7 +83,7 @@ verify(c).doFilter(req, res); - - + + - final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(name + "_count", new String[]{"path", "method"}, new String[]{path, HttpMethods.GET}); + final Double sampleValue = CollectorRegistry.defaultRegistry.getSampleValue(name + "_count", new String[]{"path", "method"}, new String[]{path, "GET"}); assertNotNull(sampleValue); @@ -50,13 +50,13 @@ when(req.getRequestURI()).thenReturn(path); - when(req.getMethod()).thenReturn(HttpMethods.POST); + when(req.getMethod()).thenReturn("POST"); - + FilterChain c = mock(FilterChain.class); doAnswer(new Answer() { @@ -116,7 +115,7 @@ HttpServletResponse res = mock(HttpServletResponse.class); constructed.doFilter(req, res, c); - + - final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foobar_baz_filter_duration_seconds_sum", new String[]{"path", "method"}, new String[]{path, HttpMethods.POST}); + final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foobar_baz_filter_duration_seconds_sum", new String[]{"path", "method"}, new String[]{path, "POST"}); assertNotNull(sum); @@ -68,17 +68,17 @@ when(req.getRequestURI()).thenReturn(path); - when(req.getMethod()).thenReturn(HttpMethods.POST); + when(req.getMethod()).thenReturn("POST"); - + FilterChain c = mock(FilterChain.class); doAnswer(new Answer() { @@ -148,13 +147,13 @@ - + f.doFilter(req, res, c); - + - final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foo_sum", new String[]{"path", "method"}, new String[]{"/foo", HttpMethods.POST}); + final Double sum = CollectorRegistry.defaultRegistry.getSampleValue("foo_sum", new String[]{"path", "method"}, new String[]{"/foo", "POST"}); assertEquals(0.1, sum, 0.01); - + - final Double le05 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", HttpMethods.POST, "0.05"}); + final Double le05 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", "POST", "0.05"}); assertNotNull(le05); @@ -87,4 +87,3 @@ + final Double le15 = CollectorRegistry.defaultRegistry.getSampleValue("foo_bucket", new String[]{"path", "method", "le"}, new String[]{"/foo", "POST", "0.15"}); assertNotNull(le15); assertEquals(1, le15, 0.01); - diff --git a/client_java.spec b/client_java.spec index d8e03a3b5..3e8421e12 100644 --- a/client_java.spec +++ b/client_java.spec @@ -16,7 +16,7 @@ BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(org.eclipse.jetty:jetty-servlet:pom:8.1) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) %description Prometheus JVM Client supports Java, Clojure, Scala, From bf2eccf17a144adcd0b47b49c0664f7974a84691 Mon Sep 17 00:00:00 2001 From: yaacov Date: Wed, 11 Apr 2018 14:41:08 +0300 Subject: [PATCH 16/16] change patch name --- base-0.3.0.patch | 20 --- client_java.spec | 4 +- jetty8.spec | 273 ------------------------------ base1-0.3.0.patch => jetty9.patch | 0 4 files changed, 1 insertion(+), 296 deletions(-) delete mode 100644 base-0.3.0.patch delete mode 100644 jetty8.spec rename base1-0.3.0.patch => jetty9.patch (100%) diff --git a/base-0.3.0.patch b/base-0.3.0.patch deleted file mode 100644 index c092d3844..000000000 --- a/base-0.3.0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- simpleclient_servlet/pom.xml 2018-04-09 15:33:02.856762335 +0300 -+++ simpleclient_servlet/pom.xml.old 2018-04-09 15:35:18.255891022 +0300 -@@ -51,7 +51,7 @@ - - javax.servlet - javax.servlet-api -- 3.0.1 -+ 3.1.0 - provided - - -@@ -70,7 +70,7 @@ - - org.eclipse.jetty - jetty-servlet -- 8.1.7.v20120910 -+ 8.1.17.v20150415 - test - - diff --git a/client_java.spec b/client_java.spec index 3e8421e12..eb7c3ab75 100644 --- a/client_java.spec +++ b/client_java.spec @@ -7,8 +7,7 @@ URL: https://github.com/yaacov/client_java/ Source0: https://github.com/yaacov/client_java/archive/parent-%{version}.tar.gz BuildArch: noarch -Patch0: https://raw.githubusercontent.com/yaacov/client_java/master/base-0.3.0.patch -Patch1: https://raw.githubusercontent.com/yaacov/client_java/master/base1-0.3.0.patch +Patch0: https://raw.githubusercontent.com/yaacov/client_java/master/jetty9.patch BuildRequires: maven-local BuildRequires: maven-plugin-bundle @@ -71,7 +70,6 @@ This package provides %{summary}. %pom_remove_plugin :maven-release-plugin %patch0 -p0 -%patch1 -p0 %build %mvn_build -s diff --git a/jetty8.spec b/jetty8.spec deleted file mode 100644 index 711dbc27a..000000000 --- a/jetty8.spec +++ /dev/null @@ -1,273 +0,0 @@ -# jetty8 is a compat package and as such it shouldn't have any OSGi provides -%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^osgi\\( - -%global addver v20150415 - -Name: jetty8 -Version: 8.1.17 -Release: 5%{?dist} -Summary: Java Webserver and Servlet Container -# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt -# some MIT-licensed code (from Utf8Appendable) is used too -License: (ASL 2.0 or EPL) and MIT -URL: http://www.eclipse.org/jetty -BuildArch: noarch - -Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/org.eclipse.jetty.project-jetty-%{version}.%{addver}.tar.gz - -BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.eclipse.jetty:jetty-parent:pom:) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-assembly-descriptors) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-build-support) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-version-maven-plugin) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) -BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-jdk14) - -Requires: %{name}-rewrite = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-xml = %{version}-%{release} -Requires: %{name}-websocket = %{version}-%{release} -Requires: %{name}-webapp = %{version}-%{release} -Requires: %{name}-util = %{version}-%{release} -Requires: %{name}-servlet = %{version}-%{release} -Requires: %{name}-server = %{version}-%{release} -Requires: %{name}-security = %{version}-%{release} -Requires: %{name}-jmx = %{version}-%{release} -Requires: %{name}-io = %{version}-%{release} -Requires: %{name}-http = %{version}-%{release} -Requires: %{name}-continuation = %{version}-%{release} - -%description -Jetty is a 100% Java HTTP Server and Servlet Container. This means that you -do not need to configure and run a separate web server (like Apache) in order -to use Java, servlets and JSPs to generate dynamic content. Jetty is a fully -featured web server for static and dynamic content. Unlike separate -server/container solutions, this means that your web server and web -application run in the same process, without interconnection overheads -and complications. Furthermore, as a pure java component, Jetty can be simply -included in your application for demonstration, distribution or deployment. -Jetty is available on all Java supported platforms. - -%package rewrite -Summary: Jetty rewrite handler -%description rewrite -This package contains %{summary}. - -%package client -Summary: Jetty asynchronous HTTP client -%description client -This package contains %{summary}. - -%package xml -Summary: Jetty XML utilities -%description xml -This package contains %{summary}. - -%package websocket -Summary: Jetty websocket -%description websocket -This package contains %{summary}. - -%package webapp -Summary: Jetty web application support -%description webapp -This package contains %{summary}. - -%package util -Summary: Jetty utility classes -%description util -This package contains %{summary}. - -%package servlet -Summary: Jetty servlet container -%description servlet -This package contains %{summary}. - -%package server -Summary: Jetty server artifact -%description server -This package contains %{summary}. - -%package security -Summary: Jetty security infrastructure -%description security -This package contains %{summary}. - -%package jmx -Summary: Jetty JMX management artifact -%description jmx -This package contains %{summary}. - -%package io -Summary: Jetty IO utility -%description io -This package contains %{summary}. - -%package http -Summary: Jetty HTTP utility -%description http -This package contains %{summary}. - -%package continuation -Summary: Jetty asynchronous API -%description continuation -This package contains %{summary}. - -%package deploy -Summary: Jetty deployers -%description deploy -This package contains %{summary}. - -%package servlets -Summary: Jetty utility servlets and filters -%description servlets -This package contains %{summary}. - -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -This package provides %{summary}. - -%prep -%setup -q -n jetty-%{version}.%{addver} -find -name "*.jar" -delete -find -name "*.war" -delete -find -name "*.class" -delete - -%mvn_compat_version : 8.1 %{version}.%{addver} 8.1.14.v20131031 - -# aggregating POM belongs to main package -%mvn_package :jetty-project::pom - -%pom_change_dep -r org.eclipse.jetty.orbit:javax.servlet org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec - -# Disable unneeded modules. This is a compat package and only a -# minimal set of modules are being built. -%pom_xpath_remove "pom:modules" -%pom_xpath_inject "pom:project" "" -for mod in continuation deploy http io jmx security server servlet servlets util webapp websocket xml client rewrite; do - %pom_xpath_inject pom:modules "jetty-$mod" - %pom_xpath_inject 'pom:plugin[pom:artifactId="maven-bundle-plugin"]/pom:executions/pom:execution' ' - process-classes' jetty-$mod -done - -# PMD plugin is not useful in Fedora. -%pom_remove_plugin -r :maven-pmd-plugin - -%pom_remove_plugin -r :maven-license-plugin -%pom_remove_plugin -r :maven-enforcer-plugin -%pom_remove_plugin -r :maven-release-plugin -%pom_remove_plugin -r :maven-source-plugin -%pom_remove_plugin -r :maven-site-plugin - -# this needs jetty6 things, so just remove it -# shouldn't cause any trouble since it handled only in loadClass elsewhere -%pom_remove_dep org.mortbay.jetty:jetty-util jetty-continuation -rm jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Jetty6Continuation.java - -# Disable default-jar executions of maven-jar-plugin in certain Jetty -# modules, which define their own executions of the plugin. This -# avoids problems with version 3.0.0 of the plugin. -%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" " - - default-jar - skip - " \ - jetty-continuation \ - jetty-http \ - jetty-io \ - jetty-server \ - jetty-websocket \ - -# CCLAs and CLAs, we don't want to install these -rm -Rf LICENSE-CONTRIBUTOR/ - -%build -# Tests disabled because of missing dependencies -%mvn_build -f -s - -%install -%mvn_install - -%files -f .mfiles-jetty-project -%{!?_licensedir:%global license %%doc} -%license NOTICE.txt README.txt VERSION.txt LICENSE* - -%files rewrite -f .mfiles-jetty-rewrite -%files client -f .mfiles-jetty-client -%files deploy -f .mfiles-jetty-deploy -%files xml -f .mfiles-jetty-xml -%files websocket -f .mfiles-jetty-websocket -%files webapp -f .mfiles-jetty-webapp -%files util -f .mfiles-jetty-util -%license NOTICE.txt LICENSE* -%files servlet -f .mfiles-jetty-servlet -%files servlets -f .mfiles-jetty-servlets -%files server -f .mfiles-jetty-server -%files security -f .mfiles-jetty-security -%files jmx -f .mfiles-jetty-jmx -%files io -f .mfiles-jetty-io -%files http -f .mfiles-jetty-http -%files continuation -f .mfiles-jetty-continuation - -%files javadoc -f .mfiles-javadoc -%license NOTICE.txt LICENSE* - -%changelog -* Tue May 31 2016 Mikolaj Izdebski - 8.1.17-5 -- Fix build issue with maven-jar-plugin 3.0.0 - -* Thu Mar 24 2016 Mikolaj Izdebski - 8.1.17-4 -- Enable deploy and servlets modules - -* Thu Feb 04 2016 Fedora Release Engineering - 8.1.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Aug 04 2015 Michael Simacek - 8.1.17-2 -- Adjust bundle-plugin configuration - -* Fri Jul 03 2015 Michal Srb - 8.1.17-1 -- Update to upstream release 8.1.17 - -* Fri Jul 03 2015 Michal Srb - 8.1.14-11 -- Move artifacts into subpackages - -* Wed Jun 17 2015 Fedora Release Engineering - 8.1.14-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 30 2015 Michael Simacek - 8.1.14-9 -- Use jboss-servlet-3.0-api as tomcat no longer provides 3.0 - -* Mon Jul 21 2014 Mikolaj Izdebski - 8.1.14-8 -- Don't generate OSGi provides -- Resolves: rhbz#1079675 - -* Sun Jun 08 2014 Fedora Release Engineering - 8.1.14-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 03 2014 Timothy St. Clair - 8.1.14-6 -- Rebuild for metadata change from xmvn - -* Tue Mar 04 2014 Stanislav Ochotnicky - 8.1.14-5 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Feb 4 2014 Peter MacKinnon - 8.1.14-4 -- Add maven-dependency-plugin, jetty-test-policy deps - -* Tue Feb 4 2014 Peter MacKinnon - 8.1.14-3 -- Enable rewrite, client modules - -* Fri Jan 31 2014 Mikolaj Izdebski - 8.1.14-2 -- Enable websocket module - -* Mon Jan 27 2014 Mikolaj Izdebski - 8.1.14-1 -- Initial packaging diff --git a/base1-0.3.0.patch b/jetty9.patch similarity index 100% rename from base1-0.3.0.patch rename to jetty9.patch