incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From piergior...@apache.org
Subject svn commit: r1245683 - in /incubator/lcf/trunk: CHANGES.txt test-materials/alfresco-war/pom.xml tests/alfresco/pom.xml tests/cmis/pom.xml tests/filesystem/pom.xml tests/rss/pom.xml tests/wiki/pom.xml
Date Fri, 17 Feb 2012 17:51:47 GMT
Author: piergiorgio
Date: Fri Feb 17 17:51:47 2012
New Revision: 1245683

URL: http://svn.apache.org/viewvc?rev=1245683&view=rev
Log:
- commit to solve integration tests issue using Maven (CONNECTORS-411)
- upgraded the failsafe plugin to the latest version 2.12
- added the executions in the failsafe plugin for integration tests
- removed the MySQL dependency in the alfresco-war module: not needed

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/test-materials/alfresco-war/pom.xml
    incubator/lcf/trunk/tests/alfresco/pom.xml
    incubator/lcf/trunk/tests/cmis/pom.xml
    incubator/lcf/trunk/tests/filesystem/pom.xml
    incubator/lcf/trunk/tests/rss/pom.xml
    incubator/lcf/trunk/tests/wiki/pom.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Feb 17 17:51:47 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-411: Execution of integration tests from Maven is broken
+(Piergiorgio Lucidi)
+
 CONNECTORS-406: Use MultiThreadedHttpConnection manager in script
 engine and in OpenSearchServer connector.
 (Luca Stancapiano, Karl Wright)

Modified: incubator/lcf/trunk/test-materials/alfresco-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/test-materials/alfresco-war/pom.xml?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/test-materials/alfresco-war/pom.xml (original)
+++ incubator/lcf/trunk/test-materials/alfresco-war/pom.xml Fri Feb 17 17:51:47 2012
@@ -427,7 +427,7 @@
 			</plugin>
 			<plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.10</version>
+        <version>2.12</version>
       </plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -756,13 +756,6 @@
 					</plugin>
 				</plugins>
 			</build>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <version>5.1.18</version>
-                </dependency>
-            </dependencies>
 		</profile>
 	</profiles>
 </project>

Modified: incubator/lcf/trunk/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/alfresco/pom.xml?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/alfresco/pom.xml (original)
+++ incubator/lcf/trunk/tests/alfresco/pom.xml Fri Feb 17 17:51:47 2012
@@ -99,7 +99,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.10</version>
+        <version>2.12</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -116,6 +116,20 @@
           <workingDirectory>target/test-output</workingDirectory>
         <argLine>-Xms512m -Xmx1024m -Xss1024k -XX:MaxPermSize=256m -XX:NewSize=256m</argLine>
         </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: incubator/lcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/pom.xml?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/pom.xml (original)
+++ incubator/lcf/trunk/tests/cmis/pom.xml Fri Feb 17 17:51:47 2012
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.10</version>
+        <version>2.12</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -114,6 +114,20 @@
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: incubator/lcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/pom.xml?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/tests/filesystem/pom.xml Fri Feb 17 17:51:47 2012
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.10</version>
+        <version>2.12</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -88,6 +88,20 @@
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: incubator/lcf/trunk/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/pom.xml?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/rss/pom.xml (original)
+++ incubator/lcf/trunk/tests/rss/pom.xml Fri Feb 17 17:51:47 2012
@@ -88,6 +88,20 @@
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Modified: incubator/lcf/trunk/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/pom.xml?rev=1245683&r1=1245682&r2=1245683&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/pom.xml (original)
+++ incubator/lcf/trunk/tests/wiki/pom.xml Fri Feb 17 17:51:47 2012
@@ -88,6 +88,20 @@
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>



Mime
View raw message