Author: jdcasey
Date: Thu Aug 4 20:30:17 2011
New Revision: 1153997
URL: http://svn.apache.org/viewvc?rev=1153997&view=rev
Log:
removing mae-app, which has been consolidated with mae-booter...and adjusting
to use sisu variant that supports ComponentSelector and InstanceRegistry -
remapping components at the application entry point.
Added:
maven/sandbox/trunk/mae/boms/
- copied from r1153537, maven/sandbox/trunk/mae/boms/
maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml
- copied, changed from r1153542,
maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml
Modified:
maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml
maven/sandbox/trunk/mae/mae-booter/pom.xml
maven/sandbox/trunk/mae/pom.xml
Copied: maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml (from r1153542,
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?p2=maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml&p1=maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml&r1=1153542&r2=1153997&rev=1153997&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml (original)
+++ maven/sandbox/trunk/mae/boms/mae-app-bom/pom.xml Thu Aug 4 20:30:17 2011
@@ -47,12 +47,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- <version>2.1.1-selectable-1-SNAPSHOT</version>
- </dependency>
-
<!-- <dependency>
<groupId>org.apache.maven.mae.event</groupId>
<artifactId>mae-event-api</artifactId>
@@ -119,6 +113,11 @@
<!-- NOTE: These MUST be provided by mae infrastructure! -->
<dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-inject-plexus</artifactId>
+ <version>${sisuVersion}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
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=1153997&r1=1153537&r2=1153997&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml (original)
+++ maven/sandbox/trunk/mae/boms/mae-library-bom/pom.xml Thu Aug 4 20:30:17
2011
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
- <version>2.1.1-selectable-1-SNAPSHOT</version>
+ <version>${sisuVersion}</version>
</dependency>
<!-- <dependency>
<groupId>org.apache.maven.mae.event</groupId>
Modified: maven/sandbox/trunk/mae/mae-booter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/pom.xml?rev=1153997&r1=1153996&r2=1153997&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/pom.xml (original)
+++ maven/sandbox/trunk/mae/mae-booter/pom.xml Thu Aug 4 20:30:17 2011
@@ -78,7 +78,6 @@
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
- <version>2.1.1-selectable-1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: maven/sandbox/trunk/mae/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/pom.xml?rev=1153997&r1=1153996&r2=1153997&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/pom.xml (original)
+++ maven/sandbox/trunk/mae/pom.xml Thu Aug 4 20:30:17 2011
@@ -69,13 +69,13 @@
<maeVersion>${project.version}</maeVersion>
<mavenVersion>3.0.3</mavenVersion>
<plexusVersion>1.5.5</plexusVersion>
+ <sisuVersion>2.1.1-selectable-1</sisuVersion>
</properties>
<modules>
<module>mae-boms</module>
<module>mae-api</module>
<module>mae-booter</module>
- <module>mae-app</module>
<module>mae-prompter-cli</module>
<module>mae-components</module>
</modules>
