From 76357fdd4c9c0090a42c1fd10dd743c3f92cab75cf38babb3cce0fcb7f29af1d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 19 Jul 2021 10:13:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=39 --- jetty-minimal.changes | 7 ++ jetty-minimal.spec | 22 ++-- jetty-unixsocket.changes | 5 + jetty-unixsocket.spec | 249 +++++++++++++++++++++++++++++++++++++++ jetty-websocket.spec | 2 +- 5 files changed, 269 insertions(+), 16 deletions(-) create mode 100644 jetty-unixsocket.changes create mode 100644 jetty-unixsocket.spec diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 91e70f7..f9ea027 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 19 10:13:02 UTC 2021 - Fridrich Strba + +- Splitting the jetty-unixsocket artifact into a separate spec file + in order to avoid extra dependencies for the jetty-minimal + package. + ------------------------------------------------------------------- Mon Jul 19 06:58:23 UTC 2021 - Fridrich Strba diff --git a/jetty-minimal.spec b/jetty-minimal.spec index 6a76fa6..40b44c4 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -30,17 +30,17 @@ URL: https://www.eclipse.org/jetty/ Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz#/%{src_name}.tar.gz BuildRequires: fdupes BuildRequires: maven-local -BuildRequires: mvn(com.github.jnr:jnr-unixsocket) BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.transaction:javax.transaction-api) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.ant:ant-launcher) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.tomcat:tomcat-jasper) -BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty.orbit:javax.mail.glassfish) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) @@ -207,7 +207,8 @@ Group: Productivity/Networking/Web/Servers %package -n %{base_name}-server Summary: The server module for Jetty -Group: Productivity/Networking/Web/Servers +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +Group: Productivity/Neorg.apache.maven.plugins:maven-dependency-plugintworking/Web/Servers %description -n %{base_name}-server %{extdesc} %{summary}. @@ -233,13 +234,6 @@ Group: Productivity/Networking/Web/Servers %description -n %{base_name}-start %{extdesc} %{summary}. -%package -n %{base_name}-unixsocket -Summary: The unixsocket module for Jetty -Group: Productivity/Networking/Web/Servers - -%description -n %{base_name}-unixsocket -%{extdesc} %{summary}. - %package -n %{base_name}-util Summary: The util module for Jetty Group: Productivity/Networking/Web/Servers @@ -373,7 +367,7 @@ rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors # the default location is not allowed by SELinux sed -i '/ + +- Splitting jetty-unixsocket 9.4.43.v20210629 into a separate spec + file diff --git a/jetty-unixsocket.spec b/jetty-unixsocket.spec new file mode 100644 index 0000000..29aab50 --- /dev/null +++ b/jetty-unixsocket.spec @@ -0,0 +1,249 @@ +# +# spec file +# +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2000-2007, JPackage Project +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global base_name jetty +%global addver .v20210629 +%define src_name %{base_name}.project-%{base_name}-%{version}%{addver} +Name: %{base_name}-unixsocket +Version: 9.4.43 +Release: 0 +Summary: The unixsocket modules for Jetty +License: Apache-2.0 OR EPL-1.0 +URL: https://www.eclipse.org/jetty/ +Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz#/%{src_name}.tar.gz +BuildRequires: fdupes +BuildRequires: maven-local +BuildRequires: mvn(com.github.jnr:jnr-unixsocket) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-client) >= %{version} +BuildRequires: mvn(org.eclipse.jetty:jetty-server) >= %{version} +BuildArch: noarch + +%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. + +This package contains the unixsocket module for Jetty + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +%{summary}. + +%prep +%setup -q -n %{src_name} + +find . -name "*.?ar" -exec rm {} \; +find . -name "*.class" -exec rm {} \; + +# Plugins irrelevant or harmful to building the package +%pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :maven-eclipse-plugin +%pom_remove_plugin -r :license-maven-plugin +%pom_remove_plugin -r :maven-site-plugin +%pom_remove_plugin -r :maven-source-plugin +%pom_remove_plugin -r :maven-deploy-plugin +%pom_remove_plugin -r :jacoco-maven-plugin +%pom_remove_plugin -r :maven-release-plugin +%pom_remove_plugin -r :buildnumber-maven-plugin +%pom_remove_plugin -r :h2spec-maven-plugin + +# Unnecessary pom flattening can be skipped +%pom_remove_plugin -r :flatten-maven-plugin jetty-bom + +%pom_disable_module aggregates/jetty-all + +%pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi + +%pom_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper + +%pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common + +# provided by glassfish-jsp-api that has newer version +%pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api + +# txt artifact - not installable +%pom_remove_plugin ":jetty-version-maven-plugin" +%pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-home + +# Disable building source release +%pom_xpath_remove 'pom:execution[pom:id="sources"]' jetty-home + +# Unwanted JS in javadoc +sed -i '/^\s*\*.*