Permalink
Browse files

initial changes to get the maven plugin working with Grails 2.0 build…

… snapshots
  • Loading branch information...
1 parent a7fbe33 commit 5f789f8d582845f099464c1ed50617c4427d7eb8 Graeme Rocher committed Aug 30, 2011
Showing with 94 additions and 28 deletions.
  1. +80 −21 grails-maven-plugin.iml
  2. +14 −7 pom.xml
View
@@ -1,30 +1,89 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target/classes" />
- <excludeFolder url="file://$MODULE_DIR$/target/generated-resources" />
- <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
- <excludeFolder url="file://$MODULE_DIR$/target/plexus-home" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
- <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/.idea" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" exported="" name="Maven: org.apache.maven:maven-model:2.0.7" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.apache.maven:maven-project:2.0.7" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.apache.maven:maven-plugin-api:2.0.7" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.apache.maven:maven-archiver:2.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-utils:1.4.5" level="project" />
- <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-plugin-testing-harness:1.1" level="project" />
- <orderEntry type="library" name="Maven: xmlunit:xmlunit:1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.grails:grails-bootstrap:1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.grails:grails-scripts:1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.grails:grails-maven-archetype:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.grails:grails-bootstrap:1.4.0.BUILD-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: org.grails:grails-core:1.4.0.BUILD-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.grails:grails-spring:1.4.0.BUILD-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: oro:oro:2.0.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: xalan:serializer:2.7.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.java-persistence:jpa-api:2.0-cr-1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.1.0.M1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework:spring-jms:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.6.8" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context-support:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.6.8" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aspects:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-test:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:3.1.0.M1" level="project" />
+ <orderEntry type="library" name="Maven: rome:rome:0.9" level="project" />
+ <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.grails:grails-scripts:1.4.0.BUILD-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.grails:grails-maven-archetype:1.4.0.BUILD-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-model:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.4.5" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-project:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="library" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-profile:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact-manager:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-registry:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:2.0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.maven:maven-archiver:2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-archiver:1.0-alpha-7" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.shared:maven-plugin-testing-harness:1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-core:2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-file:1.0-alpha-5" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-parameter-documenter:2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-lightweight:1.0-alpha-5" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.reporting:maven-reporting-api:2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: doxia:doxia-sink-api:1.0-alpha-4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-error-diagnostics:2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-cli:commons-cli:1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-descriptor:2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-interactivity-api:1.0-alpha-4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-monitor:2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-ssh:1.0-alpha-5" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.jcraft:jsch:0.1.23" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: xmlunit:xmlunit:1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-jdk14:1.5.8" level="project" />
</component>
-</module>
+</module>
+
View
21 pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.grails</groupId>
<artifactId>grails-maven-plugin</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven plugin for GRAILS applications</name>
@@ -32,7 +32,7 @@
<maven.version>2.0.5</maven.version>
<!-- Dependencies -->
- <grails.version>1.4.0.BUILD-SNAPSHOT</grails.version>
+ <grails.version>2.0.0.BUILD-SNAPSHOT</grails.version>
<grails-bootstrap.version>${grails.version}</grails-bootstrap.version>
<grails-core.version>${grails.version}</grails-core.version>
<grails-scripts.version>${grails.version}</grails-scripts.version>
@@ -44,12 +44,12 @@
<maven-archiver.version>2.2</maven-archiver.version>
<plexus-utils.version>1.4.5</plexus-utils.version>
<junit.version>3.8.2</junit.version>
- <spring.version>3.0.3.RELEASE</spring.version>
- <slf4j.version>1.5.8</slf4j.version>
+ <spring.version>3.1.0.M2</spring.version>
+ <slf4j.version>1.6.1</slf4j.version>
<maven-plugin-testing-harness.version>1.1</maven-plugin-testing-harness.version>
<xmlunit.version>1.0</xmlunit.version>
- <aspectjweaver.version>1.6.8</aspectjweaver.version>
- <aspectjrt.version>1.6.8</aspectjrt.version>
+ <aspectjweaver.version>1.6.10</aspectjweaver.version>
+ <aspectjrt.version>1.6.10</aspectjrt.version>
<!-- Reporting plugins -->
<maven-project-info-reports-plugin.version>2.0.1</maven-project-info-reports-plugin.version>
@@ -89,6 +89,13 @@
<version>${grails-scripts.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.grails</groupId>
+ <artifactId>grails-resources</artifactId>
+ <version>${grails-scripts.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!--
Required by the "create-pom" goal because it contains the
@@ -175,7 +182,7 @@
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>

0 comments on commit 5f789f8

Please sign in to comment.