Merge 2.0-maven branch into trunk.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1199 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/pom.xml b/pom.xml
index 72d149d..6be83e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,30 +1,20 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.google.inject</groupId>
+ <parent>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice-parent</artifactId>
+ <version>2.0</version>
+ </parent>
<artifactId>guice</artifactId>
<packaging>jar</packaging>
- <version>1.0-RC2</version>
- <name>guice</name>
- <url>http://maven.apache.org</url>
+ <!-- Note: this pom is for dependency management only. It will not build the project -->
<dependencies>
+ <!-- CGLib is not listed because it has been repackaged with JarJar -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>