commit 6b3ef77b1ff9225d180c1ab0ec0bcd0783bef1385d729b0f226e8c8969ee8610 Author: Fridrich Strba Date: Tue Nov 5 13:17:07 2019 +0000 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/jetty-9.4.19.v20190610.tar.gz b/jetty-9.4.19.v20190610.tar.gz new file mode 100644 index 0000000..27e7471 --- /dev/null +++ b/jetty-9.4.19.v20190610.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:320b6741aee16710e3139a7a09b5eb3f7ec1af5b251e2472056e6856f3231ebe +size 18947159 diff --git a/jetty-annotations-asm6.patch b/jetty-annotations-asm6.patch new file mode 100644 index 0000000..40fdfd7 --- /dev/null +++ b/jetty-annotations-asm6.patch @@ -0,0 +1,25 @@ +--- jetty.project-jetty-9.4.19.v20190610/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java 2019-06-10 18:17:56.000000000 +0200 ++++ jetty.project-jetty-9.4.19.v20190610/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java 2019-10-04 15:08:54.874014725 +0200 +@@ -69,8 +69,8 @@ + public class AnnotationParser + { + private static final Logger LOG = Log.getLogger(AnnotationParser.class); +- private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api +- private static final String ASM_OPCODE_VERSION_STR = "ASM7"; ++ private static final int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api ++ private static final String ASM_OPCODE_VERSION_STR = "ASM6"; + + /** + * Map of classnames scanned and the first location from which scan occurred +@@ -115,11 +115,6 @@ + asmVersion = Opcodes.ASM6; + break; + } +- case 7: +- { +- asmVersion = Opcodes.ASM7; +- break; +- } + default: + { + LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR); diff --git a/jetty-annotations.spec b/jetty-annotations.spec new file mode 100644 index 0000000..5cc125a --- /dev/null +++ b/jetty-annotations.spec @@ -0,0 +1,272 @@ +# +# spec file for package jetty +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 .v20190610 +Name: %{base_name}-annotations +Version: 9.4.19 +Release: 0 +Summary: The annotations module 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 +Patch2: jetty-annotations-asm6.patch +BuildRequires: fdupes +BuildRequires: maven-local +BuildRequires: mvn(javax.annotation:javax.annotation-api) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-plus) >= %{version} +BuildRequires: mvn(org.eclipse.jetty:jetty-webapp) >= %{version} +BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm-commons) +BuildArch: noarch +# jp_minimal doesn't have main package + +%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 annotations module for Jetty + +%package javadoc +Summary: Javadoc for %{name} +# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc +License: (Apache-2.0 OR EPL-1.0) AND MIT + +%description javadoc +%{summary}. + +%prep +%setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver} + +%patch2 -p1 + +find . -name "*.?ar" -exec rm {} \; +find . -name "*.class" -exec rm {} \; + +# Plugins irrelevant or harmful to building the package +%pom_remove_plugin -r :findbugs-maven-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :clirr-maven-plugin +%pom_remove_plugin -r :maven-eclipse-plugin +%pom_remove_plugin -r :maven-pmd-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 + +# Use proper groupId for apache ant +%pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml + +%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 + +# Old version of jetty not available for tests, so use this version +%pom_change_dep 'org.eclipse.jetty:jetty-util' 'org.eclipse.jetty:jetty-util:${project.version}' tests/test-webapps/test-servlet-spec/test-spec-webapp + +# 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*\*.*