You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/09/04 17:45:16 UTC
svn commit: r1380688 - in /myfaces/tobago/trunk: pom.xml tobago-theme/tobago-theme-standard/pom.xml tobago-tool/tobago-theme-plugin/pom.xml

Author: lofwyr
Date: Tue Sep  4 15:45:16 2012
New Revision: 1380688

URL: http://svn.apache.org/viewvc?rev=1380688&view=rev
Log:
TOBAGO-1189: Fix checkstyle configuration to enable offline build
 - after releasing org/apache/myfaces/buildtools/checkstyle-rules/6/ we can use it locally.

Modified:
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-theme-plugin/pom.xml

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1380688&r1=1380687&r2=1380688&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Sep  4 15:45:16 2012
@@ -156,9 +156,7 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.7</version>
         <configuration>
-          <configLocation>
-            http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/tobago/checkstyle.xml
-          </configLocation>
+          <configLocation>default/myfaces-checks-standard.xml</configLocation>
           <headerLocation>default/myfaces-header.txt</headerLocation>
           <xrefLocation>xref</xrefLocation>
           <excludes>**/package-info.java</excludes>
@@ -621,15 +619,20 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.7</version>
         <configuration>
-          <configLocation>
-            http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/tobago/checkstyle.xml
-          </configLocation>
+          <configLocation>tobago/checkstyle.xml</configLocation>
           <headerLocation>default/myfaces-header.txt</headerLocation>
           <xrefLocation>xref</xrefLocation>
           <excludes>**/package-info.java</excludes>
           <indentSize>2</indentSize>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.myfaces.buildtools</groupId>
+            <artifactId>checkstyle-rules</artifactId>
+            <version>6</version>
+          </dependency>
+        </dependencies>
       </plugin>
 
       <plugin>
@@ -766,9 +769,7 @@
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>2.7</version>
           <configuration>
-            <configLocation>
-              http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/tobago/checkstyle.xml
-            </configLocation>
+            <configLocation>tobago/checkstyle.xml</configLocation>
             <headerLocation>default/myfaces-header.txt</headerLocation>
             <xrefLocation>xref</xrefLocation>
             <excludes>**/package-info.java</excludes>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1380688&r1=1380687&r2=1380688&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Tue Sep  4 15:45:16 2012
@@ -173,8 +173,17 @@
       <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.apache.myfaces.test</groupId>
+      <artifactId>myfaces-test12</artifactId>
+      <version>${myfaces-test12.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <profiles>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-theme-plugin/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-theme-plugin/pom.xml?rev=1380688&r1=1380687&r2=1380688&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-theme-plugin/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-theme-plugin/pom.xml Tue Sep  4 15:45:16 2012
@@ -68,9 +68,7 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.7</version>
         <configuration>
-          <configLocation>
-            http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/tobago/checkstyle.xml
-          </configLocation>
+          <configLocation>tobago/checkstyle.xml</configLocation>
           <headerLocation>default/myfaces-header.txt</headerLocation>
           <xrefLocation>xref</xrefLocation>
           <excludes>**/package-info.java</excludes>