cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r757304 - in /cxf/branches/2.1.x-fixes: ./ pom.xml rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java systests/pom.xml
Date Mon, 23 Mar 2009 03:00:28 GMT
Author: ningjiang
Date: Mon Mar 23 03:00:27 2009
New Revision: 757304

URL: http://svn.apache.org/viewvc?rev=757304&view=rev
Log:
Merged revisions 756966,757303 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r756966 | bimargulies | 2009-03-22 00:29:29 +0800 (Sun, 22 Mar 2009) | 2 lines
  
  Turn the systests back on.
........
  r757303 | ningjiang | 2009-03-23 10:41:34 +0800 (Mon, 23 Mar 2009) | 1 line
  
  Upgraded the maven-resources-plugin version
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/pom.xml
    cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
  (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
  (props changed)
    cxf/branches/2.1.x-fixes/systests/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/pom.xml?rev=757304&r1=757303&r2=757304&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/pom.xml Mon Mar 23 03:00:27 2009
@@ -425,7 +425,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
            ('svn:mergeinfo' removed)

Modified: cxf/branches/2.1.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/pom.xml?rev=757304&r1=757303&r2=757304&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/pom.xml Mon Mar 23 03:00:27 2009
@@ -38,12 +38,10 @@
 	  <plugins>
 		<plugin>
 			<artifactId>maven-resources-plugin</artifactId>
-			<version>2.3</version>
 			<executions>
 				<execution>
 					<id>copy-resources</id>
-					<!-- here the phase you need -->
-					<phase>process-test-resources</phase>
+					<phase>validate</phase>
 					<goals>
 						<goal>copy-resources</goal>
 					</goals>
@@ -61,20 +59,9 @@
 					</configuration>
 				</execution>
 			</executions>
-		</plugin>
+	    </plugin>
 	
-       
-	   <!--  resources>
-		  <resource>
-			<targetPath>${basedir}/target/test-classes/schemaorg_apache_xmlbeans</targetPath>
-			<directory>${basedir}/target/generated/src/test/java/schemaorg_apache_xmlbeans</directory>
-			<includes>
-				<include> **/*.xsb </include>
-				<include> **/*.class </include>
-			</includes>
-		  </resource>
-	    </resources> 
-        <plugins-->
+        
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>



Mime
View raw message