cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1411329 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/js_browser_client_java_first/ distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/ distribution/src/main/release/samples/js_...
Date Mon, 19 Nov 2012 17:46:45 GMT
Author: gmazza
Date: Mon Nov 19 17:46:44 2012
New Revision: 1411329

URL: http://svn.apache.org/viewvc?rev=1411329&view=rev
Log:
Merged revisions 1411327 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1411327 | gmazza | 2012-11-19 12:45:18 -0500 (Mon, 19 Nov 2012) | 1 line
  
  Updated sample to remove antrun plugin.
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/
      - copied from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
      - copied unchanged from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/
      - copied from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/Beverages.html
      - copied unchanged from r1411327, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/staticContent/Beverages.html
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/staticContent/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/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/js_browser_client_java_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml?rev=1411329&r1=1411328&r2=1411329&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
Mon Nov 19 17:46:44 2012
@@ -42,24 +42,6 @@
                     <target>1.5</target>
                 </configuration>
             </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}/staticContent/Beverages.html" todir="${basedir}/target/classes/staticContent"
/>
-                                <copy file="${basedir}/cxf.xml" todir="${basedir}/target/classes/"
/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -111,7 +93,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.0.6.RELEASE</version>
         </dependency>
     </dependencies>
 </project>



Mime
View raw message