[jbossws-cxf] Upstream release 4.1.0.Final

Marek Goldmann goldmann at fedoraproject.org
Mon Nov 19 15:16:21 UTC 2012 

commit 89cdd3eaf3bb1b9f7441d4ec5142ca1d10e28138
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Mon Nov 19 16:11:46 2012 +0100

    Upstream release 4.1.0.Final

 .gitignore                              |    1 +
 0001-Remove-parent.patch                |   30 ----------
 0002-Enable-only-resources-module.patch |   46 ---------------
 jbossws-cxf.spec                        |   96 ++++++++++++++++++++++--------
 sources                                 |    2 +-
 5 files changed, 72 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21b435c..f3cfbec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jbossws-cxf-4.0.2.GA-src.zip
+/jbossws-cxf-4.1.0.Final-src.zip
diff --git a/jbossws-cxf.spec b/jbossws-cxf.spec
index 610728f..a7930e9 100644
--- a/jbossws-cxf.spec
+++ b/jbossws-cxf.spec
@@ -1,19 +1,15 @@
-%global namedreltag .GA
+%global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jbossws-cxf
-Version:          4.0.2
-Release:          2%{?dist}
+Version:          4.1.0
+Release:          1%{?dist}
 Summary:          JBoss Web Services CXF stack
 Group:            Development/Libraries
 License:          LGPLv2+
 URL:              http://www.jboss.org/jbossws
 Source0:          http://download.jboss.org/jbossws/jbossws-cxf-%{namedversion}-src.zip
 
-
-Patch0:           0001-Remove-parent.patch
-Patch1:           0002-Enable-only-resources-module.patch
-
 BuildArch:        noarch
 
 BuildRequires:    jpackage-utils
@@ -23,59 +19,107 @@ BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-install-plugin
 BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
+BuildRequires:    maven-enforcer-plugin
+BuildRequires:    maven-dependency-plugin
+BuildRequires:    jaxws-jboss-httpserver-httpspi
+BuildRequires:    jboss-jms-1.1-api
+BuildRequires:    jboss-ejb-3.1-api
+BuildRequires:    jboss-jaxb-2.2-api
+BuildRequires:    jboss-saaj-1.3-api
+BuildRequires:    jbossws-parent
+BuildRequires:    jbossws-common-tools
+BuildRequires:    picketbox
+BuildRequires:    cxf >= 2.7.0
+BuildRequires:    opensaml-java-parent
+BuildRequires:    jbossws-common >= 2.1.0
 
 Requires:         jpackage-utils
 Requires:         java
+Requires:         jaxws-jboss-httpserver-httpspi
+Requires:         jboss-jms-1.1-api
+Requires:         jboss-ejb-3.1-api
+Requires:         jboss-jaxb-2.2-api
+Requires:         jboss-saaj-1.3-api
+Requires:         picketbox
+Requires:         cxf >= 2.7.0
+Requires:         jbossws-common >= 2.1.0
 
 %description
 JBoss Web Services CXF integration stack
 
-#%package javadoc
-#Summary:          Javadocs for %{name}
-#Group:            Documentation
-#Requires:         jpackage-utils
+%package javadoc
+Summary:          Javadocs for %{name}
+Group:            Documentation
+Requires:         jpackage-utils
 
-#%description javadoc
-#This package contains the API documentation for %{name}.
+%description javadoc
+This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n jbossws-cxf-src-dist
 
-%patch0 -p1
-%patch1 -p1
+%pom_remove_dep "org.springframework:spring-asm" modules/addons/transports/http/httpserver/pom.xml
+%pom_remove_dep "org.springframework:spring-asm" modules/client/pom.xml
+%pom_remove_dep "org.springframework:spring-asm" modules/server/pom.xml
+
+# Available in JDK
+%pom_remove_dep "javax.jws:jsr181-api" modules/client/pom.xml
+%pom_remove_dep "javax.jws:jsr181-api" modules/server/pom.xml
 
 %build
-mvn-rpmbuild -Dno-testsuite -Pjboss711 install javadoc:aggregate
+# EasyMock Class Extension not available
+mvn-rpmbuild -Dmaven.test.skip=true -Dno-testsuite -Pjboss711 package javadoc:aggregate
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# JAR
-install -pm 644 modules/resources/target/jbossws-cxf-resources-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-resources.jar
-install -pm 644 modules/resources/target/jbossws-cxf-resources-%{namedversion}-jboss711.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-resources-jboss711.jar
+for m in resources client server
+do
+  # JAR
+  install -pm 644 modules/${m}/target/jbossws-cxf-${m}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
+
+  # POM
+  install -pm 644 modules/${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
+
+  # DEPMAP
+  %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
+done
 
-# POM
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-install -pm 644 modules/resources/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-resources.pom
+install -pm 644 modules/endorsed/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-factories.pom
+install -pm 644 modules/addons/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-addons.pom
+install -pm 644 modules/addons/transports/http/httpserver/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-transports-httpserver.pom
+
+install -pm 644 modules/resources/target/jbossws-cxf-resources-%{namedversion}-jboss711.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-resources-jboss711.jar
+install -pm 644 modules/addons/transports/http/httpserver/target/jbossws-cxf-transports-httpserver-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-transports-httpserver.jar
+install -pm 644 modules/endorsed/target/jbossws-cxf-factories-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-factories.jar
 
-# DEPMAP
 %add_maven_depmap JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}-resources.pom %{name}/%{name}-resources.jar
+%add_maven_depmap JPP.%{name}-%{name}-addons.pom
+%add_maven_depmap JPP.%{name}-%{name}-factories.pom %{name}/%{name}-factories.jar
+%add_maven_depmap JPP.%{name}-%{name}-transports-httpserver.pom %{name}/%{name}-transports-httpserver.jar
 
 # APIDOCS
-#cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/*
 
-#%files javadoc
-#%{_javadocdir}/%{name}
+%files javadoc
+%{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 13 2012 Marek Goldmann <mgoldman at redhat.com> - 4.1.0-1
+- Upstream release 4.1.0.Final
+
+* Fri Oct 19 2012 Marek Goldmann <mgoldman at redhat.com> - 4.0.2-3
+- Added server, client modules
+- Added javadocs subpackage
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 0ffe6b5..0c03c5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c3fdbca04139a9d2d1fff3e8ba4231d  jbossws-cxf-4.0.2.GA-src.zip
+11985a166c9fcbe1219f68e2d5dec71f  jbossws-cxf-4.1.0.Final-src.zip

More information about the scm-commits mailing list