[cxf] Upstream release 2.7.0
Marek Goldmann
goldmann at fedoraproject.org
Mon Nov 19 15:07:56 UTC 2012
commit f15575d52ac603043bbbc0681de42324e8e5c7d1
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Mon Nov 19 16:07:36 2012 +0100
Upstream release 2.7.0
.gitignore | 1 +
cxf.spec | 122 ++++++++++++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 89 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff003c6..85c67d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/apache-cxf-2.4.8-src.tar.gz
/apache-cxf-2.4.9-src.tar.gz
+/apache-cxf-2.7.0-src.tar.gz
diff --git a/cxf.spec b/cxf.spec
index 3e14154..f98c452 100644
--- a/cxf.spec
+++ b/cxf.spec
@@ -2,8 +2,8 @@
%global tarname apache-%{name}-%{version}-src
Name: cxf
-Version: 2.4.9
-Release: 3%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
Summary: Apache CXF
License: ASL 2.0
Group: Development/Libraries
@@ -87,13 +87,11 @@ Requires: ws-xmlschema
Requires: wsdl4j
Requires: wss4j >= 1.6
-
%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: Javadocs for %{name}
Group: Documentation
@@ -102,34 +100,22 @@ Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
-
%package api
Summary: Apache CXF API
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-common < 2.4.9-4
%description api
Apache CXF API classes.
-
-%package common
-Summary: Apache CXF Common
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: glassfish-jaxb-api
-Requires: geronimo-saaj
-
-%description common
-This package contains Apache CXF Common classes (including
-Apache CXF Common Utilities).
-
%package maven-plugins
Summary: Apache CXF Maven Plugins
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-api = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
%description maven-plugins
Maven plugins required for building or testing Apache CXF.
@@ -140,7 +126,6 @@ Summary: Apache CXF Runtime
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-api = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-tools = %{version}-%{release}
Requires: apache-mina
Requires: aries-blueprint
@@ -164,6 +149,19 @@ This package contains core feature set of Apache CXF;
web service standards support, frontends, and protocols
support.
+%package services
+Summary: Apache CXF Services
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-api = %{version}-%{release}
+Requires: %{name}-rt = %{version}-%{release}
+Requires: geronimo-jms
+Requires: felix-osgi-core
+Requires: aries-blueprint
+#Requires: activemq
+
+%description services
+This package contains Apache CXF WSN services.
%package tools
Summary: Apache CXF Tools
@@ -184,12 +182,11 @@ find . -name "pom.xml" -print | xargs sed -i "s|>cglib<|>net.sf.cglib<|"
find . -name "pom.xml" -print | xargs sed -i "s|cglib-nodep|cglib|"
# Replace bcprov-jdk15 with bcprov-jdk16
-find . -name "pom.xml" -print | xargs sed -i "s|bcprov-jdk15|bcprov-jdk16|"
+find . -name "pom.xml" -print | xargs sed -i "s|bcprov-jdk15|bcprov-jdk16|;s|bcprov-jdk16on|bcprov-jdk16|"
# Not necessary for javadoc generation
%pom_remove_plugin "org.apache.maven.plugins:maven-dependency-plugin" distribution/pom.xml
-
sed -i "s|<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>|<cxf.servlet-api.group>org.jboss.spec.javax.servlet</cxf.servlet-api.group>|" parent/pom.xml
sed -i "s|<cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.artifact>|<cxf.servlet-api.artifact>jboss-servlet-api_3.0_spec</cxf.servlet-api.artifact>|" parent/pom.xml
@@ -197,7 +194,7 @@ sed -i "s|<cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.a
while read gid aid newgid newaid version
do
-for f in $(grep "<artifactId>${aid}</artifactId>" --include "pom.xml" -r | awk -F: '{ print $1 }' | uniq)
+for f in $(grep "<artifactId>${aid}</artifactId>" --include "pom.xml" --exclude-dir "*samples*" -r | awk -F: '{ print $1 }' | uniq)
do
%pom_remove_dep "${gid}:${aid}" ${f}
@@ -226,31 +223,65 @@ EOF
%pom_disable_module xerces-xsd-validation common/pom.xml
# Disable Maven plugins submodules
-%pom_disable_module "java2ws-plugin" maven-plugins/pom.xml
+# Requires jsr-339, jaxrs 2.0
+%pom_disable_module "codegen-plugin" maven-plugins/pom.xml
+# Requires jsr-339, jaxrs 2.0
%pom_disable_module "wadl2java-plugin" maven-plugins/pom.xml
%pom_disable_module "wsdl-validator-plugin" maven-plugins/pom.xml
%pom_disable_module "corba" maven-plugins/pom.xml
%pom_disable_module "archetypes" maven-plugins/pom.xml
# Disable rt submodules
-%pom_disable_module "jbi" rt/bindings/pom.xml
%pom_disable_module "corba" rt/bindings/pom.xml
%pom_disable_module "databinding/xmlbeans" rt/pom.xml
%pom_disable_module "databinding/sdo" rt/pom.xml
+
+# Requires jsr-339, jaxrs 2.0
%pom_disable_module "frontend/jaxrs" rt/pom.xml
%pom_disable_module "transports/http-jetty" rt/pom.xml
-%pom_disable_module "transports/jbi" rt/pom.xml
+%pom_disable_module "transports/http-hc" rt/pom.xml
%pom_disable_module "management-web" rt/pom.xml
+%pom_disable_module "rs/extensions/providers" rt/pom.xml
+%pom_disable_module "rs/extensions/search" rt/pom.xml
+
+%pom_disable_module "rs/security/xml" rt/pom.xml
+%pom_disable_module "rs/security/sso/saml" rt/pom.xml
+%pom_disable_module "rs/security/oauth-parent" rt/pom.xml
+%pom_disable_module "rs/security/cors" rt/pom.xml
+
+%pom_disable_module "javascript-tests" rt/javascript/pom.xml
# Disable tools submodules
+# Requires jsr-339, jaxrs 2.0
%pom_disable_module "wadlto" tools/pom.xml
%pom_disable_module "corba" tools/pom.xml
+# Requires jsr-339, jaxrs 2.0
%pom_disable_module "frontend/javascript" tools/wsdlto/pom.xml
%pom_disable_module "test" tools/wsdlto/pom.xml
%pom_disable_module "misc" tools/wsdlto/pom.xml
+#%pom_disable_module "sts" services/pom.xml
+%pom_disable_module "wsn" services/pom.xml
+%pom_disable_module "ws-discovery" services/pom.xml
+%pom_disable_module "systests" services/sts/pom.xml
+
+%pom_remove_dep "org.springframework.ldap:spring-ldap-core" services/sts/sts-core/pom.xml
+%pom_remove_dep "org.springframework.ldap:spring-ldap-core" services/sts/sts-war/pom.xml
+%pom_remove_dep "com.hazelcast:hazelcast" services/sts/sts-core/pom.xml
+%pom_remove_dep "com.hazelcast:hazelcast" services/sts/sts-war/pom.xml
+
+rm services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
+rm services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
+
# Disable codegen plugin
%pom_remove_plugin "org.apache.cxf:cxf-codegen-plugin" rt/ws/policy/pom.xml
+%pom_remove_plugin "org.apache.cxf:cxf-codegen-plugin" tools/javato/ws/pom.xml
+
+# Disable checkstyle plugin
+%pom_remove_plugin "org.apache.maven.plugins:maven-checkstyle-plugin" parent/pom.xml
+
+# Disable pmd plugin
+%pom_remove_plugin "org.apache.maven.plugins:maven-pmd-plugin" parent/pom.xml
# Disable remote-resources-plugin
%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-remote-resources-plugin']" parent/pom.xml
@@ -305,6 +336,15 @@ guess_jar_file_and_target ()
jar_target=""
local guess
+ echo "target/%{name}-${module}-${aid_name}-%{version}.jar"
+
+ guess=target/%{name}-${module}-${aid_name}-%{version}.jar
+ if [ -f ${guess} ]; then
+ jar_file=${guess}
+ jar_target=%{name}/${module}-${aid_name}.jar
+ return 0
+ fi
+
guess=target/%{name}-${module}-${aid_name}-%{version}.jar
if [ -f ${guess} ]; then
jar_file=${guess}
@@ -360,13 +400,10 @@ do
done <<EOM
api
maven-plugins
-maven-plugins codegen-plugin
-common
-common common utilities
+maven-plugins java2ws-plugin
rt
rt bindings
rt bindings/coloc
-rt bindings/http
rt bindings/object
rt bindings/soap
rt bindings/xml
@@ -377,16 +414,21 @@ rt databinding/jibx
rt frontend/simple
rt frontend/jaxws
rt frontend/js
+rt features/clustering
rt javascript
rt management
-rt transports/common
rt transports/http
+rt transports/udp
rt transports/jms
rt transports/local
rt ws/addr
rt ws/policy
+rt ws/mex
rt ws/rm
rt ws/security
+services
+services sts
+services sts/sts-core sts-core
tools
tools common
tools javato
@@ -396,6 +438,13 @@ tools wsdlto/core
tools wsdlto/databinding/jaxb
tools wsdlto/frontend/jaxws
EOM
+#services wsn
+#services wsn/wsn-core wsn-core
+#services wsn/wsn-api wsn-api
+#services wsn/wsn-osgi wsn-osgi
+#services ws-discovery
+#services ws-discovery/ws-discovery-api ws-discovery-api
+#services ws-discovery/ws-discovery-service ws-discovery-service
# parents
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-cxf.pom
@@ -431,11 +480,6 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_mavendepmapfragdir}/%{name}-api
%{_javadir}/%{name}/api.jar
-%files common
-%{_mavenpomdir}/JPP.%{name}-common*
-%{_mavendepmapfragdir}/%{name}-common
-%{_javadir}/%{name}/common-*
-
%files maven-plugins
%{_mavenpomdir}/JPP.%{name}-maven-plugins*
%{_mavendepmapfragdir}/%{name}-maven-plugins
@@ -446,6 +490,11 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_mavendepmapfragdir}/%{name}-rt
%{_javadir}/%{name}/rt-*
+%files services
+%{_mavenpomdir}/JPP.%{name}-services*
+%{_mavendepmapfragdir}/%{name}-services
+%{_javadir}/%{name}/services-*
+
%files tools
%{_mavenpomdir}/JPP.%{name}-tools*
%{_mavendepmapfragdir}/%{name}-tools
@@ -453,6 +502,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Tue Nov 13 2012 Marek Goldmann <mgoldman at redhat.com> - 2.7.0-1
+- Upstream release 2.7.0
+
* Tue Nov 13 2012 Marek Goldmann <mgoldman at redhat.com> - 2.4.9-3
- Replaced patches with pom macros
- Enbled modules: rt/security, javascript
diff --git a/sources b/sources
index 2b6ce53..f7e437b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf9f498895db4f2a5e8e282f740846b0 apache-cxf-2.4.9-src.tar.gz
+cdeec79ccaef15bc578d8f256c638d62 apache-cxf-2.7.0-src.tar.gz
More information about the scm-commits
mailing list