Author: jdcasey
Date: Fri May 27 15:45:32 2011
New Revision: 1128370
URL: http://svn.apache.org/viewvc?rev=1128370&view=rev
Log:
Cleaning up BOMs, adding mae-prompter-cli to BOMs.
Modified:
maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml
maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml
maven/sandbox/trunk/mae/mae-app/pom.xml
maven/sandbox/trunk/mae/mae-booter/pom.xml
maven/sandbox/trunk/mae/mae-container/pom.xml
maven/sandbox/trunk/mae/mae-prompter-cli/pom.xml
maven/sandbox/trunk/mae/pom.xml
Modified: maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml (original)
+++ maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml Fri May 27 15:45:32 2011
@@ -42,20 +42,28 @@
</dependency>
<dependency>
+ <groupId>org.apache.maven.mae</groupId>
+ <artifactId>mae-prompter-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- <dependency>
<groupId>org.apache.maven.mae.event</groupId>
<artifactId>mae-event-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency> -->
+
<dependency>
<groupId>org.apache.maven.mae</groupId>
<artifactId>mae-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+
+ <!-- <dependency>
<groupId>org.apache.maven.mae.event</groupId>
<artifactId>mae-resolver-events</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -115,25 +123,6 @@
<version>2.0</version>
</dependency>
<!-- /END infra requirements -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mae.components</groupId>
- <artifactId>mae-project-tools</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mae.components</groupId>
- <artifactId>mae-autoboxing-version-range</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
Modified: maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml (original)
+++ maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml Fri May 27 15:45:32
2011
@@ -42,6 +42,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.mae</groupId>
+ <artifactId>mae-prompter-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- <dependency>
<groupId>org.apache.maven.mae.event</groupId>
<artifactId>mae-resolver-events</artifactId>
@@ -119,24 +125,13 @@
<version>1.2.12</version>
<scope>provided</scope>
</dependency>
- <!-- /END infra requirements -->
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0</version>
+ <scope>provided</scope>
</dependency>
+ <!-- /END infra requirements -->
</dependencies>
</dependencyManagement>
</project>
Modified: maven/sandbox/trunk/mae/mae-app/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-app/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-app/pom.xml (original)
+++ maven/sandbox/trunk/mae/mae-app/pom.xml Fri May 27 15:45:32 2011
@@ -63,9 +63,5 @@
<artifactId>mae-booter</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
</project>
Modified: maven/sandbox/trunk/mae/mae-booter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/pom.xml (original)
+++ maven/sandbox/trunk/mae/mae-booter/pom.xml Fri May 27 15:45:32 2011
@@ -76,10 +76,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
Modified: maven/sandbox/trunk/mae/mae-container/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-container/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-container/pom.xml (original)
+++ maven/sandbox/trunk/mae/mae-container/pom.xml Fri May 27 15:45:32 2011
@@ -62,10 +62,6 @@
<scope>provided</scope>
</dependency> -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.6</version>
Modified: maven/sandbox/trunk/mae/mae-prompter-cli/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-prompter-cli/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-prompter-cli/pom.xml (original)
+++ maven/sandbox/trunk/mae/mae-prompter-cli/pom.xml Fri May 27 15:45:32 2011
@@ -16,6 +16,12 @@
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>0.9.94</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.mae</groupId>
Modified: maven/sandbox/trunk/mae/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/pom.xml?rev=1128370&r1=1128369&r2=1128370&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/pom.xml (original)
+++ maven/sandbox/trunk/mae/pom.xml Fri May 27 15:45:32 2011
@@ -45,6 +45,26 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.commonjava.atservice</groupId>
+ <artifactId>atservice-annotation</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.commonjava.atservice</groupId>
+ <artifactId>atservice-processor</artifactId>
+ <version>0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<properties>
<mavenVersion>3.0.3</mavenVersion>
<plexusVersion>1.5.5</plexusVersion>
@@ -65,20 +85,6 @@
<url>http://svn.apache.org/viewvc/maven/sandbox/trunk/mae</url>
</scm>
- <dependencies>
- <dependency>
- <groupId>org.commonjava.atservice</groupId>
- <artifactId>atservice-annotation</artifactId>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>org.commonjava.atservice</groupId>
- <artifactId>atservice-processor</artifactId>
- <version>0.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
<build>
<resources>
<resource>
