myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1408319 - 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
Date Mon, 12 Nov 2012 15:23:12 GMT
Author: lofwyr
Date: Mon Nov 12 15:23:10 2012
New Revision: 1408319

URL: http://svn.apache.org/viewvc?rev=1408319&view=rev
Log:
TOBAGO-1211: Build fails using JDK 1.7

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=1408319&r1=1408318&r2=1408319&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Mon Nov 12 15:23:10 2012
@@ -762,7 +762,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>apt-maven-plugin</artifactId>
-          <version>1.0-alpha-3</version>
+          <version>1.0-alpha-5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1408319&r1=1408318&r2=1408319&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Mon Nov 12 15:23:10 2012
@@ -63,7 +63,7 @@
 -->
               </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-tld</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-tld</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
               <nocompile>true</nocompile>
               <encoding>${maven.compile.encoding}</encoding>
@@ -84,7 +84,7 @@
                 <exclude>org/apache/myfaces/tobago/internal/taglib/component/package-info.java</exclude>
               </excludes>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-component</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-component</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.CreateComponentAnnotationProcessorFactory</factory>
               <fork>true</fork>
               <nocompile>true</nocompile>
@@ -112,7 +112,7 @@
                 <exclude>org/apache/myfaces/tobago/component/*</exclude>
               </excludes>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-faces-config</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-faces-config</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.FacesConfigAnnotationProcessorFactory</factory>
               <fork>true</fork>
               <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=1408319&r1=1408318&r2=1408319&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml Mon Nov 12 15:23:10
2012
@@ -51,7 +51,7 @@
                 <outputFile>tobago-sandbox.taglib.xml</outputFile>
               </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>target/generated-sources</outputDirectory>
+              <sourceOutputDirectory>target/generated-sources</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
               <nocompile>true</nocompile>
               <encoding>${maven.compile.encoding}</encoding>

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=1408319&r1=1408318&r2=1408319&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml Mon Nov 12 15:23:10 2012
@@ -87,7 +87,7 @@
                 <outputFile>tobago.taglib.xml</outputFile>
               </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-sources</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
               <nocompile>true</nocompile>
               <encoding>${maven.compile.encoding}</encoding>
@@ -95,6 +95,28 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-taglib</id>
+            <goals><goal>copy-resources</goal></goals>
+            <phase>process-classes</phase>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <targetPath>META-INF</targetPath>
+                  <directory>${project.build.directory}/generated-sources</directory>
+                  <includes>
+                    <include>tobago.taglib.xml</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

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=1408319&r1=1408318&r2=1408319&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Mon Nov 12 15:23:10 2012
@@ -94,7 +94,7 @@
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
               </additionalSourceRoots>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-tld</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-tld</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
               <nocompile>true</nocompile>
               <encoding>${maven.compile.encoding}</encoding>
@@ -120,7 +120,7 @@
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
               </additionalSourceRoots>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-component</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-component</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.CreateComponentAnnotationProcessorFactory</factory>
               <fork>true</fork>
               <nocompile>true</nocompile>
@@ -152,7 +152,7 @@
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
               </additionalSourceRoots>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-faces-config</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-faces-config</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.FacesConfigAnnotationProcessorFactory</factory>
               <!--<force>true</force>-->
               <fork>true</fork>

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=1408319&r1=1408318&r2=1408319&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml Mon Nov 12 15:23:10
2012
@@ -88,7 +88,7 @@
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
               </additionalSourceRoots>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-tld</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-tld</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.TaglibAnnotationProcessorFactory</factory>
               <nocompile>true</nocompile>
               <encoding>${maven.compile.encoding}</encoding>
@@ -106,7 +106,7 @@
                 <outputFile>checkstyle-tobago.xml</outputFile>
               </outputFiles>
               <resourceTargetPath>META-INF</resourceTargetPath>
-              <outputDirectory>${project.build.directory}/generated-checkstyle-config</outputDirectory>
+              <sourceOutputDirectory>${project.build.directory}/generated-checkstyle-config</sourceOutputDirectory>
               <factory>org.apache.myfaces.tobago.apt.CheckstyleConfigAnnotationProcessorFactory</factory>
               <additionalSourceRoots>
                 <additionalSourceRoot>${project.build.directory}/tobago-core-sources</additionalSourceRoot>
@@ -122,8 +122,31 @@
         <executions>
           <execution>
             <id>copy-tld</id>
-            <goals><goal>resources</goal></goals>
+            <goals><goal>copy-resources</goal></goals>
             <phase>process-classes</phase>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <targetPath>META-INF</targetPath>
+                  <directory>${project.build.directory}/generated-tld</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-checkstyle-config</id>
+            <goals><goal>copy-resources</goal></goals>
+            <phase>process-classes</phase>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <targetPath>META-INF</targetPath>
+                  <directory>${project.build.directory}/generated-checkstyle-config</directory>
+                </resource>
+              </resources>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -201,7 +224,7 @@
                   <outputFiles>
                     <outputFile>org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.xml</outputFile>
                   </outputFiles>
-                  <outputDirectory>${project.build.directory}/doc</outputDirectory>
+                  <sourceOutputDirectory>${project.build.directory}/doc</sourceOutputDirectory>
                   <factory>org.apache.myfaces.tobago.apt.TobagoAnnotationProcessorFactory</factory>
                   <nocompile>true</nocompile>
                   <encoding>${maven.compile.encoding}</encoding>



Mime
View raw message