You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/06/04 21:16:05 UTC

svn commit: r951534 - in /myfaces/tobago/trunk: pom.xml tobago-core/pom.xml tobago-example/tobago-example-sandbox/pom.xml tobago-extension/tobago-facelets/pom.xml tobago-extension/tobago-sandbox/pom.xml tobago-extension/tobago-taglib-extension/pom.xml

Author: bommel
Date: Fri Jun  4 19:16:05 2010
New Revision: 951534

URL: http://svn.apache.org/viewvc?rev=951534&view=rev
Log:
update apt-maven-plugin and clirr plugin

Modified:
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/tobago-core/pom.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=951534&r1=951533&r2=951534&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Fri Jun  4 19:16:05 2010
@@ -655,7 +655,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>apt-maven-plugin</artifactId>
-          <version>1.0-alpha-2</version>
+          <version>1.0-alpha-3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -780,15 +780,15 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.2</version>
         </plugin>
-        <!--plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.2.1</version>
+          <version>2.2.2</version>
           <configuration>
             <failOnError>false</failOnError>
             <minSeverity>info</minSeverity>
           </configuration>
-        </plugin-->
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>

Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=951534&r1=951533&r2=951534&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Fri Jun  4 19:16:05 2010
@@ -57,10 +57,10 @@
             <goals><goal>process</goal></goals>
             <phase>compile</phase>
             <configuration>
-              <targetFiles>
-                <targetFile>org/apache/myfaces/tobago/internal/taglib/component/tobago.tld</targetFile>
-                <targetFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.tld</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>org/apache/myfaces/tobago/internal/taglib/component/tobago.tld</outputFile>
+                <outputFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.tld</outputFile>
+              </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
               <outputDirectory>target/generated-tld</outputDirectory>
               <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
@@ -99,9 +99,9 @@
             <goals><goal>process</goal></goals>
             <phase>process-classes</phase>
             <configuration>
-              <targetFiles>
-                <targetFile>target/generated-faces-config/faces-config.xml</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>target/generated-faces-config/faces-config.xml</outputFile>
+              </outputFiles>
               <excludes>
                 <exclude>org/apache/myfaces/tobago/util/CommonsLoggingLogger.java</exclude>
                 <exclude>org/apache/myfaces/tobago/application/FopConverter.java</exclude>
@@ -388,10 +388,10 @@
                 <id>tobago-doc</id>
                 <goals><goal>execute</goal></goals>
                 <configuration>
-                  <targetFiles>
-                    <targetFile>org/apache/myfaces/tobago/internal/taglib/component/tobago.xml</targetFile>
-                    <targetFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.xml</targetFile>
-                  </targetFiles>
+                  <outputFiles>
+                    <outputFile>org/apache/myfaces/tobago/internal/taglib/component/tobago.xml</outputFile>
+                    <outputFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.xml</outputFile>
+                  </outputFiles>
                   <generated>${project.build.directory}/doc</generated>
                   <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>
                   <nocompile>true</nocompile>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml?rev=951534&r1=951533&r2=951534&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml Fri Jun  4 19:16:05 2010
@@ -56,9 +56,9 @@
               <additionalSourceRoots>
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
               </additionalSourceRoots>
-              <targetFiles>
-                <targetFile>tobago-sandbox.taglib.xml</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>tobago-sandbox.taglib.xml</outputFile>
+              </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
               <outputDirectory>target/generated-sources</outputDirectory>
               <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml?rev=951534&r1=951533&r2=951534&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml Fri Jun  4 19:16:05 2010
@@ -56,7 +56,7 @@
                 <version>${project.version}</version>
                 <type>jar</type>
                 <classifier>sources</classifier>
-                <includes>org/apache/myfaces/tobago/internal/taglib/declaration/**/*,org/apache/myfaces/tobago/internal/taglib/component/**/*</includes>
+                <includes>org/apache/myfaces/tobago/internal/taglib/declaration/**/*.java,org/apache/myfaces/tobago/internal/taglib/component/**/*.java</includes>
               </artifactItem>
             </artifactItems>
             <outputDirectory>${project.build.directory}/tobago-core-sources</outputDirectory>
@@ -83,9 +83,9 @@
               <additionalSourceRoots>
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
               </additionalSourceRoots>
-              <targetFiles>
-                <targetFile>tobago.taglib.xml</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>tobago.taglib.xml</outputFile>
+              </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
               <outputDirectory>target/generated-sources</outputDirectory>
               <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=951534&r1=951533&r2=951534&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Fri Jun  4 19:16:05 2010
@@ -81,9 +81,9 @@
             <goals><goal>process</goal></goals>
             <phase>generate-resources</phase>
             <configuration>
-              <targetFiles>
-                <targetFile>org/apache/myfaces/tobago/internal/taglib/sandbox/tobago-sandbox.tld</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>org/apache/myfaces/tobago/internal/taglib/sandbox/tobago-sandbox.tld</outputFile>
+              </outputFiles>
               <excludes>
                 <exclude>org/apache/myfaces/tobago/util/CommonsLoggingLogger.java</exclude>
                 <exclude>org/apache/myfaces/tobago/application/FopConverter.java</exclude>
@@ -136,9 +136,9 @@
             <goals><goal>process</goal></goals>
               <phase>process-classes</phase>
             <configuration>
-              <targetFiles>
-                <targetFile>target/generated-faces-config/faces-config.xml</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>target/generated-faces-config/faces-config.xml</outputFile>
+              </outputFiles>
               <excludes>
                 <exclude>org/apache/myfaces/tobago/util/CommonsLoggingLogger.java</exclude>
                 <exclude>org/apache/myfaces/tobago/application/*</exclude>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml?rev=951534&r1=951533&r2=951534&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml Fri Jun  4 19:16:05 2010
@@ -46,7 +46,7 @@
                 <version>${project.version}</version>
                 <type>jar</type>
                 <classifier>sources</classifier>
-                <includes>org/apache/myfaces/tobago/internal/taglib/declaration/**/*,org/apache/myfaces/tobago/internal/taglib/component/**/*</includes>
+                <includes>org/apache/myfaces/tobago/internal/taglib/declaration/**/*.java,org/apache/myfaces/tobago/internal/taglib/component/**/*.java</includes>
               </artifactItem>
             </artifactItems>
             <outputDirectory>${project.build.directory}/tobago-core-sources</outputDirectory>
@@ -78,9 +78,9 @@
             <goals><goal>process</goal></goals>
             <phase>compile</phase>
             <configuration>
-              <targetFiles>
-                <targetFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.tld</targetFile>
-              </targetFiles>
+              <outputFiles>
+                <outputFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.tld</outputFile>
+              </outputFiles>
               <excludes>
                 <exclude>org/apache/myfaces/tobago/internal/taglib/component/*</exclude>
               </excludes>
@@ -181,9 +181,9 @@
                 <id>tobago-doc</id>
                 <goals><goal>execute</goal></goals>
                 <configuration>
-                  <targetFiles>
-                    <targetFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.xml</targetFile>
-                  </targetFiles>
+                  <outputFiles>
+                    <outputFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.xml</outputFile>
+                  </outputFiles>
                   <outputDirectory>${project.build.directory}/doc</outputDirectory>
                   <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>
                   <nocompile>true</nocompile>