diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 122 |
1 files changed, 88 insertions, 34 deletions
@@ -22,7 +22,7 @@ limitations under the License. <groupId>com.google.gerrit</groupId> <artifactId>gerrit-parent</artifactId> <packaging>pom</packaging> - <version>2.1-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> <name>Gerrit Code Review - Parent</name> <url>http://code.google.com/p/gerrit/</url> @@ -46,13 +46,13 @@ limitations under the License. </issueManagement> <properties> - <jgitVersion>0.12.1.54-gd4e3301</jgitVersion> - <gwtormVersion>1.1.5</gwtormVersion> - <gwtjsonrpcVersion>1.2.3</gwtjsonrpcVersion> - <gwtexpuiVersion>1.2.2</gwtexpuiVersion> - <gwtVersion>2.1.1</gwtVersion> + <jgitVersion>1.3.0.201202151440-r.76-gc3fca97</jgitVersion> + <gwtormVersion>1.4</gwtormVersion> + <gwtjsonrpcVersion>1.3</gwtjsonrpcVersion> + <gwtexpuiVersion>1.2.5</gwtexpuiVersion> + <gwtVersion>2.3.0</gwtVersion> <slf4jVersion>1.6.1</slf4jVersion> - <guiceVersion>2.0</guiceVersion> + <guiceVersion>3.0</guiceVersion> <jettyVersion>7.2.1.v20101111</jettyVersion> <gwt.compileReport>false</gwt.compileReport> @@ -74,9 +74,11 @@ limitations under the License. <module>gerrit-antlr</module> <module>gerrit-common</module> + <module>gerrit-ehcache</module> <module>gerrit-httpd</module> <module>gerrit-launcher</module> <module>gerrit-main</module> + <module>gerrit-openid</module> <module>gerrit-pgm</module> <module>gerrit-prettify</module> <module>gerrit-reviewdb</module> @@ -324,6 +326,12 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>1.4</version> </plugin> @@ -355,13 +363,53 @@ limitations under the License. <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>2.1.0-1</version> + <version>2.3.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.6</version> + <version>1.5</version> + </plugin> + + <!--This plugin's configuration is used to store Eclipse + m2e settings only. It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>run</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore/> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>add-source</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> </plugin> </plugins> </pluginManagement> @@ -376,19 +424,6 @@ limitations under the License. <encoding>UTF-8</encoding> </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -451,6 +486,11 @@ limitations under the License. <type>pom</type> <exclusions> <exclusion> + <!-- conflicts with our use of guice 3.0 --> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + </exclusion> + <exclusion> <!-- jug-1.1 is LGPL, and the source has been lost --> <groupId>jug</groupId> <artifactId>jug</artifactId> @@ -486,7 +526,7 @@ limitations under the License. <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.44</version> + <version>0.1.44-1</version> </dependency> <dependency> @@ -508,19 +548,33 @@ limitations under the License. </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + <classifier>sources</classifier> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <version>${guiceVersion}</version> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-servlet</artifactId> <version>${guiceVersion}</version> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-assistedinject</artifactId> <version>${guiceVersion}</version> </dependency> @@ -533,12 +587,6 @@ limitations under the License. </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>1.6</version> - </dependency> - - <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> <version>2.2</version> @@ -749,7 +797,13 @@ limitations under the License. <dependency> <groupId>dk.brics.automaton</groupId> <artifactId>automaton</artifactId> - <version>1.11.2</version> + <version>1.11.8</version> + </dependency> + + <dependency> + <groupId>com.googlecode.prolog-cafe</groupId> + <artifactId>PrologCafe</artifactId> + <version>1.3</version> </dependency> </dependencies> </dependencyManagement> @@ -767,7 +821,7 @@ limitations under the License. <repository> <id>gson</id> - <url>http://google-gson.googlecode.com/svn/mavenrepo/</url> + <url>https://google-gson.googlecode.com/svn/mavenrepo/</url> </repository> <repository> |