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 15:44:29 UTC
svn commit: r1567158 - in /tomee/tomee/trunk:
arquillian/arquillian-tomee-tests/pom.xml pom.xml
Author: andygumbrecht
Date: Tue Feb 11 14:44:29 2014
New Revision: 1567158
URL: http://svn.apache.org/r1567158
Log:
Upgrade to groovy-maven-plugin
Bump a few versions.
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/pom.xml
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-tests/pom.xml?rev=1567158&r1=1567157&r2=1567158&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-tests/pom.xml Tue Feb 11 14:44:29 2014
@@ -149,7 +149,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<executions>
<execution>
<id>test-tomee-embedded</id>
@@ -183,8 +182,8 @@
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.3</version>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.0</version>
<executions>
<execution>
<id>configure-adapters</id>
@@ -192,33 +191,31 @@
<goals>
<goal>execute</goal>
</goals>
- </execution>
- </executions>
- <configuration>
- <source>
- // goal: manage the profile-under-test property
- // -> set to webprofile use all distributions
- // -> set to jaxrs just jaxrs, plus and plume should be used
- // -> set to plus use only plus
- // -> set to plume use only plume
- def props = project.properties
-
- def skip = props['maven.test.skip']
-
- props['skip.embedded'] = 'true'
- props['skip.remote.webprofile'] = 'true'
- props['skip.remote.jaxrs'] = 'true'
- props['skip.remote.plus'] = 'true'
- props['skip.remote.plume'] = 'true'
- props['skip.webapp.webprofile'] = 'true'
- props['skip.webapp.jaxrs'] = 'true'
- props['skip.webapp.plus'] = 'true'
- props['skip.webapp.plume'] = 'true'
+ <configuration>
+ <source>
+ // goal: manage the profile-under-test property
+ // -> set to webprofile use all distributions
+ // -> set to jaxrs just jaxrs, plus and plume should be used
+ // -> set to plus use only plus
+ // -> set to plume use only plume
+ def props = project.properties
+
+ def skip = props['maven.test.skip']
+
+ props['skip.embedded'] = 'true'
+ props['skip.remote.webprofile'] = 'true'
+ props['skip.remote.jaxrs'] = 'true'
+ props['skip.remote.plus'] = 'true'
+ props['skip.remote.plume'] = 'true'
+ props['skip.webapp.webprofile'] = 'true'
+ props['skip.webapp.jaxrs'] = 'true'
+ props['skip.webapp.plus'] = 'true'
+ props['skip.webapp.plume'] = 'true'
- if ("true" != skip) {
- def minProfile = props['profile-under-test']
+ if ("true" != skip) {
+ def minProfile = props['profile-under-test']
- if ("webprofile" == minProfile) {
+ if ("webprofile" == minProfile) {
props['skip.embedded'] = 'false'
props['skip.remote.webprofile'] = 'false'
props['skip.webapp.webprofile'] = 'false'
@@ -228,7 +225,7 @@
props['skip.webapp.plus'] = 'false'
props['skip.remote.plume'] = 'false'
props['skip.webapp.plume'] = 'false'
- } else if ("jaxrs" == minProfile) {
+ } else if ("jaxrs" == minProfile) {
props['skip.embedded'] = 'false'
props['skip.remote.jaxrs'] = 'false'
props['skip.webapp.jaxrs'] = 'false'
@@ -236,31 +233,34 @@
props['skip.webapp.plus'] = 'false'
props['skip.remote.plume'] = 'false'
props['skip.webapp.plume'] = 'false'
- } else if ("plus" == minProfile) {
+ } else if ("plus" == minProfile) {
props['skip.embedded'] = 'false'
props['skip.remote.plus'] = 'false'
props['skip.webapp.plus'] = 'false'
props['skip.remote.plume'] = 'false'
props['skip.webapp.plume'] = 'false'
- }
- }
+ }
+ }
- println("Embedded adapter activated ? " + !Boolean.parseBoolean(props['skip.embedded']))
- println("Remote webprofile adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.webprofile']))
- println("Remote jaxrs adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.jaxrs']))
- println("Remote plus adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plus']))
- println("Remote plume adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plume']))
- println("Webapp weprofile adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.webprofile']))
- println("Webapp jaxrs adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.jaxrs']))
- println("Webapp plus adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plus']))
- println("Webapp plume adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plume']))
- </source>
- </configuration>
+ println("Embedded adapter activated ? " + !Boolean.parseBoolean(props['skip.embedded']))
+ println("Remote webprofile adapter activated ? " +
+ !Boolean.parseBoolean(props['skip.remote.webprofile']))
+ println("Remote jaxrs adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.jaxrs']))
+ println("Remote plus adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plus']))
+ println("Remote plume adapter activated ? " + !Boolean.parseBoolean(props['skip.remote.plume']))
+ println("Webapp weprofile adapter activated ? " +
+ !Boolean.parseBoolean(props['skip.webapp.webprofile']))
+ println("Webapp jaxrs adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.jaxrs']))
+ println("Webapp plus adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plus']))
+ println("Webapp plume adapter activated ? " + !Boolean.parseBoolean(props['skip.webapp.plume']))
+ </source>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<executions>
<execution>
<id>test-tomee-embedded</id>
@@ -512,7 +512,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<executions>
<execution>
<id>test-tomee-embedded</id>
@@ -689,8 +688,8 @@
-->
<id>glassfish-embedded</id>
<properties>
- <version.glassfish>3.1.2-b16</version.glassfish>
- <version.arquillian.glassfish.embedded>1.0.0.CR2</version.arquillian.glassfish.embedded>
+ <version.glassfish>3.1.2.2</version.glassfish>
+ <version.arquillian.glassfish.embedded>1.0.0.CR4</version.arquillian.glassfish.embedded>
<version.mockito>1.9.0</version.mockito>
<version.maven.embedded.glassfish.plugin>3.1.1</version.maven.embedded.glassfish.plugin>
<version.maven.war.plugin>2.1.1</version.maven.war.plugin>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1567158&r1=1567157&r2=1567158&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Tue Feb 11 14:44:29 2014
@@ -225,12 +225,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.14.1</version>
+ <version>2.16</version>
</plugin>
<plugin> <!-- maven-dependency-plugin:properties doesn't work as well as this one for us -->
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-property-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>