[springframework-ws] update to 2.1.2.RELEASE
gil
gil at fedoraproject.org
Sat Feb 28 19:42:38 UTC 2015
commit 2a44aa87dea3693c85da3c3484ed7ebb78f47c5c
Author: gil <puntogil at libero.it>
Date: Sat Feb 28 20:42:19 2015 +0100
update to 2.1.2.RELEASE
.gitignore | 1 +
sources | 2 +-
....patch => springframework-ws-2.1.2-smack4.patch | 42 ++++++------
springframework-ws.spec | 77 ++++++++++++++--------
4 files changed, 71 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ab64ef..1c3f960 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/spring-ws-2.1.1.RELEASE.tar.gz
+/spring-ws-2.1.2.RELEASE.tar.gz
diff --git a/sources b/sources
index 3b1e27a..149ccbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62332a8493f9adf6e92b9b6025c511ea spring-ws-2.1.1.RELEASE.tar.gz
+ad4c49429d4b5f8e57d5c83005cc9ccc spring-ws-2.1.2.RELEASE.tar.gz
diff --git a/springframework-ws-2.1.1-smack4.patch b/springframework-ws-2.1.2-smack4.patch
similarity index 73%
rename from springframework-ws-2.1.1-smack4.patch
rename to springframework-ws-2.1.2-smack4.patch
index 4e6816f..bf8a72a 100644
--- a/springframework-ws-2.1.1-smack4.patch
+++ b/springframework-ws-2.1.2-smack4.patch
@@ -1,6 +1,6 @@
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/parent/pom.xml spring-ws-spring-ws-2.1.1.RELEASE-gil/parent/pom.xml
---- spring-ws-spring-ws-2.1.1.RELEASE/parent/pom.xml 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/parent/pom.xml 2014-12-28 20:40:31.606788545 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/parent/pom.xml spring-ws-spring-ws-2.1.2.RELEASE.smack4/parent/pom.xml
+--- spring-ws-spring-ws-2.1.2.RELEASE/parent/pom.xml 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/parent/pom.xml 2015-02-28 20:13:27.472453062 +0100
@@ -661,9 +661,19 @@
</exclusions>
</dependency>
@@ -24,9 +24,9 @@ diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/parent/pom.xml spring-ws-spring-ws-2
</dependency>
<!-- Logging dependencies -->
<dependency>
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/pom.xml spring-ws-spring-ws-2.1.1.RELEASE-gil/support/pom.xml
---- spring-ws-spring-ws-2.1.1.RELEASE/support/pom.xml 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/support/pom.xml 2014-12-28 18:45:44.915366485 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/support/pom.xml spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/pom.xml
+--- spring-ws-spring-ws-2.1.2.RELEASE/support/pom.xml 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/pom.xml 2015-02-28 20:13:27.473453008 +0100
@@ -90,8 +90,18 @@
<optional>true</optional>
</dependency>
@@ -48,9 +48,9 @@ diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/pom.xml spring-ws-spring-ws-
<optional>true</optional>
</dependency>
<!-- Other dependencies -->
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java
---- spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java 2014-12-28 20:37:39.984400354 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java
+--- spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java 2015-02-28 20:13:27.473453008 +0100
@@ -16,6 +16,9 @@
package org.springframework.ws.transport.xmpp.support;
@@ -103,9 +103,9 @@ diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springfram
}
public XMPPConnection getObject() {
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java
---- spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java 2014-12-28 20:45:59.524333890 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java
+--- spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java 2015-02-28 20:13:27.473453008 +0100
@@ -25,6 +25,7 @@
import org.springframework.ws.transport.xmpp.XmppTransportConstants;
@@ -135,9 +135,9 @@ diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springfram
if (value != null) {
return Collections.singletonList(value).iterator();
}
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
---- spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java 2014-12-28 20:39:06.787044706 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
+--- spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java 2015-02-28 20:13:27.474452954 +0100
@@ -16,9 +16,13 @@
package org.springframework.ws.transport.xmpp;
@@ -174,9 +174,9 @@ diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springfram
}
}
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
---- spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java 2014-12-28 20:32:25.096201720 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
+--- spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java 2015-02-28 20:13:27.474452954 +0100
@@ -28,6 +28,7 @@
import org.springframework.ws.transport.AbstractReceiverConnection;
import org.springframework.ws.transport.xmpp.support.XmppTransportUtils;
@@ -197,9 +197,9 @@ diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springfram
+ }
}
}
-diff -Nru spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
---- spring-ws-spring-ws-2.1.1.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java 2012-09-18 12:22:28.000000000 +0200
-+++ spring-ws-spring-ws-2.1.1.RELEASE-gil/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java 2014-12-28 20:32:56.286636447 +0100
+diff -Nru spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
+--- spring-ws-spring-ws-2.1.2.RELEASE/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java 2012-12-04 11:32:53.000000000 +0100
++++ spring-ws-spring-ws-2.1.2.RELEASE.smack4/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java 2015-02-28 20:13:27.474452954 +0100
@@ -29,6 +29,7 @@
import org.springframework.ws.transport.xmpp.support.XmppTransportUtils;
diff --git a/springframework-ws.spec b/springframework-ws.spec
index e786cdd..2eb975c 100644
--- a/springframework-ws.spec
+++ b/springframework-ws.spec
@@ -2,15 +2,15 @@
%global namedversion %{version}%{?namedreltag}
%global oname spring-ws
Name: springframework-ws
-Version: 2.1.1
-Release: 5%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Summary: Spring Web Services
License: ASL 2.0
URL: http://projects.spring.io/spring-ws/
-# latest release depend on springframework >= 3.2.9.RELEASE
+# latest release depend on axiom >= 1.2.14
Source0: https://github.com/spring-projects/%{oname}/archive/%{oname}-%{namedversion}.tar.gz
# Thanks to Florian Schmaus flo at geekplace.eu
-Patch0: springframework-ws-2.1.1-smack4.patch
+Patch0: springframework-ws-2.1.2-smack4.patch
BuildRequires: mvn(com.sun.xml.messaging.saaj:saaj-impl)
BuildRequires: mvn(commons-httpclient:commons-httpclient)
@@ -21,22 +21,28 @@ BuildRequires: mvn(javax.jms:jms)
BuildRequires: mvn(javax.xml.soap:saaj-api)
BuildRequires: mvn(javax.xml.stream:stax-api)
BuildRequires: mvn(javax.mail:mail)
+BuildRequires: mvn(javax.servlet:servlet-api) >= 3.1.0
BuildRequires: mvn(jaxen:jaxen)
BuildRequires: mvn(org.igniterealtime.smack:smack-core) >= 4.0.6
BuildRequires: mvn(org.igniterealtime.smack:smack-extensions)
BuildRequires: mvn(org.igniterealtime.smack:smack-tcp)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
+# use axiom-api 1.2.13
BuildRequires: mvn(org.apache.ws.commons.axiom:axiom-api)
BuildRequires: mvn(org.apache.ws.commons.axiom:axiom-impl)
+BuildRequires: mvn(org.apache.ws.security:wss4j)
BuildRequires: mvn(org.apache.ws.xmlschema:xmlschema-core)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
-BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec)
BuildRequires: mvn(org.jdom:jdom2)
BuildRequires: mvn(org.springframework:spring-core)
BuildRequires: mvn(org.springframework:spring-aop)
BuildRequires: mvn(org.springframework:spring-context)
BuildRequires: mvn(org.springframework:spring-jms)
BuildRequires: mvn(org.springframework:spring-oxm)
+BuildRequires: mvn(org.springframework.security:spring-security-core)
+BuildRequires: mvn(org.springframework.security:spring-security-config)
+BuildRequires: mvn(org.springframework.security:spring-security-web)
+BuildRequires: mvn(org.springframework:spring-test)
BuildRequires: mvn(org.springframework:spring-tx)
BuildRequires: mvn(org.springframework:spring-web)
BuildRequires: mvn(org.springframework:spring-webmvc)
@@ -44,6 +50,7 @@ BuildRequires: mvn(wsdl4j:wsdl4j)
BuildRequires: mvn(xmlunit:xmlunit)
BuildRequires: mvn(xom:xom)
+
%if 0
# test deps
BuildRequires: easymock
@@ -58,7 +65,6 @@ BuildRequires: mvn(org.aspectj:aspectjweaver)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
BuildRequires: mvn(org.jvnet.mock-javamail:mock-javamail)
BuildRequires: mvn(org.mortbay.jetty:jetty)
-BuildRequires: mvn(org.springframework:spring-test)
%endif
BuildRequires: maven-local
@@ -81,6 +87,9 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{oname}-%{oname}-%{namedversion}
+%patch0 -p1
+
+
%pom_xpath_remove pom:build/pom:extensions
%pom_xpath_remove pom:build/pom:extensions parent
%pom_remove_plugin :maven-assembly-plugin
@@ -90,27 +99,17 @@ This package contains javadoc for %{name}.
%pom_remove_plugin :jaxws-maven-plugin parent
%pom_remove_plugin :axistools-maven-plugin parent
%pom_remove_plugin :xmlbeans-maven-plugin parent
+%pom_remove_plugin :maven-site-plugin parent
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']" parent
# depend on: org.codehaus.mojo tomcat-maven-plugin
%pom_disable_module archetype
-# depend on: org.springframework spring-test xmlunit
-%pom_disable_module test
-
-%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='servlet-api']/pom:groupId" "
-org.jboss.spec.javax.servlet" parent
-%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='servlet-api']/pom:artifactId" "
-jboss-servlet-api_3.0_spec" parent
-
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='servlet-api']/pom:groupId" "
-org.jboss.spec.javax.servlet" core
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='servlet-api']/pom:artifactId" "
-jboss-servlet-api_3.0_spec" core
# require jdom >= 2.0.1
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId='org.jdom']/pom:artifactId" jdom2 parent
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='org.jdom']/pom:artifactId" jdom2 core
+%pom_remove_dep javax.activation:activation parent
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']" core
%pom_remove_dep javax.activation:activation core
@@ -137,16 +136,35 @@ jboss-servlet-api_3.0_spec" core
</execution>
</executions>'
-# TODO
-%if 0
+%pom_remove_plugin com.springsource.bundlor:com.springsource.bundlor.maven test
+%pom_add_plugin org.apache.felix:maven-bundle-plugin test '
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.springframework.ws.test</Bundle-SymbolicName>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Vendor>SpringSource</Bundle-Vendor>
+ <Bundle-Version>${osgi.version}</Bundle-Version>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>'
+
%pom_remove_dep javax.activation:activation security
%pom_remove_plugin com.springsource.bundlor:com.springsource.bundlor.maven security
%pom_add_plugin org.apache.felix:maven-bundle-plugin security '
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.springframework.ws.security</Bundle-SymbolicName>
- <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-SymbolicName>org.springframework.ws.soap.security</Bundle-SymbolicName>
+ <Bundle-Name>Spring Web Services SOAP Security</Bundle-Name>
<Bundle-Vendor>SpringSource</Bundle-Vendor>
<Bundle-Version>${osgi.version}</Bundle-Version>
</instructions>
@@ -160,16 +178,16 @@ jboss-servlet-api_3.0_spec" core
</goals>
</execution>
</executions>'
-%else
-# depend on:
+
+# TODO depend on:
# (unavailable deps)
# http://xwss.java.net/ https://svn.java.net/svn/xwss~svn
# com.sun.xml.wsit xws-security 1.3.1
# http://wsit.java.net/ https://svn.java.net/svn/wsit~svn/
# com.sun.xml.wsit wsit-rt 1.1
-# org.springframework.security:spring-security-core 3.1.0.RELEASE
-%pom_disable_module security
-%endif
+%pom_remove_dep com.sun.xml.wsit: parent
+%pom_remove_dep com.sun.xml.wsit: security
+rm -r security/src/main/java/org/springframework/ws/soap/security/xwss
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']" support
%pom_remove_dep org.springframework:spring-test support
@@ -216,8 +234,6 @@ jboss-servlet-api_3.0_spec" core
</execution>
</executions>'
-%patch0 -p1
-
sed -i 's/\r//' notice.txt
%build
@@ -237,6 +253,9 @@ sed -i 's/\r//' notice.txt
%license license.txt notice.txt
%changelog
+* Sat Feb 28 2015 gil cattaneo <puntogil at libero.it> 2.1.2-1
+- update to 2.1.2.RELEASE
+
* Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 2.1.1-5
- introduce license macro
More information about the scm-commits
mailing list