Clarify that the Maven build requires Maven3 and cleanup temporary CGLIB dependency
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1425 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/core/pom.xml b/core/pom.xml
index 405d18d..615263d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,6 +13,10 @@
<name>Google Guice - Core Library</name>
+ <properties>
+ <cglib.version>2.2.1</cglib.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>javax.inject</groupId>
@@ -24,6 +28,14 @@
<artifactId>aopalliance</artifactId>
<version>1.0</version>
</dependency>
+ <!--
+ | Replace with official CGLIB artifact when it's released
+ -->
+ <dependency>
+ <groupId>org.sonatype.sisu.inject</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject-tck</artifactId>
@@ -160,6 +172,17 @@
<value>!false</value>
</property>
</activation>
+ <dependencies>
+ <!--
+ | Mark as optional: embedded by JarJar
+ -->
+ <dependency>
+ <groupId>org.sonatype.sisu.inject</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
diff --git a/pom.xml b/pom.xml
index ad61fca..0744078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,10 @@
<module>extensions</module>
</modules>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
<properties>
<!--
| The spec version of the public Guice API
@@ -107,15 +111,6 @@
<dependencies>
<!--
- | Replace with official CGLIB artifact when it's released
- -->
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2.1</version>
- <optional>${guice.with.jarjar}</optional>
- </dependency>
- <!--
| Run tests with TestNG
-->
<dependency>