diff options
| author | sberlin@gmail.com <sberlin@gmail.com@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-08-01 19:49:16 +0000 |
|---|---|---|
| committer | sberlin@gmail.com <sberlin@gmail.com@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-08-01 19:49:16 +0000 |
| commit | 255af73bfde9c7d1ee5933adc82940988a002fb1 (patch) | |
| tree | 0a0de19d5d374709c4965ef5db98cfc000cca831 /pom.xml | |
| parent | aef524a6376eb8189d685d358a8e225cd42397a3 (diff) | |
| download | guice-255af73bfde9c7d1ee5933adc82940988a002fb1.tar.gz | |
Merge 2.0-maven branch into trunk.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1199 d779f126-a31b-0410-b53b-1d3aecad763e
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 34 |
1 files changed, 12 insertions, 22 deletions
@@ -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> |