diff -Nru gmaven-1.4/gmaven-examples/clean-maven-plugin/pom.xml gmaven-1.4-gil/gmaven-examples/clean-maven-plugin/pom.xml --- gmaven-1.4/gmaven-examples/clean-maven-plugin/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-examples/clean-maven-plugin/pom.xml 2012-07-24 17:38:24.737695695 +0200 @@ -29,7 +29,7 @@ <artifactId>clean-maven-plugin</artifactId> <name>GMaven Examples :: Clean Maven Plugin</name> - <packaging>maven-plugin</packaging> + <packaging>jar</packaging> <description> Cleans up generated build artifacts. diff -Nru gmaven-1.4/gmaven-examples/install-maven-plugin/pom.xml gmaven-1.4-gil/gmaven-examples/install-maven-plugin/pom.xml --- gmaven-1.4/gmaven-examples/install-maven-plugin/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-examples/install-maven-plugin/pom.xml 2012-07-24 17:38:24.741695499 +0200 @@ -29,7 +29,7 @@ <artifactId>install-maven-plugin</artifactId> <name>GMaven Examples :: Install Maven Plugin</name> - <packaging>maven-plugin</packaging> + <packaging>jar</packaging> <description> Install artifacts into the local repository. diff -Nru gmaven-1.4/gmaven-examples/pom.xml gmaven-1.4-gil/gmaven-examples/pom.xml --- gmaven-1.4/gmaven-examples/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-examples/pom.xml 2012-07-24 17:38:24.715696773 +0200 @@ -73,7 +73,7 @@ <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> <configuration> - <providerSelection>1.5</providerSelection> + <providerSelection>1.8</providerSelection> </configuration> </plugin> </plugins> diff -Nru gmaven-1.4/gmaven-mojo/pom.xml gmaven-1.4-gil/gmaven-mojo/pom.xml --- gmaven-1.4/gmaven-mojo/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-mojo/pom.xml 2012-07-24 17:42:25.985869552 +0200 @@ -46,7 +46,7 @@ <dependency> <groupId>org.codehaus.gmaven.runtime</groupId> - <artifactId>gmaven-runtime-1.5</artifactId> + <artifactId>gmaven-runtime-1.8</artifactId> </dependency> <dependency> @@ -74,7 +74,7 @@ <goal>testCompile</goal> </goals> <configuration> - <providerSelection>1.5</providerSelection> + <providerSelection>1.8</providerSelection> </configuration> </execution> </executions> diff -Nru gmaven-1.4/gmaven-mojo-support/pom.xml gmaven-1.4-gil/gmaven-mojo-support/pom.xml --- gmaven-1.4/gmaven-mojo-support/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-mojo-support/pom.xml 2012-07-24 18:40:35.667497402 +0200 @@ -46,6 +46,43 @@ <plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> + <configuration> + <providerSelection>1.8</providerSelection> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.gmaven.runtime</groupId> + <artifactId>gmaven-runtime-1.8</artifactId> + <version>1.4</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>1.8.6</version> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-all</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </dependency> + </dependencies> <executions> <execution> <goals> diff -Nru gmaven-1.4/gmaven-plugin/pom.xml gmaven-1.4-gil/gmaven-plugin/pom.xml --- gmaven-1.4/gmaven-plugin/pom.xml 2012-07-24 18:43:27.740016184 +0200 +++ gmaven-1.4-gil/gmaven-plugin/pom.xml 2012-07-24 17:43:36.173428287 +0200 @@ -61,7 +61,7 @@ <!-- For build ordering (for IT) --> <dependency> <groupId>org.codehaus.gmaven.runtime</groupId> - <artifactId>gmaven-runtime-1.5</artifactId> + <artifactId>gmaven-runtime-1.8</artifactId> <scope>provided</scope> </dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/compile-1/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/compile-1/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/compile-1/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/compile-1/pom.xml 2012-07-24 17:38:24.673698832 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> </dependencies> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/compile-4/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/compile-4/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/compile-4/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/compile-4/pom.xml 2012-07-24 17:38:24.673698832 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> </dependencies> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/generate-stubs-1/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/generate-stubs-1/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/generate-stubs-1/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/generate-stubs-1/pom.xml 2012-07-24 17:38:24.674698783 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> </dependencies> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/generate-stubs-2/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/generate-stubs-2/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/generate-stubs-2/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/generate-stubs-2/pom.xml 2012-07-24 17:38:24.674698783 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> </dependencies> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/mixed-compile-1/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/mixed-compile-1/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/mixed-compile-1/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/mixed-compile-1/pom.xml 2012-07-24 17:38:24.675698734 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> <dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/mixed-compile-2/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/mixed-compile-2/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/mixed-compile-2/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/mixed-compile-2/pom.xml 2012-07-24 17:38:24.675698734 +0200 @@ -38,7 +38,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> <dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/mixed-compile-3/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/mixed-compile-3/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/mixed-compile-3/pom.xml 2012-01-05 06:14:47.000000000 +0100 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/mixed-compile-3/pom.xml 2012-07-24 17:38:24.676698685 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> <dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/test-compile-1/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/test-compile-1/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/test-compile-1/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/test-compile-1/pom.xml 2012-07-24 17:38:24.676698685 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> <scope>test</scope> </dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/test-compile-2/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/test-compile-2/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/test-compile-2/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/test-compile-2/pom.xml 2012-07-24 17:38:24.677698636 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> <scope>test</scope> </dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/compile/test-compile-3/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/compile/test-compile-3/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/compile/test-compile-3/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/compile/test-compile-3/pom.xml 2012-07-24 17:38:24.677698636 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> <scope>test</scope> </dependency> diff -Nru gmaven-1.4/gmaven-plugin/src/it/plexus-descriptor-1/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/plexus-descriptor-1/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/plexus-descriptor-1/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/plexus-descriptor-1/pom.xml 2012-07-24 17:38:24.678698586 +0200 @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> </dependencies> diff -Nru gmaven-1.4/gmaven-plugin/src/it/script-libraries/library/pom.xml gmaven-1.4-gil/gmaven-plugin/src/it/script-libraries/library/pom.xml --- gmaven-1.4/gmaven-plugin/src/it/script-libraries/library/pom.xml 2011-09-26 04:39:28.000000000 +0200 +++ gmaven-1.4-gil/gmaven-plugin/src/it/script-libraries/library/pom.xml 2012-07-24 17:38:24.678698586 +0200 @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> </dependency> </dependencies> diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.5/pom.xml gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.5/pom.xml --- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.5/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.5/pom.xml 2012-07-24 17:38:24.679698537 +0200 @@ -52,7 +52,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> + <artifactId>groovy</artifactId> <version>1.5.8</version> </dependency> diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.6/pom.xml gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.6/pom.xml --- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.6/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.6/pom.xml 2012-07-24 17:38:24.679698537 +0200 @@ -52,7 +52,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <version>1.6.9</version> <exclusions> <exclusion> diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.7/pom.xml gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.7/pom.xml --- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.7/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.7/pom.xml 2012-07-24 17:38:24.680698488 +0200 @@ -52,7 +52,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <version>1.7.10</version> <exclusions> <exclusion> diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.8/pom.xml gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.8/pom.xml --- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.8/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.8/pom.xml 2012-07-24 17:38:24.680698488 +0200 @@ -52,7 +52,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <version>1.8.5</version> <exclusions> <exclusion> diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-2.0/pom.xml gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-2.0/pom.xml --- gmaven-1.4/gmaven-runtime/gmaven-runtime-2.0/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-2.0/pom.xml 2012-07-24 17:38:24.680698488 +0200 @@ -52,7 +52,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <version>2.0.0-beta-2</version> <exclusions> <exclusion> diff -Nru gmaven-1.4/gmaven-runtime/pom.xml gmaven-1.4-gil/gmaven-runtime/pom.xml --- gmaven-1.4/gmaven-runtime/pom.xml 2012-07-24 18:43:27.745015938 +0200 +++ gmaven-1.4-gil/gmaven-runtime/pom.xml 2012-07-24 17:50:34.996888036 +0200 @@ -39,7 +39,7 @@ <modules> <module>gmaven-runtime-api</module> <module>gmaven-runtime-support</module> - <module>gmaven-runtime-1.5</module> + <module>gmaven-runtime-1.8</module> <module>gmaven-runtime-loader</module> </modules> @@ -80,8 +80,8 @@ <jdk>1.5</jdk> </activation> <modules> - <module>gmaven-runtime-1.6</module> - <module>gmaven-runtime-1.7</module> + <!--module>gmaven-runtime-1.6</module> + <module>gmaven-runtime-1.7</module--> <module>gmaven-runtime-1.8</module> <!--module>gmaven-runtime-2.0</module--> </modules> @@ -92,8 +92,8 @@ <jdk>1.6</jdk> </activation> <modules> - <module>gmaven-runtime-1.6</module> - <module>gmaven-runtime-1.7</module> + <!--module>gmaven-runtime-1.6</module> + <module>gmaven-runtime-1.7</module--> <module>gmaven-runtime-1.8</module> <!--module>gmaven-runtime-2.0</module--> </modules> @@ -104,8 +104,8 @@ <jdk>1.7</jdk> </activation> <modules> - <module>gmaven-runtime-1.6</module> - <module>gmaven-runtime-1.7</module> + <!--module>gmaven-runtime-1.6</module> + <module>gmaven-runtime-1.7</module--> <module>gmaven-runtime-1.8</module> <!--module>gmaven-runtime-2.0</module--> </modules> diff -Nru gmaven-1.4/gmaven-support/filter-plugin/pom.xml gmaven-1.4-gil/gmaven-support/filter-plugin/pom.xml --- gmaven-1.4/gmaven-support/filter-plugin/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/gmaven-support/filter-plugin/pom.xml 2012-07-24 17:38:24.690697997 +0200 @@ -27,7 +27,7 @@ <artifactId>filter-plugin</artifactId> <name>GMaven Support :: Filter Plugin</name> - <packaging>maven-plugin</packaging> + <packaging>jar</packaging> <description> Custom Maven filtering. @@ -36,7 +36,7 @@ <dependencies> <dependency> <groupId>org.codehaus.gmaven.runtime</groupId> - <artifactId>gmaven-runtime-1.6</artifactId> + <artifactId>gmaven-runtime-1.8</artifactId> <scope>provided</scope> </dependency> @@ -95,8 +95,42 @@ <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> <configuration> - <providerSelection>1.6</providerSelection> + <providerSelection>1.8</providerSelection> </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.gmaven.runtime</groupId> + <artifactId>gmaven-runtime-1.8</artifactId> + <version>1.4</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>1.8.6</version> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-all</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </dependency> + </dependencies> <executions> <execution> <goals> diff -Nru gmaven-1.4/groovy-maven-plugin/pom.xml gmaven-1.4-gil/groovy-maven-plugin/pom.xml --- gmaven-1.4/groovy-maven-plugin/pom.xml 2012-01-06 03:15:21.000000000 +0100 +++ gmaven-1.4-gil/groovy-maven-plugin/pom.xml 2012-07-24 18:43:09.548912787 +0200 @@ -87,7 +87,43 @@ <plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> - + <configuration> + <providerSelection>1.8</providerSelection> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.gmaven.runtime</groupId> + <artifactId>gmaven-runtime-1.8</artifactId> + <version>1.4</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>1.8.6</version> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-all</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </dependency> + </dependencies> <executions> <execution> <phase>process-classes</phase> diff -Nru gmaven-1.4/pom.xml gmaven-1.4-gil/pom.xml --- gmaven-1.4/pom.xml 2012-07-24 18:43:27.751015642 +0200 +++ gmaven-1.4-gil/pom.xml 2012-07-24 17:39:51.621436987 +0200 @@ -368,7 +368,7 @@ <version>${project.version}</version> </dependency> - <dependency> + <!--dependency> <groupId>org.codehaus.gmaven.runtime</groupId> <artifactId>gmaven-runtime-1.5</artifactId> <version>${project.version}</version> @@ -384,7 +384,7 @@ <groupId>org.codehaus.gmaven.runtime</groupId> <artifactId>gmaven-runtime-1.7</artifactId> <version>${project.version}</version> - </dependency> + </dependency--> <dependency> <groupId>org.codehaus.gmaven.runtime</groupId> @@ -434,7 +434,7 @@ <module>gmaven-mojo-support</module> <module>gmaven-archetypes</module> <module>gmaven-examples</module> - <module>gmaven-testsuite</module> + <!--module>gmaven-testsuite</module--> <module>groovy-maven-plugin</module> </modules> @@ -713,8 +713,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.4</source> - <target>1.4</target> + <source>1.5</source> + <target>1.5</target> </configuration> </plugin> </plugins>