From 794b8f0006a28c5362d8921be6de6a4ca6173882 Mon Sep 17 00:00:00 2001 From: gil Date: Sep 09 2015 09:51:34 +0000 Subject: fix FTBFS rhbz#1239422 Signed-off-by: Mikolaj Izdebski --- diff --git a/cxf-2.7.11-mina-core2.0.9-support.patch b/cxf-2.7.11-mina-core2.0.9-support.patch new file mode 100644 index 0000000..2191bea --- /dev/null +++ b/cxf-2.7.11-mina-core2.0.9-support.patch @@ -0,0 +1,14 @@ +diff -Nru apache-cxf-2.7.11-src/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpDestination.java apache-cxf-2.7.11-src.mina-core/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpDestination.java +--- apache-cxf-2.7.11-src/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpDestination.java 2014-04-09 01:27:01.000000000 +0200 ++++ apache-cxf-2.7.11-src.mina-core/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpDestination.java 2015-08-16 16:45:19.318239490 +0200 +@@ -192,4 +192,10 @@ + } + return null; + } ++ ++ @Override ++ public void inputClosed(IoSession session) throws Exception { ++ System.out.println("inputClosed"); ++ //session.close(true); ++ } + } diff --git a/cxf.spec b/cxf.spec index 4e572a3..6c4d318 100644 --- a/cxf.spec +++ b/cxf.spec @@ -1,88 +1,93 @@ # vim: set ts=4 sw=4 sts=4 et: %global tarname apache-%{name}-%{version}-src -Name: cxf -Epoch: 1 -Version: 2.7.11 -Release: 2%{?dist} -Summary: Apache CXF -License: ASL 2.0 -URL: http://cxf.apache.org/ - -Source0: http://archive.apache.org/dist/%{name}/%{version}/%{tarname}.tar.gz - -Patch0: 0001-JDK-8-support.patch - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-archetype-packaging -BuildRequires: maven-assembly-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-shared-artifact-resolver -BuildRequires: maven-shared-downloader -BuildRequires: maven-surefire-plugin -BuildRequires: maven-war-plugin -BuildRequires: maven-wagon-ssh -BuildRequires: maven-site-plugin -BuildRequires: activemq-core -BuildRequires: apache-commons-lang -BuildRequires: apache-mina -BuildRequires: aries-blueprint -BuildRequires: objectweb-asm -BuildRequires: batik -BuildRequires: bouncycastle -BuildRequires: cglib -BuildRequires: cxf-build-utils >= 2.6.0-1 -BuildRequires: cxf-xjc-utils >= 2.6.2-1 -BuildRequires: ehcache-core -BuildRequires: felix-osgi-core -BuildRequires: geronimo-annotation -BuildRequires: geronimo-saaj -BuildRequires: glassfish-jaxb -BuildRequires: glassfish-jaxb-api -BuildRequires: glassfish-jax-rs-api -BuildRequires: glassfish-fastinfoset -BuildRequires: jandex -BuildRequires: javamail -BuildRequires: jboss-connector-1.6-api >= 1.0.1-1 -BuildRequires: jboss-servlet-3.0-api -BuildRequires: jboss-jaxws-2.2-api -BuildRequires: jibx -BuildRequires: jra -BuildRequires: logback -BuildRequires: neethi -BuildRequires: opensaml-java -BuildRequires: opensaml-java-parent -BuildRequires: opensaml-java-xmltooling >= 1.3.4-8 -BuildRequires: springframework >= 3.1.1-9 -BuildRequires: springframework-aop -BuildRequires: springframework-beans -BuildRequires: springframework-context -BuildRequires: springframework-jms -BuildRequires: springframework-tx -BuildRequires: springframework-web -BuildRequires: springframework-webmvc -BuildRequires: tycho -BuildRequires: velocity -BuildRequires: wsdl4j -BuildRequires: wss4j >= 1.6.10 -BuildRequires: xml-commons-resolver -BuildRequires: xmlbeans -BuildRequires: ws-xmlschema - -%if 0%{?fedora} >= 21 -BuildRequires: log4j12 -%else -BuildRequires: log4j -%endif +Name: cxf +Epoch: 1 +Version: 2.7.11 +Release: 3%{?dist} +Summary: Apache CXF +License: ASL 2.0 +URL: http://cxf.apache.org/ + +Source0: http://archive.apache.org/dist/%{name}/%{version}/%{tarname}.tar.gz + +Patch0: 0001-JDK-8-support.patch + +# Add missing method available in apache-mina 2.0.9 +Patch1: cxf-2.7.11-mina-core2.0.9-support.patch + + +BuildArch: noarch + +BuildRequires: jandex +BuildRequires: jra +BuildRequires: maven-local +BuildRequires: mvn(asm:asm) +BuildRequires: mvn(ch.qos.logback:logback-classic) +BuildRequires: mvn(com.sun.xml.bind:jaxb-impl) +BuildRequires: mvn(com.sun.xml.bind:jaxb-xjc) +BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(javax.mail:mail) +BuildRequires: mvn(jdom:jdom) +BuildRequires: mvn(log4j:log4j:12) +BuildRequires: mvn(net.sf.cglib:cglib) +BuildRequires: mvn(net.sf.ehcache:ehcache-core) +BuildRequires: mvn(net.shibboleth:parent:pom:) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.aries.blueprint:org.apache.aries.blueprint.core) +BuildRequires: mvn(org.apache.cxf:cxf-xjc-plugin) >= 2.6.2-1 +BuildRequires: mvn(org.apache.cxf.build-utils:cxf-xml2fastinfoset-plugin) >= 2.6.0-1 +BuildRequires: mvn(org.apache.cxf.xjcplugins:cxf-xjc-dv) +BuildRequires: mvn(org.apache.cxf.xjcplugins:cxf-xjc-pl) +BuildRequires: mvn(org.apache.cxf.xjcplugins:cxf-xjc-wsdlextension) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.shared:maven-artifact-resolver) +BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh) +BuildRequires: mvn(org.apache.mina:mina-core) +BuildRequires: mvn(org.apache.neethi:neethi) +BuildRequires: mvn(org.apache.velocity:velocity) +BuildRequires: mvn(org.apache.ws.security:wss4j) >= 1.6.10 +BuildRequires: mvn(org.apache.ws.xmlschema:xmlschema-core) +BuildRequires: mvn(org.apache.xmlbeans:xmlbeans) +BuildRequires: mvn(org.apache.xmlgraphics:batik-ext) +BuildRequires: mvn(org.bouncycastle:bcprov-jdk16) +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.tycho:tycho-packaging-plugin) +BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec) >= 1.0.1-1 +BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec) +BuildRequires: mvn(org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_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.opensaml:opensaml) +BuildRequires: mvn(org.osgi:org.osgi.compendium) +BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +BuildRequires: mvn(org.springframework:spring-aop) +BuildRequires: mvn(org.springframework:spring-beans) +BuildRequires: mvn(org.springframework:spring-context) +BuildRequires: mvn(org.springframework:spring-core) >= 3.1.1-9 +BuildRequires: mvn(org.springframework:spring-jms) +BuildRequires: mvn(org.springframework:spring-tx) +BuildRequires: mvn(org.springframework:spring-web) +BuildRequires: mvn(org.springframework:spring-webmvc) +BuildRequires: mvn(rhino:js) +BuildRequires: mvn(wsdl4j:wsdl4j) +BuildRequires: mvn(xml-resolver:xml-resolver) %description Apache CXF is an open-source services framework that aids in @@ -90,25 +95,25 @@ the development of services using front-end programming APIs, like JAX-WS and JAX-RS. %package javadoc -Summary: Javadocs for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains the API documentation for %{name}. %package api -Summary: Apache CXF API +Summary: Apache CXF API %description api Apache CXF API classes. %package maven-plugins -Summary: Apache CXF 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 +Summary: Apache CXF Runtime %description rt This package contains core feature set of Apache CXF; @@ -116,13 +121,13 @@ web service standards support, frontends, and protocols support. %package services -Summary: Apache CXF Services +Summary: Apache CXF Services %description services This package contains Apache CXF WSN services. %package tools -Summary: Apache CXF Tools +Summary: Apache CXF Tools %description tools Apache CXF Command Line Tools. @@ -134,6 +139,7 @@ find . -name "*.jar" -delete find . -name "*.class" -delete %patch0 -p1 +%patch1 -p1 iconv -f macintosh -t utf8 < licenses/cdd1-1.0.txt > cdd.txt mv -f cdd.txt licenses/cdd1-1.0.txt @@ -300,6 +306,13 @@ sed -i "s|@Override||" services/sts/sts-core/src/main/java/org/apache/cxf/sts/ev # Fix java.lang.NoClassDefFoundError: org/w3c/dom/ElementTraversal %pom_xpath_inject "pom:dependencies" "org.apache.xmlgraphicsbatik-ext1.8runtime" tools/common/pom.xml +# Fix javadoc doclint +%pom_remove_plugin -r :maven-javadoc-plugin +# Removed unused artifact +%pom_remove_dep -r org.apache.ant:ant-nodeps +# Use activemq >= 5.8.0 (activemq-core was splitted in several sub modules) +%pom_remove_dep -r org.apache.activemq: + %mvn_package ":cxf-tools*" tools %mvn_package ":cxf-rt*" rt %mvn_package ":cxf-maven-plugins*" maven-plugins @@ -319,28 +332,36 @@ java -cp $(build-classpath jandex) org.jboss.jandex.Main -j rt/ws/security/targe 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 NOTICE +%doc README +%license LICENSE NOTICE %files tools -f .mfiles-tools -%doc LICENSE NOTICE +%license LICENSE NOTICE %files api -f .mfiles-api -%doc LICENSE NOTICE +%license LICENSE NOTICE %files rt -f .mfiles-rt %{_javadir}/%{name}/cxf-rt-ws-security-jandex.jar -%doc LICENSE NOTICE +%license LICENSE NOTICE %files services -f .mfiles-services -%doc LICENSE NOTICE +%license LICENSE NOTICE %files maven-plugins -f .mfiles-maven-plugins -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* 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