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 2014/10/02 09:38:43 UTC

svn commit: r1628901 - in /myfaces/tobago/branches/tobago-3.0.x: pom.xml tobago-example/pom.xml tobago-example/tobago-example-addressbook/pom.xml tobago-example/tobago-example-test/pom.xml

Author: lofwyr
Date: Thu Oct  2 07:38:43 2014
New Revision: 1628901

URL: http://svn.apache.org/r1628901
Log:
update surefire plugin version

Modified:
    myfaces/tobago/branches/tobago-3.0.x/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/pom.xml?rev=1628901&r1=1628900&r2=1628901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/pom.xml Thu Oct  2 07:38:43 2014
@@ -817,7 +817,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.12.4</version>
           <configuration>
             <!--
             <childDelegation>false</childDelegation>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml?rev=1628901&r1=1628900&r2=1628901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml Thu Oct  2 07:38:43 2014
@@ -44,6 +44,7 @@
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
+        <!--<groupId>org.eclipse.jetty</groupId>-->
         <artifactId>jetty-maven-plugin</artifactId>
         <configuration>
           <!--
@@ -78,7 +79,9 @@
       <plugins>
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
+          <!--<groupId>org.eclipse.jetty</groupId>-->
           <artifactId>jetty-maven-plugin</artifactId>
+          <!--<version>9.2.2.v20140723</version>-->
           <!--<version>9.1.1.v20140108</version>-->
           <!--<version>9.1.0.v20131115</version>-->
           <version>8.1.15.v20140411</version>
@@ -87,7 +90,34 @@
             <webAppConfig>
               <overrideDescriptor>${override-web-xml}</overrideDescriptor>
             </webAppConfig>
+<!--
+            <systemProperties>
+              <systemProperty>
+                <name>logback.configurationFile</name>
+                <value>/Users/lofwyr/t/logback.xml</value>
+              </systemProperty>
+              <systemProperty>
+                <name>java.util.logging.config.file</name>
+                <value>logging.properties</value>
+              </systemProperty>
+            </systemProperties>
+-->
           </configuration>
+<!--
+          <dependencies>
+            <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>jul-to-slf4j</artifactId>
+              <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>ch.qos.logback</groupId>
+              <artifactId>logback-classic</artifactId>
+              <version>${logback.version}</version>
+              <scope>runtime</scope>
+            </dependency>
+          </dependencies>
+-->
         </plugin>
       </plugins>
     </pluginManagement>
@@ -173,6 +203,7 @@
         <plugins>
           <plugin>
             <groupId>org.mortbay.jetty</groupId>
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <artifactId>jetty-maven-plugin</artifactId>
             <configuration>
               <connectors>
@@ -379,6 +410,11 @@
 
     <profile>
       <id>liberty</id>
+<!--
+      <properties>
+        <jsf>provided</jsf>
+      </properties>
+-->
       <build>
         <plugins>
           <plugin>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml?rev=1628901&r1=1628900&r2=1628901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml Thu Oct  2 07:38:43 2014
@@ -54,6 +54,7 @@
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
+        <!--<groupId>org.eclipse.jetty</groupId>-->
         <artifactId>jetty-maven-plugin</artifactId>
         <configuration>
           <loginServices>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml?rev=1628901&r1=1628900&r2=1628901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml Thu Oct  2 07:38:43 2014
@@ -229,6 +229,7 @@
           -->
           <plugin>
             <groupId>org.mortbay.jetty</groupId>
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <artifactId>jetty-maven-plugin</artifactId>
             <configuration>
               <connectors>