You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/02/11 10:39:48 UTC
svn commit: r1567017 - in /tomee/tomee/trunk: ./ tomee/
tomee/tomee-webaccess/ tomee/tomee-webaccess/src/main/java/
tomee/tomee-webaccess/src/test/java/
Author: andygumbrecht
Date: Tue Feb 11 09:39:47 2014
New Revision: 1567017
URL: http://svn.apache.org/r1567017
Log:
Replace gmaven with groovy-eclipse-compiler - Gmaven is now only useful for pom scripts.
Added:
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt
tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/
tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt
Modified:
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tomee/build.xml
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1567017&r1=1567016&r2=1567017&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Tue Feb 11 09:39:47 2014
@@ -277,11 +277,6 @@
<artifactId>jslint4java-maven-plugin</artifactId>
<version>2.0.5</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
- </plugin>
</plugins>
</pluginManagement>
Modified: tomee/tomee/trunk/tomee/build.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/build.xml?rev=1567017&r1=1567016&r2=1567017&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/build.xml (original)
+++ tomee/tomee/trunk/tomee/build.xml Tue Feb 11 09:39:47 2014
@@ -19,7 +19,7 @@
<project name="dev-helper" default="web">
<target name="web">
- <copy verbose="true" todir="apache-tomee/target/apache-tomee-webprofile-1.6.0-SNAPSHOT/webapps/tomee">
+ <copy verbose="true" todir="apache-tomee/target/apache-tomee-webprofile-1.6.1-SNAPSHOT/webapps/tomee">
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/>
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/>
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/>
@@ -27,7 +27,7 @@
</target>
<target name="rs">
- <copy verbose="true" todir="apache-tomee/target/apache-tomee-jaxrs-1.6.0-SNAPSHOT/webapps/tomee">
+ <copy verbose="true" todir="apache-tomee/target/apache-tomee-jaxrs-1.6.1-SNAPSHOT/webapps/tomee">
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/>
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/>
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/>
@@ -35,7 +35,7 @@
</target>
<target name="plus">
- <copy verbose="true" todir="apache-tomee/target/apache-tomee-plus-1.6.0-SNAPSHOT/webapps/tomee">
+ <copy verbose="true" todir="apache-tomee/target/apache-tomee-plus-1.6.1-SNAPSHOT/webapps/tomee">
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/>
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/>
<fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1567017&r1=1567016&r2=1567017&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Tue Feb 11 09:39:47 2014
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
- <version>2.1.7</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
<build>
@@ -233,21 +233,23 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <providerSelection>2.0</providerSelection>
+ <compilerId>groovy-eclipse-compiler</compilerId>
+ <verbose>true</verbose>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-compiler</artifactId>
+ <version>2.8.0-01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-batch</artifactId>
+ <version>2.1.8-01</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.openejb.maven</groupId>
@@ -265,7 +267,7 @@
<version>0.18-1</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
- <groovyVersion>2.0.0</groovyVersion>
+ <groovyVersion>2.2.1</groovyVersion>
<codeNarcVersion>0.20</codeNarcVersion>
<maxPriority1Violations>0</maxPriority1Violations>
<maxPriority2Violations>0</maxPriority2Violations>
Added: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt?rev=1567017&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt (added)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt Tue Feb 11 09:39:47 2014
@@ -0,0 +1,6 @@
+If there is at least one file (Java or not) in src/main/java,
+then all files in src/main/groovy will be found.
+If, however, src/main/java is empty, then src/main/groovy will be ignored.
+You can get around this by placing an empty file in src/main/java just so that src/main/groovy
+will be recognized. The same is true for src/test/java and src/test/groovy.
+This is actually a workaround for GRECLIPSE-1221.
\ No newline at end of file
Added: tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt?rev=1567017&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt (added)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt Tue Feb 11 09:39:47 2014
@@ -0,0 +1,6 @@
+If there is at least one file (Java or not) in src/main/java,
+then all files in src/main/groovy will be found.
+If, however, src/main/java is empty, then src/main/groovy will be ignored.
+You can get around this by placing an empty file in src/main/java just so that src/main/groovy
+will be recognized. The same is true for src/test/java and src/test/groovy.
+This is actually a workaround for GRECLIPSE-1221.
\ No newline at end of file
Re: svn commit: r1567017 - in /tomee/tomee/trunk: ./ tomee/
tomee/tomee-webaccess/ tomee/tomee-webaccess/src/main/java/ tomee/tomee-webaccess/src/test/java/
Posted by Thiago Veronezi <th...@veronezi.org>.
Thanks!
On Tue, Feb 11, 2014 at 4:39 AM, <an...@apache.org> wrote:
> Author: andygumbrecht
> Date: Tue Feb 11 09:39:47 2014
> New Revision: 1567017
>
> URL: http://svn.apache.org/r1567017
> Log:
> Replace gmaven with groovy-eclipse-compiler - Gmaven is now only useful
> for pom scripts.
>
> Added:
> tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/
> tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt
> tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/
> tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt
> Modified:
> tomee/tomee/trunk/pom.xml
> tomee/tomee/trunk/tomee/build.xml
> tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
>
> Modified: tomee/tomee/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1567017&r1=1567016&r2=1567017&view=diff
>
> ==============================================================================
> --- tomee/tomee/trunk/pom.xml (original)
> +++ tomee/tomee/trunk/pom.xml Tue Feb 11 09:39:47 2014
> @@ -277,11 +277,6 @@
> <artifactId>jslint4java-maven-plugin</artifactId>
> <version>2.0.5</version>
> </plugin>
> - <plugin>
> - <groupId>org.codehaus.gmaven</groupId>
> - <artifactId>gmaven-plugin</artifactId>
> - <version>1.4</version>
> - </plugin>
> </plugins>
> </pluginManagement>
>
>
> Modified: tomee/tomee/trunk/tomee/build.xml
> URL:
> http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/build.xml?rev=1567017&r1=1567016&r2=1567017&view=diff
>
> ==============================================================================
> --- tomee/tomee/trunk/tomee/build.xml (original)
> +++ tomee/tomee/trunk/tomee/build.xml Tue Feb 11 09:39:47 2014
> @@ -19,7 +19,7 @@
> <project name="dev-helper" default="web">
>
> <target name="web">
> - <copy verbose="true"
> todir="apache-tomee/target/apache-tomee-webprofile-1.6.0-SNAPSHOT/webapps/tomee">
> + <copy verbose="true"
> todir="apache-tomee/target/apache-tomee-webprofile-1.6.1-SNAPSHOT/webapps/tomee">
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.js"/>
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.css"/>
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.html"/>
> @@ -27,7 +27,7 @@
> </target>
>
> <target name="rs">
> - <copy verbose="true"
> todir="apache-tomee/target/apache-tomee-jaxrs-1.6.0-SNAPSHOT/webapps/tomee">
> + <copy verbose="true"
> todir="apache-tomee/target/apache-tomee-jaxrs-1.6.1-SNAPSHOT/webapps/tomee">
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.js"/>
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.css"/>
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.html"/>
> @@ -35,7 +35,7 @@
> </target>
>
> <target name="plus">
> - <copy verbose="true"
> todir="apache-tomee/target/apache-tomee-plus-1.6.0-SNAPSHOT/webapps/tomee">
> + <copy verbose="true"
> todir="apache-tomee/target/apache-tomee-plus-1.6.1-SNAPSHOT/webapps/tomee">
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.js"/>
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.css"/>
> <fileset dir="tomee-webapp/src/main/webapp"
> includes="**/*.html"/>
>
> Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
> URL:
> http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1567017&r1=1567016&r2=1567017&view=diff
>
> ==============================================================================
> --- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
> +++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Tue Feb 11 09:39:47
> 2014
> @@ -193,7 +193,7 @@
> <dependency>
> <groupId>org.codehaus.groovy</groupId>
> <artifactId>groovy-jsr223</artifactId>
> - <version>2.1.7</version>
> + <version>2.2.1</version>
> </dependency>
> </dependencies>
> <build>
> @@ -233,21 +233,23 @@
> </executions>
> </plugin>
> <plugin>
> - <groupId>org.codehaus.gmaven</groupId>
> - <artifactId>gmaven-plugin</artifactId>
> + <artifactId>maven-compiler-plugin</artifactId>
> <configuration>
> - <providerSelection>2.0</providerSelection>
> + <compilerId>groovy-eclipse-compiler</compilerId>
> + <verbose>true</verbose>
> </configuration>
> - <executions>
> - <execution>
> - <goals>
> - <goal>generateStubs</goal>
> - <goal>compile</goal>
> - <goal>generateTestStubs</goal>
> - <goal>testCompile</goal>
> - </goals>
> - </execution>
> - </executions>
> + <dependencies>
> + <dependency>
> + <groupId>org.codehaus.groovy</groupId>
> + <artifactId>groovy-eclipse-compiler</artifactId>
> + <version>2.8.0-01</version>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.groovy</groupId>
> + <artifactId>groovy-eclipse-batch</artifactId>
> + <version>2.1.8-01</version>
> + </dependency>
> + </dependencies>
> </plugin>
> <plugin>
> <groupId>org.apache.openejb.maven</groupId>
> @@ -265,7 +267,7 @@
> <version>0.18-1</version>
> <configuration>
>
> <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
> - <groovyVersion>2.0.0</groovyVersion>
> + <groovyVersion>2.2.1</groovyVersion>
> <codeNarcVersion>0.20</codeNarcVersion>
> <maxPriority1Violations>0</maxPriority1Violations>
> <maxPriority2Violations>0</maxPriority2Violations>
>
> Added: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt
> URL:
> http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt?rev=1567017&view=auto
>
> ==============================================================================
> --- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt
> (added)
> +++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/java/readme.txt Tue
> Feb 11 09:39:47 2014
> @@ -0,0 +1,6 @@
> +If there is at least one file (Java or not) in src/main/java,
> +then all files in src/main/groovy will be found.
> +If, however, src/main/java is empty, then src/main/groovy will be ignored.
> +You can get around this by placing an empty file in src/main/java just so
> that src/main/groovy
> +will be recognized. The same is true for src/test/java and
> src/test/groovy.
> +This is actually a workaround for GRECLIPSE-1221.
> \ No newline at end of file
>
> Added: tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt
> URL:
> http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt?rev=1567017&view=auto
>
> ==============================================================================
> --- tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt
> (added)
> +++ tomee/tomee/trunk/tomee/tomee-webaccess/src/test/java/readme.txt Tue
> Feb 11 09:39:47 2014
> @@ -0,0 +1,6 @@
> +If there is at least one file (Java or not) in src/main/java,
> +then all files in src/main/groovy will be found.
> +If, however, src/main/java is empty, then src/main/groovy will be ignored.
> +You can get around this by placing an empty file in src/main/java just so
> that src/main/groovy
> +will be recognized. The same is true for src/test/java and
> src/test/groovy.
> +This is actually a workaround for GRECLIPSE-1221.
> \ No newline at end of file
>
>
>