cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1405983 - in /cxf/build-utils/trunk: ./ buildtools/ xml2fastinfoset-plugin/ xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/ xml2fastinfoset-plugin/src/main/resources/ xml2fastinfoset-plugin/src/main/resour...
Date Mon, 05 Nov 2012 22:03:21 GMT
Author: dkulp
Date: Mon Nov  5 22:03:20 2012
New Revision: 1405983

URL: http://svn.apache.org/viewvc?rev=1405983&view=rev
Log:
Add m2e lifecyle stuff

Added:
    cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/
    cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/
    cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/m2e/
    cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
Modified:
    cxf/build-utils/trunk/buildtools/pom.xml
    cxf/build-utils/trunk/pom.xml
    cxf/build-utils/trunk/xml2fastinfoset-plugin/pom.xml
    cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
    cxf/build-utils/trunk/xml2fastinfoset-test/pom.xml

Modified: cxf/build-utils/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/buildtools/pom.xml?rev=1405983&r1=1405982&r2=1405983&view=diff
==============================================================================
--- cxf/build-utils/trunk/buildtools/pom.xml (original)
+++ cxf/build-utils/trunk/buildtools/pom.xml Mon Nov  5 22:03:20 2012
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.cxf.build-utils</groupId>
         <artifactId>cxf-build-utils</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -68,14 +68,14 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>1.3.2</version>
+            <version>2.0</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>pmd</groupId>
             <artifactId>pmd</artifactId>
-            <version>4.2</version>
+            <version>4.3</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: cxf/build-utils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/pom.xml?rev=1405983&r1=1405982&r2=1405983&view=diff
==============================================================================
--- cxf/build-utils/trunk/pom.xml (original)
+++ cxf/build-utils/trunk/pom.xml Mon Nov  5 22:03:20 2012
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.build-utils</groupId>
     <artifactId>cxf-build-utils</artifactId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <name>Apache CXF Build Utilities</name>
     <url>http://cxf.apache.org</url>
     <packaging>pom</packaging>
@@ -175,7 +175,7 @@
                  <plugin>
                      <groupId>org.apache.maven.plugins</groupId>
                      <artifactId>maven-resources-plugin</artifactId>
-                     <version>2.3</version>
+                     <version>2.4</version>
                      <configuration>
                          <encoding>UTF-8</encoding>
                      </configuration>

Modified: cxf/build-utils/trunk/xml2fastinfoset-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/xml2fastinfoset-plugin/pom.xml?rev=1405983&r1=1405982&r2=1405983&view=diff
==============================================================================
--- cxf/build-utils/trunk/xml2fastinfoset-plugin/pom.xml (original)
+++ cxf/build-utils/trunk/xml2fastinfoset-plugin/pom.xml Mon Nov  5 22:03:20 2012
@@ -21,12 +21,11 @@
     <parent>
          <groupId>org.apache.cxf.build-utils</groupId>
          <artifactId>cxf-build-utils</artifactId>
-         <version>2.4.2-SNAPSHOT</version>
+         <version>2.5.0-SNAPSHOT</version>
      </parent>
 
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf.build-utils</groupId>
     <artifactId>cxf-xml2fastinfoset-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Apache CXF XML to FastInfoset Maven2 Plugin</name>
@@ -50,7 +49,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
+            <version>4.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -59,6 +58,13 @@
             <version>2.0.9</version>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.sonatype.plexus</groupId>
+            <artifactId>plexus-build-api</artifactId>
+            <version>0.0.7</version>
+            <optional>true</optional>
+        </dependency>        
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
@@ -74,12 +80,12 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>1.0.4</version>
+            <version>2.0.5</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.12</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java?rev=1405983&r1=1405982&r2=1405983&view=diff
==============================================================================
--- cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
(original)
+++ cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
Mon Nov  5 22:03:20 2012
@@ -35,6 +35,7 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.sonatype.plexus.build.incremental.BuildContext;
 import org.xml.sax.SAXException;
 
 import com.sun.xml.fastinfoset.sax.SAXDocumentSerializer;
@@ -44,6 +45,7 @@ import org.apache.maven.plugin.AbstractM
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.Scanner;
 
 /**
  * Compile XML resources to FastInfoset XML resources.
@@ -93,6 +95,10 @@ public class XML2FastInfosetCompilerMojo
      * @required
      */
     private File outputDirectory;
+    
+    /** @component */
+    protected BuildContext buildContext;
+        
 
     @SuppressWarnings("unchecked")
     public void execute() throws MojoExecutionException {
@@ -111,10 +117,8 @@ public class XML2FastInfosetCompilerMojo
                 continue;
             }
 
+            Scanner scanner = buildContext.newScanner(resourceDirectory);
 
-            DirectoryScanner scanner = new DirectoryScanner();
-
-            scanner.setBasedir(resourceDirectory);
             if (includes != null && !includes.isEmpty()) {
                 scanner.setIncludes((String[])includes.toArray(EMPTY_STRING_ARRAY));
             } else {
@@ -166,6 +170,7 @@ public class XML2FastInfosetCompilerMojo
                 } catch (Exception e) {
                     throw new MojoExecutionException("Error copying resource " + source,
e);
                 }
+                buildContext.refresh(destinationFile);
             }
 
         }

Added: cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml?rev=1405983&view=auto
==============================================================================
--- cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
(added)
+++ cxf/build-utils/trunk/xml2fastinfoset-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
Mon Nov  5 22:03:20 2012
@@ -0,0 +1,17 @@
+<lifecycleMappingMetadata>
+  <pluginExecutions>
+    <pluginExecution>
+      <pluginExecutionFilter>
+        <goals>
+          <goal>xml2fastinfoset</goal>
+        </goals>
+      </pluginExecutionFilter>
+      <action>
+        <execute>
+          <runOnIncremental>true</runOnIncremental>
+          <runOnConfiguration>true</runOnConfiguration>
+        </execute>
+      </action>
+    </pluginExecution>
+</lifecycleMappingMetadata>
+

Modified: cxf/build-utils/trunk/xml2fastinfoset-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/build-utils/trunk/xml2fastinfoset-test/pom.xml?rev=1405983&r1=1405982&r2=1405983&view=diff
==============================================================================
--- cxf/build-utils/trunk/xml2fastinfoset-test/pom.xml (original)
+++ cxf/build-utils/trunk/xml2fastinfoset-test/pom.xml Mon Nov  5 22:03:20 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf.build-utils</groupId>
         <artifactId>cxf-build-utils</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>4.4</version>
+            <version>4.11-beta-1</version>
         </dependency>
     </dependencies>
     <build>
@@ -57,4 +57,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message