Fridrich Strba 2020-04-02 09:26:22 +00:00 committed by Git OBS Bridge
parent dcb999e0d9
commit f24aef6219
6 changed files with 25 additions and 18 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d37a4cbc1e321542d5ba3d5f2307c6214032d370a16955db19dc0aea2b7cc3b6
size 19203205

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb5c08ca79998b31dea2e65975248b844f842042a40de0c84e10f7df07c48e67
size 19275654

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 2 09:25:19 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 9.4.27.v20200227
-------------------------------------------------------------------
Thu Nov 28 09:02:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package jetty-minimal
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -18,9 +18,9 @@
%global base_name jetty
%global addver .v20191022
%global addver .v20200227
Name: %{base_name}-minimal
Version: 9.4.22
Version: 9.4.27
Release: 0
Summary: Java Webserver and Servlet Container
License: Apache-2.0 OR EPL-1.0
@ -193,6 +193,7 @@ 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 :findbugs-maven-plugin
%pom_remove_plugin -r :maven-enforcer-plugin
%pom_remove_plugin -r :clirr-maven-plugin
@ -221,9 +222,6 @@ find . -name "*.class" -exec rm {} \;
%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
@ -326,7 +324,7 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
%pom_disable_module jetty-alpn
%pom_disable_module jetty-home
%mvn_file :{*} %{base_name}/@1
%{mvn_file} :{*} %{base_name}/@1
%build

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 2 09:25:19 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 9.4.27.v20200227
-------------------------------------------------------------------
Thu Nov 28 09:02:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Removed patch:

View File

@ -1,7 +1,7 @@
#
# spec file for package jetty-websocket
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -18,9 +18,9 @@
%global base_name jetty
%global addver .v20191022
%global addver .v20200227
Name: %{base_name}-websocket
Version: 9.4.22
Version: 9.4.27
Release: 0
Summary: The websocket modules for Jetty
License: Apache-2.0 OR EPL-1.0
@ -117,6 +117,7 @@ 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 :findbugs-maven-plugin
%pom_remove_plugin -r :maven-enforcer-plugin
%pom_remove_plugin -r :clirr-maven-plugin
@ -145,9 +146,6 @@ find . -name "*.class" -exec rm {} \;
%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
@ -216,7 +214,7 @@ rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml
jetty-home/src/main/resources/etc/jetty-started.xml
# remote-resources only copies about.html
%pom_remove_plugin :maven-remote-resources-plugin
@ -271,7 +269,7 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
%pom_disable_module jetty-xml
%pom_disable_module jetty-webapp
%mvn_file :{*} %{base_name}/@1
%{mvn_file} :{*} %{base_name}/@1
%build