[exo-jcr-commits] exo-jcr SVN: r5352 - in core/branches/EXOJCR-1694: exo.core.component.organization.jdbc and 3 other directories.

[do-not-reply at jboss.org]

Author: aheritier
Date: 2011-12-26 06:51:02 -0500 (Mon, 26 Dec 2011)
New Revision: 5352

Added:
   core/branches/EXOJCR-1694/exo.core.component.organization.tests/src/test/
Removed:
   core/branches/EXOJCR-1694/exo.core.component.organization.tests/src/main/
Modified:
   core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml
   core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml
   core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml
   core/branches/EXOJCR-1694/pom.xml
Log:
EXOJCR-1694 : Deploy a jar with tests sources from exo.core.component.organization.tests to reuse it in others tests

Modified: core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml	2011-12-26 11:48:43 UTC (rev 5351)
+++ core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml	2011-12-26 11:51:02 UTC (rev 5352)
@@ -81,7 +81,7 @@
       <dependency>
          <groupId>org.exoplatform.core</groupId>
          <artifactId>exo.core.component.organization.tests</artifactId>
-         <classifier>sources</classifier>
+         <classifier>test-sources</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -184,7 +184,7 @@
                         <artifactItem>
                            <groupId>org.exoplatform.core</groupId>
                            <artifactId>exo.core.component.organization.tests</artifactId>
-                           <classifier>sources</classifier>
+                           <classifier>test-sources</classifier>
                            <type>jar</type>
                            <overWrite>false</overWrite>
                         </artifactItem>

Modified: core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml	2011-12-26 11:48:43 UTC (rev 5351)
+++ core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml	2011-12-26 11:51:02 UTC (rev 5352)
@@ -70,7 +70,7 @@
       <dependency>
          <groupId>org.exoplatform.core</groupId>
          <artifactId>exo.core.component.organization.tests</artifactId>
-         <classifier>sources</classifier>
+         <classifier>test-sources</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -104,7 +104,7 @@
                        <artifactItem>
                           <groupId>org.exoplatform.core</groupId>
                           <artifactId>exo.core.component.organization.tests</artifactId>
-                          <classifier>sources</classifier>
+                          <classifier>test-sources</classifier>
                           <type>jar</type>
                           <overWrite>false</overWrite>
                        </artifactItem>

Modified: core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml
===================================================================
--- core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml	2011-12-26 11:48:43 UTC (rev 5351)
+++ core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml	2011-12-26 11:51:02 UTC (rev 5352)
@@ -32,35 +32,27 @@
 
    <name>eXo Core :: Component :: Organization Service Tests</name>
    <description>Create an Organisation Service TCK package</description>
+
+   <properties>
+      <!-- We don't want to compile them here -->
+      <maven.test.skip>true</maven.test.skip>
+   </properties>
    
    <build>
       <plugins>
-         <!-- 
-         To avoid test sources compilation we simply exclude them
-         -->
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <excludes> 
-                  <exclude>**/*.*</exclude> 
-               </excludes>
-            </configuration>
-         </plugin>
          <!--
-         Configure maven-source-plugin to add sources packed
+         Configure maven-source-plugin to add test sources packed
          in jar files to maven artifact
          -->
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.1.2</version>
             <executions>
                <execution>
                   <id>attach-sources</id>
-                  <phase>verify</phase>
+                  <phase>package</phase>
                   <goals>
-                     <goal>jar-no-fork</goal>
+                     <goal>test-jar-no-fork</goal>
                   </goals>
                </execution>
             </executions>

Modified: core/branches/EXOJCR-1694/pom.xml
===================================================================
--- core/branches/EXOJCR-1694/pom.xml	2011-12-26 11:48:43 UTC (rev 5351)
+++ core/branches/EXOJCR-1694/pom.xml	2011-12-26 11:51:02 UTC (rev 5352)
@@ -40,6 +40,9 @@
       
       <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
       <org.exoplatform.kernel.version>2.3.6-GA-SNAPSHOT</org.exoplatform.kernel.version>
+
+      <!-- Plugins updates -->
+      <version.source.plugin>2.1.2</version.source.plugin>
    </properties>
 
    <scm>
@@ -131,7 +134,7 @@
             <groupId>org.exoplatform.core</groupId>
             <artifactId>exo.core.component.organization.tests</artifactId>
             <version>${project.version}</version>
-            <classifier>sources</classifier>
+            <classifier>test-sources</classifier>
             <scope>test</scope>
          </dependency>