gil pushed to grizzly (master). "update to 2.3.19"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 02:31:48 UTC 2015
From 77a520d88cb6716e4da18f726b425262d9f446d4 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Wed, 20 May 2015 04:30:47 +0200
Subject: update to 2.3.19
diff --git a/.gitignore b/.gitignore
index d7586cc..f6d1324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/grizzly-2.3.3.tar.xz
/grizzly-2.3.4.tar.xz
/grizzly-2.3.6.tar.xz
+/2_3_19.tar.gz
diff --git a/grizzly-2.3.3-jaws227.patch b/grizzly-2.3.3-jaws227.patch
deleted file mode 100644
index 005dc12..0000000
--- a/grizzly-2.3.3-jaws227.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- extras/http-server-jaxws/src/main/java/org/glassfish/grizzly/jaxws/JaxwsConnection.java 2013-06-03 20:21:15.000000000 +0200
-+++ extras/http-server-jaxws/src/main/java/org/glassfish/grizzly/jaxws/JaxwsConnection.java-gil 2013-07-10 10:53:18.582192549 +0200
-@@ -40,6 +40,7 @@
- package org.glassfish.grizzly.jaxws;
-
- import com.sun.istack.NotNull;
-+import com.sun.istack.Nullable;
- import com.sun.xml.ws.api.message.Packet;
- import com.sun.xml.ws.api.server.PortAddressResolver;
- import com.sun.xml.ws.api.server.WSEndpoint;
-@@ -283,4 +284,40 @@
-
- return headers;
- }
-+
-+ public int getServerPort() {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public @NotNull String getServerName() {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public @NotNull String getRequestScheme() {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public @NotNull String getRequestURI() {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public @Nullable List<String> getRequestHeaderValues(@NotNull String headerName){
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public @NotNull Set<String> getRequestHeaderNames() {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public void setResponseHeaders(String key, List<String> value) {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public void setResponseHeaders(String key, String value) {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
-+
-+ public void setResponseHeader(String key, List<String> value) {
-+ throw new UnsupportedOperationException("Not supported yet.");
-+ }
- }
diff --git a/grizzly.spec b/grizzly.spec
index c3aa6dd..eb04b20 100644
--- a/grizzly.spec
+++ b/grizzly.spec
@@ -1,50 +1,58 @@
%global namedreltag %{nil}
-%global namedversion %{version}%{?namedreltag}
+%global _version %(echo %version | tr . _)
+%global namedversion %{_version}%{?namedreltag}
+
+# Conditionals to help breaking grizzly <-> jersey dependency cycle
+%if 0%{?fedora}
+%bcond_with jersey
+%endif
+
Name: grizzly
-Version: 2.3.6
-Release: 3%{?dist}
+Version: 2.3.19
+Release: 1%{?dist}
Summary: Java NIO Server Framework
# see Grizzly_THIRDPARTYLICENSEREADME.txt
License: (CDDL or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain
URL: http://grizzly.java.net/
# git clone git://java.net/grizzly~git
# (cd grizzly~git/ && git archive --format=tar --prefix=grizzly-2.3.6/ 2_3_6 | xz > ../grizzly-2.3.6.tar.xz)
-Source0: %{name}-%{namedversion}.tar.xz
+Source0: https://github.com/GrizzlyNIO/grizzly-mirror/archive/%{namedversion}.tar.gz
+# https://java.net/jira/browse/GRIZZLY-1771
# wget -O glassfish-LICENSE.txt https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/META-INF/LICENSE.txt
# grizzly package don't include the license file
Source1: glassfish-LICENSE.txt
-# build support for glassfish-jaxws >= 2.2.7
-Patch0: %{name}-2.3.3-jaws227.patch
+# Multiple packages with the same gId:aId: javax.servlet:javax.servlet-api.
+BuildRequires: glassfish-servlet-api
+BuildRequires: maven-local
+BuildRequires: mvn(com.sun.istack:istack-commons-maven-plugin)
+%if %{with jersey}
+BuildRequires: mvn(com.sun.jersey:jersey-client)
+BuildRequires: mvn(com.sun.jersey:jersey-server)
+BuildRequires: mvn(com.sun.jersey:jersey-servlet)
+%endif
BuildRequires: mvn(com.sun.xml.ws:rt)
-BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.java:jvnet-parent:pom:)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+# BuildRequires: mvn(org.apache.maven.plugins:maven-war-plugin)
+BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.glassfish.gmbal:gmbal)
BuildRequires: mvn(org.glassfish.gmbal:gmbal-api-only)
+BuildRequires: mvn(org.glassfish.grizzly:grizzly-npn-api)
+BuildRequires: mvn(org.glassfish.grizzly:grizzly-npn-bootstrap)
+BuildRequires: mvn(org.glassfish.hk2:hk2-inhabitant-generator)
+BuildRequires: mvn(org.glassfish.hk2:osgiversion-maven-plugin)
+BuildRequires: mvn(org.mockito:mockito-all)
BuildRequires: mvn(org.osgi:org.osgi.compendium)
BuildRequires: mvn(org.osgi:org.osgi.core)
-# test deps
-%if 0
-# Circular deps
-BuildRequires: mvn(com.sun.jersey:jersey-client)
-BuildRequires: mvn(com.sun.jersey:jersey-server)
-BuildRequires: mvn(com.sun.jersey:jersey-servlet)
-%endif
-BuildRequires: mvn(junit:junit)
-
-BuildRequires: maven-local
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-istack-commons-plugin
-BuildRequires: maven-plugin-build-helper
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-source-plugin
-BuildRequires: maven-war-plugin
+# Require servlet-api 3.1
+Requires: glassfish-servlet-api
BuildArch: noarch
-# config
-
%description
Writing scalable server applications in the Java programming
language has always been difficult. Before the advent of the
@@ -69,17 +77,10 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
-%setup -q -n %{name}-%{namedversion}
-find . -name '*.jar' -delete
+%setup -q -n %{name}-mirror-%{namedversion}
find . -name '*.class' -delete
-
-%patch0 -p0
-sed -i "s|artifactId>jaxws-rt|artifactId>rt|" \
- extras/http-server-jaxws/pom.xml \
- samples/http-jaxws-samples/pom.xml
-#com.sun.xml.ws.transport.http.HttpAdapterList#createPortAddressResolver(final String baseAddress, final Class<?> endpointImpl)
-sed -i "s|createPortAddressResolver(getBaseAddress()|createPortAddressResolver(getBaseAddress(), null|" \
- extras/http-server-jaxws/src/main/java/org/glassfish/grizzly/jaxws/JaxwsConnection.java
+find . -name '*.jar' -print -delete
+find . -name '*.js' -print -delete
# unavailable deps
# org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin
@@ -88,16 +89,11 @@ sed -i "s|createPortAddressResolver(getBaseAddress()|createPortAddressResolver(g
# org.ops4j maven-pax-plugin 1.5
%pom_disable_module grizzly-httpservice extras
-
-# XMvn don't support file with war extension
+# Unsupport war extension
%pom_disable_module comet samples
-
-# remove internal libraries
%pom_disable_module websockets/chat samples
+%pom_disable_module websockets/chat-ssl samples
-# org.glassfish.hk2 config-generator 2.1.57
-#%%pom_disable_module config modules
-#%%pom_remove_dep :cobertura-maven-plugin
%pom_remove_dep :maven-bundle-plugin
%pom_remove_dep :maven-plugin-tools-api
%pom_remove_dep org.glassfish.hk2:config-types
@@ -109,11 +105,10 @@ sed -i "s|createPortAddressResolver(getBaseAddress()|createPortAddressResolver(g
# wagon-webdav & wagon-ssh-external
%pom_xpath_remove "pom:build/pom:extensions"
-# org.glassfish.grizzly:grizzly-npn-api:1.0
-%pom_disable_module spdy modules
-%pom_disable_module spdy-samples samples
+# org.glassfish.grizzly:grizzly-npn-bootstrap:1.0
+%pom_xpath_inject "pom:dependency[pom:artifactId = 'grizzly-spdy']" '<version>${project.version}</version>' samples/spdy-samples
-#%%pom_remove_dep org.glassfish.grizzly:documentation bom
+#%% pom_remove_dep org.glassfish.grizzly:documentation bom
%pom_remove_dep org.glassfish.grizzly:grizzly-comet-server bom
%pom_remove_dep org.glassfish.grizzly:grizzly-compression bom
%pom_remove_dep org.glassfish.grizzly:grizzly-core bom
@@ -121,7 +116,7 @@ sed -i "s|createPortAddressResolver(getBaseAddress()|createPortAddressResolver(g
%pom_remove_dep org.glassfish.grizzly:grizzly-http-server-core bom
%pom_remove_dep org.glassfish.grizzly:grizzly-http-server-jaxws bom
%pom_remove_dep org.glassfish.grizzly:grizzly-http-servlet-server bom
-%pom_remove_dep org.glassfish.grizzly:grizzly-spdy bom
+#%% pom_remove_dep org.glassfish.grizzly:grizzly-spdy bom
%pom_remove_dep org.glassfish.grizzly:grizzly-websockets-server bom
%pom_remove_dep org.glassfish.grizzly.osgi:grizzly-httpservice bom
%pom_remove_dep org.glassfish.grizzly.osgi:grizzly-httpservice-bundle bom
@@ -131,13 +126,14 @@ sed -i "s|createPortAddressResolver(getBaseAddress()|createPortAddressResolver(g
%pom_remove_plugin :findbugs-maven-plugin
%pom_remove_plugin :glassfish-copyright-maven-plugin
%pom_remove_plugin :nexus-maven-plugin
+%pom_remove_plugin :maven-source-plugin
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
-# circular deps
-%if 0
-%pom_add_dep com.sun.jersey:jersey-servlet:'${jersey-version}':test modules/http-servlet
-%else
+%if %{without jersey}
%pom_remove_dep com.sun.jersey: modules/http-servlet
rm -rf modules/http-servlet/src/test/java/filter/*
+%else
+%pom_add_dep com.sun.jersey:jersey-servlet:'${jersey-version}':test modules/http-servlet
%endif
cp -p %{SOURCE1} LICENSE.txt
@@ -152,8 +148,7 @@ sed -i 's|${pom.version}|${project.version}|' $(find . -name "pom.xml")
# fix aId for new istack-commons maven plugin
while read f; do
-%pom_xpath_set "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.sun.istack']/pom:artifactId" \
- istack-commons-maven-plugin ${f}
+%pom_xpath_set "pom:plugin[pom:groupId='com.sun.istack']/pom:artifactId" istack-commons-maven-plugin ${f}
done <<'.'
modules/%{name}
@@ -163,8 +158,17 @@ modules/monitoring/http-server
.
# Force servlet 3.1 apis
-%pom_remove_dep javax.servlet:servlet-api modules/comet
-%pom_add_dep javax.servlet:javax.servlet-api:3.1.0:provided modules/comet
+%pom_xpath_set "pom:dependency[pom:groupId ='javax.servlet']/pom:artifactId" javax.servlet-api modules/comet
+%pom_xpath_set "pom:dependency[pom:groupId ='javax.servlet']/pom:version" '${servlet-version}' modules/comet
+
+%pom_xpath_set "pom:dependency[pom:groupId ='com.sun.xml.ws']/pom:artifactId" rt extras/http-server-jaxws
+%pom_xpath_set "pom:dependency[pom:groupId ='com.sun.xml.ws']/pom:artifactId" rt samples/http-jaxws-samples
+
+# org.glassfish.grizzly.http.server.accesslog.ApacheLogFormatTest NoClassDefFoundError: Could not initialize class org.mockito.internal.creation.cglib.ClassImposterizer$3
+# org.glassfish.grizzly.http.server.accesslog.ApacheLogFormatTest IncompatibleClassChangeError: class net.sf.cglib.core.DebuggingClassWriter has interface org.objectweb.asm.ClassVisitor as super class
+# org.glassfish.grizzly.http.server.NIOOutputSinksTest java.util.concurrent.TimeoutException: null
+# org.glassfish.grizzly.http.server.ParametersTest java.util.concurrent.ExecutionException: java.net.UnknownHostException: buildvm-09.phx2.fedoraproject.org: buildvm-09.phx2.fedoraproject.org: unknown error
+# org.glassfish.grizzly.http.server.CLStaticHttpHandlerTest java.io.IOException: Resource index.html was not found
%build
@@ -193,8 +197,6 @@ modules/monitoring/http-server
%{_javadir}/%{name}/%{name}.jar
%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
-# config
-
%files samples -f .mfiles-samples
%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
@@ -202,6 +204,9 @@ modules/monitoring/http-server
%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
%changelog
+* Mon May 04 2015 gil cattaneo <puntogil at libero.it> 2.3.19-1
+- update to 2.3.19
+
* Tue Feb 03 2015 gil cattaneo <puntogil at libero.it> 2.3.6-3
- introduce license macro
@@ -253,4 +258,4 @@ modules/monitoring/http-server
- update to 2.2.19
* Wed Sep 19 2012 gil cattaneo <puntogil at libero.it> 2.2.18-1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index f1ee207..d2e4067 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-786da81ba53379146dcdb9057dfb91ec grizzly-2.3.6.tar.xz
+2d13a7fe7648959031d192cbcd5da894 2_3_19.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/grizzly.git/commit/?h=master&id=77a520d88cb6716e4da18f726b425262d9f446d4
More information about the scm-commits
mailing list