Author: gmazza
Date: Mon Nov 19 17:27:40 2012
New Revision: 1411321
URL: http://svn.apache.org/viewvc?rev=1411321&view=rev
Log:
Merged revisions 1411319 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411319 | gmazza | 2012-11-19 12:21:36 -0500 (Mon, 19 Nov 2012) | 1 line
Removed commented-out parts of pom.xml.
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml?rev=1411321&r1=1411320&r2=1411321&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
Mon Nov 19 17:27:40 2012
@@ -64,24 +64,6 @@
</execution>
</executions>
</plugin>
- <!--plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/demo/wssec/client/wssec.xml"
todir="${basedir}/target/classes/demo/wssec/client" />
- <copy
file="${basedir}/src/demo/wssec/server/wssec.xml"
todir="${basedir}/target/classes/demo/wssec/server" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin-->
</plugins>
</build>
<profiles>
@@ -149,26 +131,11 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>2.6.4-SNAPSHOT</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>2.6.4-SNAPSHOT</version>
- </dependency-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>2.6.4-SNAPSHOT</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>2.6.4-SNAPSHOT</version>
- </dependency-->
- <!--dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.6.4-SNAPSHOT</version>
- </dependency-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
