svn commit: r1437746 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/groovy-project-with-new-plexus-compiler/ src/it/groovy-project-with-new-plexus-compiler/src/main/java/ src/it/groovy-project-with-new-plexus-compiler/src/test/java/

[olamy]

Author: olamy
Date: Wed Jan 23 21:27:18 2013
New Revision: 1437746

URL: http://svn.apache.org/viewvc?rev=1437746&view=rev
Log:
improve groovy test

Removed:
    
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaHello.java
    
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaMain.java
    
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/src/test/java/JavaTest.java
Modified:
    maven/plugins/trunk/maven-compiler-plugin/pom.xml
    
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1437746&r1=1437745&r2=1437746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Wed Jan 23 21:27:18 2013
@@ -56,7 +56,9 @@ under the License.
     <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
     <plexusCompilerVersion>2.2-SNAPSHOT</plexusCompilerVersion>
     <groovyVersion>1.8.0</groovyVersion>
-    <groovyEclipseCompilerVersion>2.6.0-01</groovyEclipseCompilerVersion>
+    <groovyEclipseCompilerVersion>2.7.0-01</groovyEclipseCompilerVersion>
+    <groovy-eclipse-batch>2.0.4-04</groovy-eclipse-batch>
+    <openJpaVersion>2.2.0</openJpaVersion>
   </properties>
 
   <dependencies>
@@ -275,10 +277,21 @@ under the License.
         </dependency>
         <dependency>
           <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-eclipse-batch</artifactId>
+          <version>${groovy-eclipse-batch}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
           <artifactId>groovy-all</artifactId>
           <version>${groovyVersion}</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.apache.openjpa</groupId>
+          <artifactId>openjpa</artifactId>
+          <version>${openJpaVersion}</version>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml?rev=1437746&r1=1437745&r2=1437746&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/it/groovy-project-with-new-plexus-compiler/pom.xml
 Wed Jan 23 21:27:18 2013
@@ -25,6 +25,7 @@ xsi:schemaLocation="http://maven.apache.
   <version>1.0-SNAPSHOT</version>
 
   <build>
+    <sourceDirectory>src/main/groovy</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -32,6 +33,11 @@ xsi:schemaLocation="http://maven.apache.
         <version>@project.version@</version>
         <configuration>
           <compilerId>groovy-eclipse-compiler</compilerId>
+          <verbose>true</verbose>
+          <!-- see https://jira.codehaus.org/browse/MCOMPILER-199 -->
+          <includes>
+            <include>**/*.groovy</include>
+          </includes>
         </configuration>
         <dependencies>
           <dependency>
@@ -39,40 +45,29 @@ xsi:schemaLocation="http://maven.apache.
             <artifactId>groovy-eclipse-compiler</artifactId>
             <version>@groovyEclipseCompilerVersion@</version>
           </dependency>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-eclipse-batch</artifactId>
+            <version>@groovy-eclipse-batch@</version>
+          </dependency>
         </dependencies>
       </plugin>
 
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/groovy</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-test-source</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/test/groovy</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-eclipse-compiler</artifactId>
+        <version>@groovyEclipseCompilerVersion@</version>
+        <extensions>true</extensions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-eclipse-batch</artifactId>
+            <version>@groovy-eclipse-batch@</version>
+          </dependency>
+        </dependencies>
       </plugin>
+
+
     </plugins>
   </build>