You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/01/28 11:42:28 UTC

svn commit: r1064623 - in /openwebbeans/branches/owb_1.0.x: pom.xml samples/ejb-sample/pom.xml samples/ejb-telephone/pom.xml samples/jsf2sample/pom.xml samples/tomcat-sample/pom.xml samples/tomcat7-sample/pom.xml

Author: struberg
Date: Fri Jan 28 10:42:27 2011
New Revision: 1064623

URL: http://svn.apache.org/viewvc?rev=1064623&view=rev
Log:
fix broken build with maven3

* use maven-checkstyle-plugin-2.6
* use owb-checkstyle-rules-1.1
* fixate versions of tomcat-maven-plugin

Modified:
    openwebbeans/branches/owb_1.0.x/pom.xml
    openwebbeans/branches/owb_1.0.x/samples/ejb-sample/pom.xml
    openwebbeans/branches/owb_1.0.x/samples/ejb-telephone/pom.xml
    openwebbeans/branches/owb_1.0.x/samples/jsf2sample/pom.xml
    openwebbeans/branches/owb_1.0.x/samples/tomcat-sample/pom.xml
    openwebbeans/branches/owb_1.0.x/samples/tomcat7-sample/pom.xml

Modified: openwebbeans/branches/owb_1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/pom.xml?rev=1064623&r1=1064622&r2=1064623&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/pom.xml (original)
+++ openwebbeans/branches/owb_1.0.x/pom.xml Fri Jan 28 10:42:27 2011
@@ -311,7 +311,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.6</version>
                 <executions>
                   <execution>
                     <id>verify-style</id>
@@ -327,7 +327,7 @@
                     <dependency>
                         <groupId>org.apache.openwebbeans.build-tools</groupId>
                         <artifactId>checkstyle-rules</artifactId>
-                        <version>1.0.0</version>
+                        <version>1.1</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: openwebbeans/branches/owb_1.0.x/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/samples/ejb-sample/pom.xml?rev=1064623&r1=1064622&r2=1064623&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/samples/ejb-sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.0.x/samples/ejb-sample/pom.xml Fri Jan 28 10:42:27 2011
@@ -38,6 +38,7 @@ under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.1</version>
                 <configuration>
                     <url>http://localhost:8080/manager</url>
                 </configuration>

Modified: openwebbeans/branches/owb_1.0.x/samples/ejb-telephone/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/samples/ejb-telephone/pom.xml?rev=1064623&r1=1064622&r2=1064623&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/samples/ejb-telephone/pom.xml (original)
+++ openwebbeans/branches/owb_1.0.x/samples/ejb-telephone/pom.xml Fri Jan 28 10:42:27 2011
@@ -38,6 +38,7 @@ under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.1</version>
                 <configuration>
                     <url>http://localhost:8080/manager</url>
                 </configuration>

Modified: openwebbeans/branches/owb_1.0.x/samples/jsf2sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/samples/jsf2sample/pom.xml?rev=1064623&r1=1064622&r2=1064623&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/samples/jsf2sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.0.x/samples/jsf2sample/pom.xml Fri Jan 28 10:42:27 2011
@@ -111,15 +111,14 @@ under the License.
     <build>
         <finalName>jsf2sample</finalName>
         <plugins>
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>tomcat-maven-plugin</artifactId>
-                                        <configuration>
-                                <url>http://localhost:8080/manager/text</url>
-                                </configuration>
-                        </plugin>
-            
-            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.1</version>
+                <configuration>
+                    <url>http://localhost:8080/manager/text</url>
+                </configuration>
+            </plugin>            
         </plugins>
     </build>
 

Modified: openwebbeans/branches/owb_1.0.x/samples/tomcat-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/samples/tomcat-sample/pom.xml?rev=1064623&r1=1064622&r2=1064623&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/samples/tomcat-sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.0.x/samples/tomcat-sample/pom.xml Fri Jan 28 10:42:27 2011
@@ -96,6 +96,7 @@ under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.1</version>
                 <configuration>
                     <url>http://localhost:8080/manager</url>
                 </configuration>

Modified: openwebbeans/branches/owb_1.0.x/samples/tomcat7-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/samples/tomcat7-sample/pom.xml?rev=1064623&r1=1064622&r2=1064623&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/samples/tomcat7-sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.0.x/samples/tomcat7-sample/pom.xml Fri Jan 28 10:42:27 2011
@@ -90,6 +90,7 @@ under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.1</version>
                 <configuration>
                     <url>http://localhost:8080/manager/text</url>
                 </configuration>