Author: ningjiang
Date: Tue Nov 16 09:06:48 2010
New Revision: 1035560
URL: http://svn.apache.org/viewvc?rev=1035560&view=rev
Log:
Merged revisions 1035559 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1035559 | ningjiang | 2010-11-16 16:59:02 +0800 (Tue, 16 Nov 2010) | 1 line
CXF-3126 fix the issue of mvn -Pserver in CXF examples
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1035559
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 16 09:06:48 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022155,1022157-1023401,1023420-1030540,1030542-1031074,1031076-1033529,1033531,1033533-1033888,1033890-1033925,1033927-1034174,1034637,1035203,1035206,1035220,1035302,1035377,1035391,1035428
+/cxf/trunk:1-1022155,1022157-1023401,1023420-1030540,1030542-1031074,1031076-1033529,1033531,1033533-1033888,1033890-1033925,1033927-1034174,1034637,1035203,1035206,1035220,1035302,1035377,1035391,1035428,1035559
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/pom.xml?rev=1035560&r1=1035559&r2=1035560&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/java_first_jms/pom.xml
Tue Nov 16 09:06:48 2010
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<phase>test</phase>
@@ -89,7 +88,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<phase>test</phase>
Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1035560&r1=1035559&r2=1035560&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml Tue
Nov 16 09:06:48 2010
@@ -122,6 +122,11 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
