diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ecf915d..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/apache-cxf-*-src.tar.gz diff --git a/cxf-3.1.4-osgi-Dictionary.patch b/cxf-3.1.4-osgi-Dictionary.patch deleted file mode 100644 index 127af50..0000000 --- a/cxf-3.1.4-osgi-Dictionary.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nru apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java ---- apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java 2015-10-30 21:06:12.000000000 +0100 -+++ apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java 2016-08-08 18:08:51.049724693 +0200 -@@ -94,7 +94,7 @@ - Class serviceClass, - Object service, - String servicePid) { -- Properties props = new Properties(); -+ java.util.Dictionary props = new java.util.Hashtable(); - props.put(Constants.SERVICE_PID, servicePid); - return context.registerService(serviceClass.getName(), service, props); - } -diff -Nru apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java ---- apache-cxf-3.1.4-src/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java 2015-10-30 21:06:12.000000000 +0100 -+++ apache-cxf-3.1.4-src.osgi/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java 2016-08-08 18:08:51.057724307 +0200 -@@ -207,9 +207,9 @@ - private void registerBusAsService() { - BundleContext context = bus.getExtension(BundleContext.class); - if (context != null) { -- Properties props = new Properties(); -+ java.util.Dictionary props = new java.util.Hashtable(); - props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, context.getBundle().getSymbolicName()); -- props.put(CONTEXT_VERSION_PROPERTY, getBundleVersion(context.getBundle())); -+ props.put(CONTEXT_VERSION_PROPERTY, getBundleVersion(context.getBundle()).toString()); - props.put(CONTEXT_NAME_PROPERTY, bus.getId()); - - service = context.registerService(Bus.class.getName(), bus, props); -diff -Nru apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java ---- apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpServiceTrackerCust.java 2016-08-08 18:08:51.191717842 +0200 -@@ -64,7 +64,7 @@ - HttpService httpService = (HttpService)context.getService(reference); - Servlet servlet = new CXFNonSpringServlet(destinationRegistry, false); - servletExporter = new ServletExporter(servlet, httpService); -- Properties servProps = new Properties(); -+ java.util.Dictionary servProps = new java.util.Hashtable(); - servProps.put(Constants.SERVICE_PID, CXF_CONFIG_PID); - servletPublisherReg = context.registerService(ManagedService.class.getName(), - servletExporter, servProps); -diff -Nru apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java ---- apache-cxf-3.1.4-src/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.osgi/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java 2016-08-08 18:08:51.192717794 +0200 -@@ -79,7 +79,7 @@ - - private ServiceRegistration registerService(BundleContext context, Class serviceInterface, - Object serviceObject, String servicePid) { -- Properties servProps = new Properties(); -+ java.util.Dictionary servProps = new java.util.Hashtable(); - servProps.put(Constants.SERVICE_PID, servicePid); - return context.registerService(serviceInterface.getName(), serviceObject, servProps); - } -diff -Nru apache-cxf-3.1.4-src/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java apache-cxf-3.1.4-src.osgi/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java ---- apache-cxf-3.1.4-src/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.osgi/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java 2016-08-08 18:08:51.196717601 +0200 -@@ -72,7 +72,7 @@ - - public void start(BundleContext ctx) throws Exception { - this.context = ctx; -- Properties servProps = new Properties(); -+ java.util.Dictionary servProps = new java.util.Hashtable(); - servProps.put(Constants.SERVICE_PID, FACTORY_PID); - reg = context.registerService(ManagedServiceFactory.class.getName(), - this, servProps); diff --git a/cxf-3.1.4-port-to-ehcache-core-2.6.patch b/cxf-3.1.4-port-to-ehcache-core-2.6.patch deleted file mode 100644 index e9545a4..0000000 --- a/cxf-3.1.4-port-to-ehcache-core-2.6.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nru apache-cxf-3.1.4-src/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java apache-cxf-3.1.4-src.ehcache/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java ---- apache-cxf-3.1.4-src/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.ehcache/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java 2016-08-07 18:23:00.656311941 +0200 -@@ -145,7 +145,9 @@ - parsedTTL = 3600; - } - } -- Element element = new Element(id, id, parsedTTL, parsedTTL); -+ Element element = new Element(id, id); -+ element.setTimeToLive(parsedTTL); -+ element.setTimeToIdle(parsedTTL); - element.resetAccessStatistics(); - cache.put(element); - } -diff -Nru apache-cxf-3.1.4-src/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java apache-cxf-3.1.4-src.ehcache/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java ---- apache-cxf-3.1.4-src/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.ehcache/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java 2016-08-07 17:55:48.767169035 +0200 -@@ -100,17 +100,27 @@ - - public void add(SecurityToken token) { - if (token != null && !StringUtils.isEmpty(token.getId())) { -- Element element = new Element(token.getId(), token, getTTL(), getTTL()); -- element.resetAccessStatistics(); -- cache.put(element); -+ int parsedTTL = getTTL(); -+ if (parsedTTL > 0) { -+ Element element = new Element(token.getId(), token); -+ element.setTimeToLive(parsedTTL); -+ element.setTimeToIdle(parsedTTL); -+ element.resetAccessStatistics(); -+ cache.put(element); -+ } - } - } - - public void add(String identifier, SecurityToken token) { - if (token != null && !StringUtils.isEmpty(identifier)) { -- Element element = new Element(identifier, token, getTTL(), getTTL()); -- element.resetAccessStatistics(); -- cache.put(element); -+ int parsedTTL = getTTL(); -+ if (parsedTTL > 0) { -+ Element element = new Element(identifier, token); -+ element.setTimeToLive(parsedTTL); -+ element.setTimeToIdle(parsedTTL); -+ element.resetAccessStatistics(); -+ cache.put(element); -+ } - } - } - -diff -Nru apache-cxf-3.1.4-src/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java apache-cxf-3.1.4-src.ehcache/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java ---- apache-cxf-3.1.4-src/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.ehcache/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java 2016-08-07 20:10:19.854275957 +0200 -@@ -108,7 +108,7 @@ - * Store an XKMSCacheToken in the Cache using the given key - */ - public void put(String key, XKMSCacheToken cacheToken) { -- cache.put(new Element(key, cacheToken, false)); -+ cache.put(new Element(key, cacheToken)); - } - - /** diff --git a/cxf-3.1.4-port-to-servlet-3.1.patch b/cxf-3.1.4-port-to-servlet-3.1.patch deleted file mode 100644 index 299d915..0000000 --- a/cxf-3.1.4-port-to-servlet-3.1.patch +++ /dev/null @@ -1,461 +0,0 @@ -diff -Nru apache-cxf-3.1.4-src/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java apache-cxf-3.1.4-src.servlet/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java ---- apache-cxf-3.1.4-src/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java 2015-10-30 21:06:12.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java 2016-08-07 15:52:13.392520804 +0200 -@@ -46,6 +46,7 @@ - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.servlet.http.HttpSession; -+import javax.servlet.http.HttpUpgradeHandler; - import javax.servlet.http.Part; - import javax.xml.ws.spi.http.HttpContext; - import javax.xml.ws.spi.http.HttpExchange; -@@ -410,5 +411,36 @@ - public int read() throws IOException { - return delegate.read(); - } -+ -+ @Override -+ public void setReadListener(javax.servlet.ReadListener listener) { -+ throw new UnsupportedOperationException("Not implemented yet."); -+ } -+ -+ @Override -+ public boolean isReady() { -+ return false; -+ } -+ -+ @Override -+ public boolean isFinished() { -+ return false; -+ } -+ } -+ -+ @Override -+ public T upgrade(Class arg0) throws IOException, ServletException { -+ throw new UnsupportedOperationException("Not implemented yet"); -+ } -+ -+ @Override -+ public String changeSessionId() { -+ throw new UnsupportedOperationException("Not implemented yet"); -+ } -+ -+ @Override -+ public long getContentLengthLong() { -+ throw new UnsupportedOperationException("Not implemented yet"); - } -+ - } -diff -Nru apache-cxf-3.1.4-src/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java apache-cxf-3.1.4-src.servlet/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java ---- apache-cxf-3.1.4-src/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java 2015-10-30 21:06:12.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java 2016-08-07 15:50:27.661576212 +0200 -@@ -241,5 +241,21 @@ - public void flush() throws IOException { - delegate.flush(); - } -+ -+ @Override -+ public void setWriteListener(javax.servlet.WriteListener listener) { -+ throw new UnsupportedOperationException("Not implemented yet."); -+ } -+ -+ @Override -+ public boolean isReady() { -+ return false; -+ } -+ } -+ -+ @Override -+ public void setContentLengthLong(long arg0) { -+ throw new UnsupportedOperationException("Not implemented yet."); - } -+ - } -diff -Nru apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java ---- apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java 2016-08-08 16:39:56.888713901 +0200 -@@ -23,6 +23,7 @@ - import java.io.IOException; - import java.io.InputStreamReader; - import java.io.UnsupportedEncodingException; -+import java.lang.IllegalStateException; - import java.net.InetSocketAddress; - import java.security.Principal; - import java.util.ArrayList; -@@ -36,13 +37,24 @@ - - import javax.net.ssl.SSLPeerUnverifiedException; - import javax.net.ssl.SSLSession; -+ -+import javax.servlet.AsyncContext; -+import javax.servlet.DispatcherType; - import javax.servlet.RequestDispatcher; -+import javax.servlet.ServletContext; -+import javax.servlet.ServletException; - import javax.servlet.ServletInputStream; -+import javax.servlet.ServletRequest; -+import javax.servlet.ServletResponse; - import javax.servlet.http.Cookie; - import javax.servlet.http.HttpServletRequest; -+import javax.servlet.http.HttpServletResponse; - import javax.servlet.http.HttpSession; -+import javax.servlet.http.HttpUpgradeHandler; -+import javax.servlet.http.Part; - - import org.apache.cxf.transport.http.netty.server.util.Utils; -+ - import io.netty.channel.ChannelHandlerContext; - import io.netty.handler.codec.http.CookieDecoder; - import io.netty.handler.codec.http.HttpContent; -@@ -472,4 +484,80 @@ - throw new IllegalStateException( - "Method 'getRequestDispatcher' not yet implemented!"); - } -+ -+ @Override -+ public Part getPart(String name) throws IOException, IllegalStateException, ServletException { -+ throw new UnsupportedOperationException("Method 'getPart' not supported."); -+ } -+ -+ @Override -+ public Collection getParts() throws IOException, IllegalStateException, ServletException { -+ throw new UnsupportedOperationException("Method 'getParts' not supported."); -+ } -+ -+ @Override -+ public void logout() throws ServletException { -+ throw new UnsupportedOperationException("Method 'logout' not supported."); -+ } -+ -+ @Override -+ public void login(String username, String password) throws ServletException { -+ throw new UnsupportedOperationException("Method 'login' not supported."); -+ } -+ -+ @Override -+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { -+ throw new UnsupportedOperationException("Method 'authenticate' not supported."); -+ } -+ -+ @Override -+ public DispatcherType getDispatcherType() { -+ throw new UnsupportedOperationException("Method 'getDispatcherType' not supported."); -+ } -+ -+ @Override -+ public AsyncContext getAsyncContext() { -+ throw new UnsupportedOperationException("Method 'getAsyncContext' not supported."); -+ } -+ -+ @Override -+ public boolean isAsyncSupported() { -+ throw new UnsupportedOperationException("Method 'isAsyncSupported' not supported."); -+ } -+ -+ @Override -+ public boolean isAsyncStarted() { -+ throw new UnsupportedOperationException("Method 'isAsyncStarted' not supported."); -+ } -+ -+ @Override -+ public AsyncContext startAsync() { -+ throw new UnsupportedOperationException("Method 'startAsync' not supported."); -+ } -+ -+ @Override -+ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) { -+ throw new UnsupportedOperationException("Method 'startAsync2' not supported."); -+ } -+ -+ @Override -+ public ServletContext getServletContext() { -+ throw new UnsupportedOperationException("Method 'getServletContext' not supported."); -+ } -+ -+ @Override -+ public T upgrade(Class arg0) throws IOException, ServletException { -+ throw new UnsupportedOperationException("Method 'upgrade' not implemented yet"); -+ } -+ -+ @Override -+ public String changeSessionId() { -+ throw new UnsupportedOperationException("Method 'changeSessionId' not implemented yet"); -+ } -+ -+ @Override -+ public long getContentLengthLong() { -+ throw new UnsupportedOperationException("Method 'getContentLengthLong' not implemented yet"); -+ } -+ - } -diff -Nru apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java ---- apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java 2016-08-08 17:01:41.303227882 +0200 -@@ -21,19 +21,35 @@ - - - import java.io.InputStream; -+ -+import java.lang.Class; -+import java.lang.ClassLoader; -+import java.lang.IllegalArgumentException; -+import java.lang.IllegalStateException; -+import java.lang.UnsupportedOperationException; -+ - import java.net.MalformedURLException; - import java.net.URL; -+ - import java.util.Enumeration; -+import java.util.EventListener; - import java.util.HashMap; - import java.util.Map; - import java.util.Set; - import java.util.logging.Level; - import java.util.logging.Logger; - -+import javax.servlet.Filter; -+import javax.servlet.FilterRegistration; -+import javax.servlet.FilterRegistration.Dynamic; - import javax.servlet.RequestDispatcher; - import javax.servlet.Servlet; - import javax.servlet.ServletContext; - import javax.servlet.ServletException; -+import javax.servlet.ServletRegistration; -+import javax.servlet.SessionCookieConfig; -+import javax.servlet.SessionTrackingMode; -+import javax.servlet.descriptor.JspConfigDescriptor; - - import org.apache.cxf.common.logging.LogUtils; - import org.apache.cxf.transport.http.netty.server.util.Utils; -@@ -212,4 +228,140 @@ - throw new IllegalStateException( - "Method 'getRequestDispatcher' not yet implemented!"); - } -+ -+ @Override -+ public JspConfigDescriptor getJspConfigDescriptor() { -+ throw new UnsupportedOperationException("Method 'getJspConfigDescriptor' not supported."); -+ } -+ -+ @Override -+ public ClassLoader getClassLoader() { -+ throw new UnsupportedOperationException("Method 'getClassLoader' not supported."); -+ } -+ -+ @Override -+ public void declareRoles(String... roleNames) { -+ throw new UnsupportedOperationException("Method 'declareRoles' not supported."); -+ } -+ -+ @Override -+ public T createListener(Class c) throws ServletException { -+ throw new UnsupportedOperationException("Method 'createListener' not supported."); -+ } -+ -+ @Override -+ public void addListener(T t) { -+ throw new UnsupportedOperationException("Method 'addListener' not supported."); -+ } -+ -+ @Override -+ public void addListener(String className) { -+ throw new UnsupportedOperationException("Method 'addListener2' not supported."); -+ } -+ -+ @Override -+ public void addListener(Class listenerClass) { -+ throw new UnsupportedOperationException("Method 'addListener3' not supported."); -+ } -+ -+ @Override -+ public Set getEffectiveSessionTrackingModes() { -+ throw new UnsupportedOperationException("Method 'getEffectiveSessionTrackingModes' not supported."); -+ } -+ -+ @Override -+ public Set getDefaultSessionTrackingModes() { -+ throw new UnsupportedOperationException("Method 'getDefaultSessionTrackingModes' not supported."); -+ } -+ -+ @Override -+ public void setSessionTrackingModes(Set sessionTrackingModes) -+ throws IllegalStateException, IllegalArgumentException { -+ throw new UnsupportedOperationException("Method 'setSessionTrackingModes' not supported."); -+ } -+ -+ @Override -+ public SessionCookieConfig getSessionCookieConfig() { -+ throw new UnsupportedOperationException("Method 'getSessionCookieConfig' not supported."); -+ } -+ -+ @Override -+ public Map getFilterRegistrations() { -+ throw new UnsupportedOperationException("Method 'getFilterRegistrations' not supported."); -+ } -+ -+ @Override -+ public FilterRegistration getFilterRegistration(String filterName) { -+ throw new UnsupportedOperationException("Method 'getFilterRegistration' not supported."); -+ } -+ -+ @Override -+ public T createFilter(Class c) throws ServletException { -+ throw new UnsupportedOperationException("Method 'createFilter' not supported."); -+ } -+ -+ @Override -+ public FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { -+ throw new UnsupportedOperationException("Method 'addFilter' not supported."); -+ } -+ -+ @Override -+ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { -+ throw new UnsupportedOperationException("Method 'addFilter2' not supported."); -+ } -+ -+ @Override -+ public FilterRegistration.Dynamic addFilter(String filterName, String className) { -+ throw new UnsupportedOperationException("Method 'addFilter3' not supported."); -+ } -+ -+ @Override -+ public Map getServletRegistrations() { -+ throw new UnsupportedOperationException("Method 'getServletRegistrations' not supported."); -+ } -+ -+ @Override -+ public ServletRegistration getServletRegistration(String servletName) { -+ throw new UnsupportedOperationException("Method 'getServletRegistration' not supported."); -+ } -+ -+ @Override -+ public T createServlet(Class c) throws ServletException { -+ throw new UnsupportedOperationException("Method 'createServlet' not supported."); -+ } -+ -+ @Override -+ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { -+ throw new UnsupportedOperationException("Method 'addServlet' not supported."); -+ } -+ -+ @Override -+ public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { -+ throw new UnsupportedOperationException("Method 'addServlet2' not supported."); -+ } -+ -+ @Override -+ public ServletRegistration.Dynamic addServlet(String servletName, String className) { -+ throw new UnsupportedOperationException("Method 'addServlet3' not supported."); -+ } -+ -+ @Override -+ public boolean setInitParameter(String name, String value) { -+ throw new UnsupportedOperationException("Method 'setInitParameter' not supported."); -+ } -+ -+ @Override -+ public int getEffectiveMinorVersion() { -+ throw new UnsupportedOperationException("Method 'getEffectiveMinorVersion' not supported."); -+ } -+ -+ @Override -+ public int getEffectiveMajorVersion() { -+ throw new UnsupportedOperationException("Method 'getEffectiveMajorVersion' not supported."); -+ } -+ -+ @Override -+ public String getVirtualServerName() { -+ throw new UnsupportedOperationException("Method 'getVirtualServerName' not implemented yet."); -+ } - } -diff -Nru apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletInputStream.java apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletInputStream.java ---- apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletInputStream.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletInputStream.java 2016-08-08 16:14:10.767516387 +0200 -@@ -57,5 +57,20 @@ - // we need to release the ByteBufInputStream - byteBuf.release(); - } -- -+ -+ @Override -+ public void setReadListener(javax.servlet.ReadListener listener) { -+ throw new UnsupportedOperationException("Method 'setReadListener' not implemented yet."); -+ } -+ -+ @Override -+ public boolean isReady() { -+ return false; -+ } -+ -+ @Override -+ public boolean isFinished() { -+ return false; -+ } -+ - } -diff -Nru apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletOutputStream.java apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletOutputStream.java ---- apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletOutputStream.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletOutputStream.java 2016-08-08 16:13:20.991935313 +0200 -@@ -68,6 +68,15 @@ - public int getBufferSize() { - return this.out.buffer().capacity(); - } -- -- -+ -+ @Override -+ public void setWriteListener(javax.servlet.WriteListener listener) { -+ throw new UnsupportedOperationException("Method 'setWriteListener' not implemented yet."); -+ } -+ -+ @Override -+ public boolean isReady() { -+ return false; -+ } -+ - } -diff -Nru apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java ---- apache-cxf-3.1.4-src/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java 2015-10-30 21:06:13.000000000 +0100 -+++ apache-cxf-3.1.4-src.servlet/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java 2016-08-08 17:02:42.268258441 +0200 -@@ -23,8 +23,10 @@ - import java.io.PrintWriter; - import java.io.UnsupportedEncodingException; - import java.net.URLEncoder; -+import java.util.Collection; - import java.util.Locale; - -+import javax.servlet.ServletException; - import javax.servlet.ServletOutputStream; - import javax.servlet.http.HttpServletResponse; - -@@ -232,4 +234,30 @@ - "Method 'setLocale' not yet implemented!"); - - } -+ -+ @Override -+ public String getHeader(String name) { -+ throw new UnsupportedOperationException("Method 'getHeader' not supported."); -+ } -+ -+ @Override -+ public Collection getHeaderNames() { -+ throw new UnsupportedOperationException("Method 'getHeaderNames' not implemented yet."); -+ } -+ -+ @Override -+ public Collection getHeaders(String name) { -+ throw new UnsupportedOperationException("Method 'getHeaders' not supported."); -+ } -+ -+ @Override -+ public int getStatus() { -+ throw new UnsupportedOperationException("Method 'getStatus' not supported."); -+ } -+ -+ @Override -+ public void setContentLengthLong(long arg0) { -+ throw new UnsupportedOperationException("Method 'setContentLengthLong' not supported."); -+ } -+ - } diff --git a/cxf-3.1.6-CVE-2016-6812.patch b/cxf-3.1.6-CVE-2016-6812.patch deleted file mode 100644 index 2b0bd06..0000000 --- a/cxf-3.1.6-CVE-2016-6812.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nru apache-cxf-3.1.6-src/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java apache-cxf-3.1.6-src.CVE-2016-6812/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java ---- apache-cxf-3.1.6-src/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2016-6812/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/BaseUrlHelper.java 2016-12-21 16:20:17.119337970 +0100 -@@ -36,9 +36,8 @@ - */ - public static String getBaseURL(HttpServletRequest request) { - String reqPrefix = request.getRequestURL().toString(); -- String pathInfo = request.getPathInfo() == null ? "" : request.getPathInfo(); -- //fix for CXF-898 -- if (!"/".equals(pathInfo) || reqPrefix.endsWith("/")) { -+ String pathInfo = request.getPathInfo(); -+ if (!"/".equals(pathInfo) || reqPrefix.contains(";")) { - StringBuilder sb = new StringBuilder(); - // request.getScheme(), request.getLocalName() and request.getLocalPort() - // should be marginally cheaper - provided request.getLocalName() does -@@ -47,8 +46,15 @@ - - URI uri = URI.create(reqPrefix); - sb.append(uri.getScheme()).append("://").append(uri.getRawAuthority()); -- sb.append(request.getContextPath()).append(request.getServletPath()); -- -+ String contextPath = request.getContextPath(); -+ if (contextPath != null) { -+ sb.append(contextPath); -+ } -+ String servletPath = request.getServletPath(); -+ if (servletPath != null) { -+ sb.append(servletPath); -+ } -+ - reqPrefix = sb.toString(); - } - return reqPrefix; -diff -Nru apache-cxf-3.1.6-src/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java apache-cxf-3.1.6-src.CVE-2016-6812/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java ---- apache-cxf-3.1.6-src/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2016-6812/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java 2016-12-21 16:27:24.088369796 +0100 -@@ -129,7 +129,11 @@ - return null; - } - } else { -- return basePath + endpointAddress; -+ String address = basePath; -+ if (address.endsWith("/") && endpointAddress.startsWith("/")) { -+ address = address.substring(0, address.length() - 1); -+ } -+ return address + endpointAddress; - } - } - -diff -Nru apache-cxf-3.1.6-src/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java apache-cxf-3.1.6-src.CVE-2016-6812/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java ---- apache-cxf-3.1.6-src/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2016-6812/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java 2016-12-21 16:25:17.063781834 +0100 -@@ -111,9 +111,25 @@ - String styleSheetPath; - if (serviceListStyleSheet != null) { - styleSheetPath = request.getContextPath() + "/" + serviceListStyleSheet; -- - } else { -- styleSheetPath = request.getRequestURI() + "/?stylesheet=1"; -+ styleSheetPath = ""; -+ String contextPath = request.getContextPath(); -+ if (contextPath != null) { -+ styleSheetPath += contextPath; -+ } -+ String servletPath = request.getServletPath(); -+ if (servletPath != null) { -+ styleSheetPath += servletPath; -+ } -+ String pathInfo = request.getPathInfo(); -+ if (pathInfo != null) { -+ styleSheetPath += pathInfo; -+ } -+ -+ if (!styleSheetPath.endsWith("/")) { -+ styleSheetPath += "/"; -+ } -+ styleSheetPath += "?stylesheet=1"; - } - serviceListWriter = - new FormattedServiceListWriter(styleSheetPath, title, showForeignContexts, atomMap); diff --git a/cxf-3.1.6-CVE-2016-8739.patch b/cxf-3.1.6-CVE-2016-8739.patch deleted file mode 100644 index d15622a..0000000 --- a/cxf-3.1.6-CVE-2016-8739.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -Nru apache-cxf-3.1.6-src/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java apache-cxf-3.1.6-src.CVE-2016-8739/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java ---- apache-cxf-3.1.6-src/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2016-8739/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java 2016-12-21 16:35:46.840033631 +0100 -@@ -30,6 +30,7 @@ - import javax.ws.rs.core.MultivaluedMap; - import javax.ws.rs.ext.MessageBodyReader; - import javax.ws.rs.ext.MessageBodyWriter; -+import javax.xml.stream.XMLStreamReader; - - import org.apache.abdera.Abdera; - import org.apache.abdera.model.Document; -@@ -39,6 +40,7 @@ - import org.apache.abdera.writer.Writer; - import org.apache.cxf.common.logging.LogUtils; - import org.apache.cxf.jaxrs.utils.ExceptionUtils; -+import org.apache.cxf.staxutils.StaxUtils; - - public abstract class AbstractAtomProvider - implements MessageBodyWriter, MessageBodyReader { -@@ -91,7 +93,8 @@ - options.setAutodetectCharset(autodetectCharset); - } - } -- Document doc = parser.parse(is); -+ XMLStreamReader reader = StaxUtils.createXMLStreamReader(is); -+ Document doc = parser.parse(reader); - return doc.getRoot(); - } - -diff -Nru apache-cxf-3.1.6-src/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java apache-cxf-3.1.6-src.CVE-2016-8739/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java ---- apache-cxf-3.1.6-src/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2016-8739/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java 2016-12-21 16:38:22.312961598 +0100 -@@ -146,7 +146,26 @@ - assertEquals("a", book.getName()); - } - -- -+ @Test -+ public void testReadEntryNoBuilders2() throws Exception { -+ final String entry = -+ "" -+ + "a" -+ + "" -+ + "" -+ + "a" -+ + "" -+ + "" -+ + ""; -+ AtomPojoProvider provider = new AtomPojoProvider(); -+ ByteArrayInputStream bis = new ByteArrayInputStream(entry.getBytes()); -+ MediaType mt = MediaType.valueOf("application/atom+xml;type=entry"); -+ @SuppressWarnings({"unchecked", "rawtypes" }) -+ Book book = (Book)provider.readFrom((Class)Book.class, Book.class, -+ new Annotation[]{}, mt, null, bis); -+ assertEquals("a", book.getName()); -+ } -+ - @Test - public void testReadFeedWithBuilders() throws Exception { - AtomPojoProvider provider = (AtomPojoProvider)ctx.getBean("atom4"); -@@ -178,7 +197,26 @@ - assertTrue("a".equals(list.get(0).getName()) || "a".equals(list.get(1).getName())); - assertTrue("b".equals(list.get(0).getName()) || "b".equals(list.get(1).getName())); - } -- -+ -+ @Test -+ public void testReadFeedWithoutBuilders2() throws Exception { -+ AtomPojoProvider provider = new AtomPojoProvider(); -+ final String feed = -+ "" -+ + "a" -+ + "b" -+ + ""; -+ MediaType mt = MediaType.valueOf("application/atom+xml;type=feed"); -+ ByteArrayInputStream bis = new ByteArrayInputStream(feed.getBytes()); -+ @SuppressWarnings({"unchecked", "rawtypes" }) -+ Books books2 = (Books)provider.readFrom((Class)Books.class, Books.class, -+ new Annotation[]{}, mt, null, bis); -+ List list = books2.getBooks(); -+ assertEquals(2, list.size()); -+ assertTrue("a".equals(list.get(0).getName()) || "a".equals(list.get(1).getName())); -+ assertTrue("b".equals(list.get(0).getName()) || "b".equals(list.get(1).getName())); -+ } -+ - @Test - public void testReadEntryNoContent() throws Exception { - /** A sample entry without content. */ diff --git a/cxf-3.1.6-CVE-2017-3156.patch b/cxf-3.1.6-CVE-2017-3156.patch deleted file mode 100644 index 545e103..0000000 --- a/cxf-3.1.6-CVE-2017-3156.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Nru apache-cxf-3.1.6-src/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweDecryption.java apache-cxf-3.1.6-src.CVE-2017-3156/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweDecryption.java ---- apache-cxf-3.1.6-src/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweDecryption.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2017-3156/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweDecryption.java 2017-02-21 15:05:36.592147135 +0100 -@@ -18,8 +18,8 @@ - */ - package org.apache.cxf.rs.security.jose.jwe; - -+import java.security.MessageDigest; - import java.security.spec.AlgorithmParameterSpec; --import java.util.Arrays; - - import javax.crypto.spec.IvParameterSpec; - -@@ -56,7 +56,7 @@ - jweDecryptionInput.getDecodedJsonHeaders()); - macState.mac.update(jweDecryptionInput.getEncryptedContent()); - byte[] expectedAuthTag = AesCbcHmacJweEncryption.signAndGetTag(macState); -- if (!Arrays.equals(actualAuthTag, expectedAuthTag)) { -+ if (!MessageDigest.isEqual(actualAuthTag, expectedAuthTag)) { - LOG.warning("Invalid authentication tag"); - throw new JweException(JweException.Error.CONTENT_DECRYPTION_FAILURE); - } -diff -Nru apache-cxf-3.1.6-src/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/HmacJwsSignatureVerifier.java apache-cxf-3.1.6-src.CVE-2017-3156/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/HmacJwsSignatureVerifier.java ---- apache-cxf-3.1.6-src/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/HmacJwsSignatureVerifier.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2017-3156/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/HmacJwsSignatureVerifier.java 2017-02-21 15:06:58.575529958 +0100 -@@ -18,8 +18,8 @@ - */ - package org.apache.cxf.rs.security.jose.jws; - -+import java.security.MessageDigest; - import java.security.spec.AlgorithmParameterSpec; --import java.util.Arrays; - import java.util.logging.Logger; - - import org.apache.cxf.common.logging.LogUtils; -@@ -53,7 +53,7 @@ - @Override - public boolean verify(JwsHeaders headers, String unsignedText, byte[] signature) { - byte[] expected = computeMac(headers, unsignedText); -- return Arrays.equals(expected, signature); -+ return MessageDigest.isEqual(expected, signature); - } - - private byte[] computeMac(JwsHeaders headers, String text) { -diff -Nru apache-cxf-3.1.6-src/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java apache-cxf-3.1.6-src.CVE-2017-3156/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java ---- apache-cxf-3.1.6-src/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java 2016-03-23 18:30:27.000000000 +0100 -+++ apache-cxf-3.1.6-src.CVE-2017-3156/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java 2017-02-21 15:08:55.035971085 +0100 -@@ -19,7 +19,7 @@ - package org.apache.cxf.rs.security.oauth2.tokens.hawk; - - import java.net.URI; --import java.util.Arrays; -+import java.security.MessageDigest; - import java.util.Collections; - import java.util.HashMap; - import java.util.List; -@@ -78,7 +78,7 @@ - - String clientMacString = schemeParams.get(OAuthConstants.HAWK_TOKEN_SIGNATURE); - byte[] clientMacData = Base64Utility.decode(clientMacString); -- boolean validMac = Arrays.equals(serverMacData, clientMacData); -+ boolean validMac = MessageDigest.isEqual(serverMacData, clientMacData); - if (!validMac) { - AuthorizationUtils.throwAuthorizationFailure(Collections - .singleton(OAuthConstants.HAWK_AUTHORIZATION_SCHEME)); diff --git a/cxf.spec b/cxf.spec deleted file mode 100644 index 59a5208..0000000 --- a/cxf.spec +++ /dev/null @@ -1,523 +0,0 @@ -%global tarname apache-%{name}-%{version}-src - -%bcond_with jetty - -Name: cxf -Epoch: 1 -Version: 3.1.6 -Release: 11%{?dist} -Summary: Apache CXF -License: ASL 2.0 -URL: http://cxf.apache.org/ -Source0: http://www.apache.org/dist/cxf/%{version}/%{tarname}.tar.gz - -Patch0: cxf-3.1.4-port-to-servlet-3.1.patch -Patch1: cxf-3.1.4-port-to-ehcache-core-2.6.patch -Patch2: cxf-3.1.4-osgi-Dictionary.patch - -Patch3: cxf-3.1.6-CVE-2016-6812.patch -Patch4: cxf-3.1.6-CVE-2016-8739.patch -Patch5: cxf-3.1.6-CVE-2017-3156.patch - -BuildRequires: maven-local -BuildRequires: mvn(antlr:antlr) -BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(ch.qos.logback:logback-classic) -BuildRequires: mvn(com.sun.mail:javax.mail) -BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(io.dropwizard.metrics:metrics-core) -BuildRequires: mvn(io.netty:netty-all) -BuildRequires: mvn(io.swagger:swagger-jaxrs) >= 1.5.8 -BuildRequires: mvn(javax.annotation:javax.annotation-api) -BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(javax.validation:validation-api) -BuildRequires: mvn(javax.ws.rs:javax.ws.rs-api) -BuildRequires: mvn(jdom:jdom) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(net.java.dev.msv:msv-core) -BuildRequires: mvn(net.oauth.core:oauth-provider) -BuildRequires: mvn(net.sf.cglib:cglib) -# ehcache:2.9.0 -BuildRequires: mvn(net.sf.ehcache:ehcache-core) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.aries.blueprint:blueprint-parser) >= 1.3.1 -BuildRequires: mvn(org.apache.aries.blueprint:org.apache.aries.blueprint.api) >= 1.0.0 -BuildRequires: mvn(org.apache.aries.blueprint:org.apache.aries.blueprint.core) >= 1.0.0 -BuildRequires: mvn(org.apache.commons:commons-jexl) -BuildRequires: mvn(org.apache.cxf:cxf-xjc-plugin) -BuildRequires: mvn(org.apache.cxf.build-utils:cxf-buildtools) -BuildRequires: mvn(org.apache.cxf.build-utils:cxf-xml2fastinfoset-plugin) -BuildRequires: mvn(org.apache.cxf.xjcplugins:cxf-xjc-dv) -BuildRequires: mvn(org.apache.cxf.xjcplugins:cxf-xjc-javadoc) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jcache_1.0_spec) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec) -BuildRequires: mvn(org.apache.httpcomponents:httpcore-nio) -BuildRequires: mvn(org.apache.httpcomponents:httpasyncclient) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-compat) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.shared:maven-artifact-resolver) -BuildRequires: mvn(org.apache.mina:mina-core) -BuildRequires: mvn(org.apache.neethi:neethi) -BuildRequires: mvn(org.apache.velocity:velocity) -BuildRequires: mvn(org.apache.ws.xmlschema:xmlschema-core) >= 2.2.1 -BuildRequires: mvn(org.apache.wss4j:wss4j-policy) >= 2.1.5 -BuildRequires: mvn(org.apache.wss4j:wss4j-ws-security-common) >= 2.1.5 -BuildRequires: mvn(org.apache.wss4j:wss4j-ws-security-dom) >= 2.1.5 -BuildRequires: mvn(org.apache.wss4j:wss4j-ws-security-policy-stax) >= 2.1.5 -BuildRequires: mvn(org.apache.wss4j:wss4j-ws-security-stax) >= 2.1.5 -BuildRequires: mvn(org.apache.xmlbeans:xmlbeans) -BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(org.eclipse.gemini.blueprint:gemini-blueprint-core) -BuildRequires: mvn(org.eclipse.gemini.blueprint:gemini-blueprint-io) -%if %{with jetty} -BuildRequires: mvn(org.eclipse.jetty:jetty-continuation) -BuildRequires: mvn(org.eclipse.jetty:jetty-http) -BuildRequires: mvn(org.eclipse.jetty:jetty-io) -BuildRequires: mvn(org.eclipse.jetty:jetty-jmx) -BuildRequires: mvn(org.eclipse.jetty:jetty-security) -BuildRequires: mvn(org.eclipse.jetty:jetty-server) -BuildRequires: mvn(org.eclipse.jetty:jetty-util) -%endif -BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi) -BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi.services) -BuildRequires: mvn(org.eclipse.tycho:tycho-packaging-plugin) -BuildRequires: mvn(org.glassfish.jaxb:jaxb-core) -BuildRequires: mvn(org.glassfish.jaxb:jaxb-runtime) -BuildRequires: mvn(org.glassfish.jaxb:jaxb-xjc) -BuildRequires: mvn(org.glassfish.jaxb:txw2) -BuildRequires: mvn(org.jboss:jandex) -BuildRequires: mvn(org.jboss.jandex:jandex-maven-plugin) -BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec) -BuildRequires: mvn(org.jibx:jibx-bind) -BuildRequires: mvn(org.jibx:jibx-run) -BuildRequires: mvn(org.jibx:jibx-schema) -BuildRequires: mvn(org.jibx:jibx-tools) -BuildRequires: mvn(org.jvnet.jaxb2_commons:jaxb2-basics) -BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.slf4j:jcl-over-slf4j) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -# springframework:4.1.9.RELEASE https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=1363923 -BuildRequires: mvn(org.springframework:spring-aop) -BuildRequires: mvn(org.springframework:spring-beans) -BuildRequires: mvn(org.springframework:spring-context) -BuildRequires: mvn(org.springframework:spring-core) -BuildRequires: mvn(org.springframework:spring-web) -BuildRequires: mvn(org.springframework:spring-webmvc) -BuildRequires: mvn(org.springframework.ldap:spring-ldap-core) -BuildRequires: mvn(rhino:js) -BuildRequires: mvn(wsdl4j:wsdl4j) -BuildRequires: mvn(xerces:xercesImpl) -BuildRequires: mvn(xml-resolver:xml-resolver) -BuildRequires: mvn(org.apache:apache-jar-resource-bundle) -# No more available -Obsoletes: %{name}-api < %{version}-%{release} - -BuildArch: noarch - -%description -Apache CXF is an open-source services framework that aids in -the development of services using front-end programming APIs, -like JAX-WS and JAX-RS. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%package maven-plugins -Summary: Apache CXF Maven Plugins - -%description maven-plugins -Maven plugins required for building or testing Apache CXF. - -%package rt -Summary: Apache CXF Runtime - -%description rt -This package contains core feature set of Apache CXF; -web service standards support, frontends, and protocols -support. - -%package services -Summary: Apache CXF Services - -%description services -This package contains Apache CXF WSN services. - -%package tools -Summary: Apache CXF Tools - -%description tools -Apache CXF Command Line Tools. - -%prep -%setup -q -n %{tarname} -find . -name "*.jar" -print -delete -find . -name "*.class" -print -delete - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 - -# Disable main modules -# No ant-trax -%pom_disable_module "testutils" -%pom_disable_module "integration" - -%pom_disable_module "osgi" -%pom_disable_module "bundle" osgi -%pom_disable_module "itests" osgi -%pom_disable_module "itests-felix" osgi -%pom_disable_module "karaf" osgi - -%pom_disable_module "systests" -# Test dependency -%pom_disable_module "systests" services/sts -%pom_disable_module "test" tools/wsdlto -%pom_disable_module "javascript-tests" rt/javascript - -# Unnecessary -%pom_disable_module "sts-war" services/sts -%pom_disable_module "xkms-war" services/xkms -%pom_disable_module "archetypes" maven-plugins -%pom_disable_module "xkms-features" services/xkms -%pom_disable_module "xkms-osgi" services/xkms -%pom_disable_module "xkms-itests" services/xkms - -# org.atmosphere:atmosphere-runtime:2.3.5 -# com.ning:async-http-client:1.9.8 2014-05-05: Retired -%pom_disable_module "websocket" rt/transports - -# org.apache.tuscany.sdo:tuscany-sdo-impl,tuscany-sdo-tools:1.1.1 2016/05/28 - Apache Tuscany has been retired. -%pom_disable_module "sdo" rt/databinding - -# org.apache.abdera:abdera-core,abdera-parser,abdera-extensions-json:1.1.3 -%pom_disable_module "extensions/providers" rt/rs - -# org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.0 -# org.apache.olingo:olingo-odata2-core:1.2.0 -# org.apache.hbase:hbase-client:1.1.1 2015-10-13: Retired -%pom_disable_module "extensions/search" rt/rs - -# com.google.gwt:gwt-servlet,gwt-user:2.7.0,com.google.gwt.inject:gin:2.1.2,org.codehaus.mojo:gwt-maven-plugin:2.7.0 -%pom_disable_module "management-web" rt - -# org.apache.activemq:activemq-broker:5.12.0 -# https://bugzilla.redhat.com/show_bug.cgi?id=998251 -%pom_disable_module "wsn-core" services/wsn - -%pom_disable_module "wsn-osgi" services/wsn - -%if %{without jetty} -# Do not support jetty 9.4.0 -%pom_disable_module "http-jetty" rt/transports -%endif - -%pom_remove_plugin -r :maven-pmd-plugin -%pom_remove_plugin -r :maven-checkstyle-plugin -# com.googlecode.maven-download-plugin:download-maven-plugin:1.2.0 https://publicsuffix.org/list/effective_tld_names.dat -%pom_remove_plugin -r :download-maven-plugin - -# used only for generate test stuff -%pom_remove_plugin -r org.codehaus.mojo:xmlbeans-maven-plugin - -%pom_remove_dep -r :ant-nodeps - -%pom_xpath_set pom:properties/pom:cxf.servlet-api.group javax.servlet parent -%pom_xpath_set pom:properties/pom:cxf.servlet-api.artifact javax.servlet-api parent -%pom_xpath_set pom:properties/pom:cxf.servlet-api-2.5.artifact javax.servlet-api parent - -%pom_change_dep -r :geronimo-j2ee-connector_1.5_spec org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec:1.0.1.Final -%pom_change_dep -r :geronimo-javamail_1.4_spec com.sun.mail:javax.mail:1.5.2 - -%pom_change_dep -r org.springframework.osgi:spring-osgi-io org.eclipse.gemini.blueprint:gemini-blueprint-io:1.0.2.RELEASE -%pom_change_dep -r org.springframework.osgi:spring-osgi-core org.eclipse.gemini.blueprint:gemini-blueprint-core:1.0.2.RELEASE -sed -i "s|org.springframework.osgi|org.eclipse.gemini.blueprint|" \ - core/src/main/java/org/apache/cxf/common/util/SpringOsgiUtil.java - -# Remove deprecated httpclient annotations -sed -i '/ThreadSafe/d' \ - rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java \ - rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java - -%pom_change_dep -r :org.osgi.core org.eclipse.osgi:org.eclipse.osgi:3.11.0.v20160714-1000 -%pom_change_dep -r :org.osgi.compendium org.eclipse.osgi:org.eclipse.osgi.services:3.5.100.v20160714-1000 - -%pom_change_dep -r com.sun.xml.bind:jaxb-core org.glassfish.jaxb:jaxb-core:2.2.11 -%pom_change_dep -r com.sun.xml.bind:jaxb-impl org.glassfish.jaxb:jaxb-runtime:2.2.11 -%pom_change_dep -r com.sun.xml.bind:jaxb-xjc org.glassfish.jaxb:jaxb-xjc:2.2.11 - -%pom_change_dep -r :log4j :log4j:1.2.17 -%pom_change_dep -r :cglib-nodep :cglib:3.1 -%pom_change_dep -r javax.servlet:servlet-api :javax.servlet-api:3.1.0 - -%pom_change_dep io.netty:netty-codec-http io.netty:netty-all rt/transports/http-netty/netty-{client,server} - -# NOTE: Maybe org.glassfish.jaxb:txw2 should be added as runtime deps in cxf-codegen-plugin pom file -for mod in rt/ws/policy tools/javato/ws services/wsn/wsn-api services/xkms/xkms-common ; do -# NoClassDefFoundError: com/sun/xml/txw2/output/XmlSerializer -%pom_xpath_inject "pom:plugin[pom:artifactId = 'cxf-codegen-plugin']" " - - - org.glassfish.jaxb - txw2 - 2.2.11 - -" ${mod} -done - -%pom_xpath_inject "pom:plugin[pom:artifactId = 'cxf-codegen-plugin']/pom:dependencies" " - - org.glassfish.jaxb - txw2 - 2.2.11 -" services/ws-discovery/ws-discovery-api - -# Disable old swagger support -%pom_remove_dep -r com.wordnik:swagger-jaxrs_2.10 rt/rs/description -rm rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java - -%pom_change_dep -r :geronimo-servlet_2.5_spec javax.servlet:javax.servlet-api:3.1.0 rt/transports/http-netty/netty-server - -%pom_change_dep -r :ehcache :ehcache-core:2.6.11 - -%pom_change_dep -r org.bouncycastle:bcprov-ext-jdk15on :bcprov-jdk15on rt/rs/security/jose-parent/jose - -# Use hazelcast:1.9.4 -%pom_remove_dep -r com.hazelcast:hazelcast -rm services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCast*.java - -# Create Jandex index file(s) -# Required by WildFly -%pom_add_plugin "org.jboss.jandex:jandex-maven-plugin:1.0.4" rt/ws/security " - - - make-index - - jandex - - -" - -%pom_add_plugin "org.apache.felix:maven-bundle-plugin:3.0.1" rt/ws/security ' - - - http://cxf.apache.org - ${cxf.osgi.symbolic.name} - ${cxf.fragment.host} - The Apache Software Foundation - org.apache - ${cxf.osgi.version.clean} - The Apache Software Foundation - ${cxf.osgi.version.clean} - - ${cxf.osgi.import}, - * - - - {maven-resources}, - /META-INF/jandex.idx=${project.build.outputDirectory}/META-INF/jandex.idx - - -' - -%pom_xpath_remove "pom:dependency[pom:artifactId = 'tools']/pom:scope" maven-plugins/java2wadl-plugin -%pom_xpath_remove "pom:dependency[pom:artifactId = 'tools']/pom:systemPath" maven-plugins/java2wadl-plugin - -%mvn_package ":cxf-tools*" tools -%mvn_package ":cxf-rt*" rt -%mvn_package ":cxf-maven-plugins*" maven-plugins -%mvn_package ":cxf-services*" services - -%build - -%mvn_build -f - -# Create Jandex index file(s) -# Required by WildFly -java -cp $(build-classpath jandex) org.jboss.jandex.Main -j rt/security/target/cxf-rt-security-%{version}.jar -java -cp $(build-classpath jandex) org.jboss.jandex.Main -j rt/ws/security/target/cxf-rt-ws-security-%{version}.jar - -%install -%mvn_install - -install -pm 644 rt/security/target/cxf-rt-security-%{version}-jandex.jar %{buildroot}%{_javadir}/%{name}/cxf-rt-security-jandex.jar -install -pm 644 rt/ws/security/target/cxf-rt-ws-security-%{version}-jandex.jar %{buildroot}%{_javadir}/%{name}/cxf-rt-ws-security-jandex.jar - -%files -f .mfiles -%doc README -%license LICENSE NOTICE - -%files tools -f .mfiles-tools -%license LICENSE NOTICE - -%files rt -f .mfiles-rt -%{_javadir}/%{name}/cxf-rt-security-jandex.jar -%{_javadir}/%{name}/cxf-rt-ws-security-jandex.jar -%license LICENSE NOTICE - -%files services -f .mfiles-services -%license LICENSE NOTICE - -%files maven-plugins -f .mfiles-maven-plugins -%license LICENSE NOTICE - -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 1:3.1.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1:3.1.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1:3.1.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1:3.1.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 17 2017 Mat Booth - 1:3.1.6-7 -- Fix FTBFS - -* Wed Jul 26 2017 Fedora Release Engineering - 1:3.1.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Feb 21 2017 gil cattaneo 1:3.1.6-5 -- fix CVE-2017-3156 (rhbz#1425455,1425458) - -* Fri Feb 10 2017 Fedora Release Engineering - 1:3.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Dec 21 2016 gil cattaneo 3.1.6-3 -- fixes CVE-2016-6812 CVE-2016-8739 (rhbz#1406810,1406811,1406813) - -* Tue Sep 13 2016 gil cattaneo 3.1.6-2 -- re-introduce jandex jars - -* Sat Aug 20 2016 gil cattaneo 3.1.6-1 -- update to 3.1.6 - -* Wed Aug 17 2016 Peter Robinson 3.1.4-2 -- Re-add Epoch otherwise 2.7.11 is newer - -* Fri Jun 17 2016 gil cattaneo 3.1.4-1 -- update to 3.1.4 - -* Wed Feb 03 2016 Fedora Release Engineering - 1:2.7.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 06 2015 gil cattaneo 1:2.7.11-3 -- fix FTBFS rhbz#1239422 -- fix BR list and use BRs mvn()-like -- remove duplicate files -- fix some rpmlint problems -- introduce license macro - -* Wed Jun 17 2015 Fedora Release Engineering - 1:2.7.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Mar 24 2015 Marek Goldmann - 1:2.7.11-1 -- Upstream release 2.7.11 -- Fixes RHBZ#1065245, RHBZ#1068021, RHBZ#1106113 -- Fixes CVE-2014-0034, CVE-2014-0035, CVE-2014-0109, CVE-2014-0110, CVE-2014-3584 - -* Sat Jun 07 2014 Fedora Release Engineering - 1:2.7.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 1:2.7.5-4 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Aug 08 2013 Marek Goldmann - 1:2.7.5-3 -- Add jandex index to cxf-rt-ws-security jar - -* Sat Aug 03 2013 Fedora Release Engineering - 1:2.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 19 2013 Marek Goldmann - 1:2.7.5-1 -- Upstream reelase 2.7.5 -- Broken dependnency on asm2, RHBZ#977970 -- New guidelines - -* Mon Mar 04 2013 Marek Goldmann - 1:2.6.6-1 -- Upstream release 2.6.6, RHBZ#909247 - -* Wed Feb 13 2013 Fedora Release Engineering - 1:2.6.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1:2.6.3-5 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Dec 12 2012 Marek Goldmann - 1:2.6.3-4 -- Prefer the servlet 3.0 API over anything else - -* Tue Dec 11 2012 Marek Goldmann - 1:2.6.3-3 -- Added proper requires with epoch - -* Mon Dec 10 2012 Stanislav Ochotnicky - 1:2.6.3-2 -- Added epoch after downgrade - -* Tue Nov 13 2012 Marek Goldmann - 2.6.3-1 -- Upstream release 2.6.3 - -* Tue Nov 13 2012 Marek Goldmann - 2.4.9-3 -- Replaced patches with pom macros -- Enbled modules: rt/security, javascript - -* Tue Oct 02 2012 Marek Goldmann - 2.4.9-2 -- Place depmap fragments in subpackages -- Add parent of parent POM file - -* Tue Sep 25 2012 Patryk Obara 2.4.9-1 -- Update to latest release -- CVE-2012-2379, RHBZ#846247 -- CVE-2012-2378, RHBZ#846242 -- CVE-2012-3451, RHBZ#858781 - -* Mon Aug 13 2012 Patryk Obara 2.4.8-5 -- Enabled modules: databinding/aegis, databinding/jibx, frontend/js - -* Fri Aug 10 2012 Patryk Obara 2.4.8-4 -- Enabled modules: frontend/jaxws, bindings/http, transports/http, transports/jms, ws/rm - -* Wed Jul 18 2012 Fedora Release Engineering - 2.4.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Patryk Obara 2.4.8-2 -- Change source0 url - -* Mon Jul 9 2012 Patryk Obara 2.4.8-1 -- Upgrade to latest bugfix release -- Fix submodule description -- Patch splitting and cleanup -- Added missing build dependencies - -* Mon Jun 18 2012 Patryk Obara 2.4.7-1 -- Initial packaging - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..feb7f17 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +cxf fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674782 diff --git a/sources b/sources deleted file mode 100644 index a529125..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3bec7c691e203cc82b4bcd2405cbbd36 apache-cxf-3.1.6-src.tar.gz