diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 113 |
1 files changed, 75 insertions, 38 deletions
@@ -22,7 +22,7 @@ limitations under the License. <groupId>com.google.gerrit</groupId> <artifactId>gerrit-parent</artifactId> <packaging>pom</packaging> - <version>2.5-SNAPSHOT</version> + <version>2.6</version> <name>Gerrit Code Review - Parent</name> <url>http://code.google.com/p/gerrit/</url> @@ -46,14 +46,15 @@ limitations under the License. </issueManagement> <properties> - <jgitVersion>2.0.0.201206130900-r.24-g6cc51a5</jgitVersion> - <gwtormVersion>1.4</gwtormVersion> + <jgitVersion>2.3.1.201302201838-r.209-g18030f9</jgitVersion> + <gwtormVersion>1.6</gwtormVersion> <gwtjsonrpcVersion>1.3</gwtjsonrpcVersion> - <gwtexpuiVersion>1.2.6</gwtexpuiVersion> - <gwtVersion>2.4.0</gwtVersion> + <gwtexpuiVersion>1.3.2</gwtexpuiVersion> + <gwtVersion>2.5.0</gwtVersion> + <bouncyCastleVersion>140</bouncyCastleVersion> <slf4jVersion>1.6.1</slf4jVersion> <guiceVersion>3.0</guiceVersion> - <jettyVersion>7.2.1.v20101111</jettyVersion> + <jettyVersion>8.1.7.v20120910</jettyVersion> <gwt.compileReport>false</gwt.compileReport> @@ -76,6 +77,7 @@ limitations under the License. <module>gerrit-common</module> <module>gerrit-cache-h2</module> <module>gerrit-httpd</module> + <module>gerrit-gwtui</module> <module>gerrit-launcher</module> <module>gerrit-main</module> <module>gerrit-openid</module> @@ -87,24 +89,29 @@ limitations under the License. <module>gerrit-gwtdebug</module> <module>gerrit-war</module> + <module>gerrit-acceptance-tests</module> <module>gerrit-extension-api</module> - - <module>gerrit-gwtui</module> + <module>gerrit-plugin-api</module> + <module>gerrit-plugin-archetype</module> + <module>gerrit-plugin-gwtui</module> + <module>gerrit-plugin-js-archetype</module> + <module>gerrit-plugin-gwt-archetype</module> </modules> <profiles> <profile> - <id>all</id> - <modules> - <module>gerrit-plugin-api</module> - <module>gerrit-plugin-archetype</module> - </modules> - </profile> - <profile> + <id>plugins</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!gerrit.plugins.skip</name> + </property> </activation> - <id>no-plugins</id> + <modules> + <!-- CORE PLUGIN LIST --> + <module>plugins/commit-message-length-validator</module> + <module>plugins/replication</module> + <module>plugins/reviewnotes</module> + </modules> </profile> </profiles> @@ -369,7 +376,13 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <version>2.5.1</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.13</version> </plugin> <plugin> @@ -381,7 +394,7 @@ limitations under the License. <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>2.4.0</version> + <version>2.5.0</version> </plugin> <plugin> @@ -409,7 +422,10 @@ limitations under the License. </goals> </pluginExecutionFilter> <action> - <ignore/> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> </action> </pluginExecution> <pluginExecution> @@ -422,7 +438,10 @@ limitations under the License. </goals> </pluginExecutionFilter> <action> - <ignore/> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> </action> </pluginExecution> </pluginExecutions> @@ -446,9 +465,9 @@ limitations under the License. <extensions> <extension> - <groupId>net.anzix.aws</groupId> - <artifactId>s3-maven-wagon</artifactId> - <version>3.2</version> + <groupId>com.googlesource.gerrit</groupId> + <artifactId>gs-maven-wagon</artifactId> + <version>3.3</version> </extension> </extensions> </build> @@ -478,7 +497,7 @@ limitations under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>12.0.1</version> + <version>14.0</version> </dependency> <dependency> @@ -563,7 +582,7 @@ limitations under the License. <dependency> <groupId>org.apache.sshd</groupId> <artifactId>sshd-core</artifactId> - <version>0.5.1-r1095809</version> + <version>0.6.0</version> </dependency> <dependency> @@ -688,7 +707,13 @@ limitations under the License. <dependency> <groupId>bouncycastle</groupId> <artifactId>bcpg-jdk15</artifactId> - <version>140</version> + <version>${bouncyCastleVersion}</version> + </dependency> + + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>${bouncyCastleVersion}</version> </dependency> <dependency> @@ -761,19 +786,19 @@ limitations under the License. <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>4.11</version> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.147</version> + <version>1.3.168</version> </dependency> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.0-801.jdbc4</version> + <version>9.1-901-1.jdbc4</version> </dependency> <dependency> @@ -783,8 +808,8 @@ limitations under the License. <exclusions> <exclusion> <!-- use Apache javax.servlet not CDDL --> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> </exclusion> </exclusions> </dependency> @@ -802,6 +827,12 @@ limitations under the License. </dependency> <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <version>7.0.32</version> + </dependency> + + <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> <version>${gwtVersion}</version> @@ -826,7 +857,7 @@ limitations under the License. </dependency> <dependency> - <groupId>com.google.gerrit</groupId> + <groupId>com.googlecode.juniversalchardet</groupId> <artifactId>juniversalchardet</artifactId> <version>1.0.3</version> </dependency> @@ -848,6 +879,17 @@ limitations under the License. <artifactId>pegdown</artifactId> <version>1.1.0</version> </dependency> + + <dependency> + <groupId>org.parboiled</groupId> + <artifactId>parboiled-core</artifactId> + <version>1.1.3</version> + </dependency> + <dependency> + <groupId>org.parboiled</groupId> + <artifactId>parboiled-java</artifactId> + <version>1.1.3</version> + </dependency> </dependencies> </dependencyManagement> @@ -868,11 +910,6 @@ limitations under the License. </repository> <repository> - <id>objectweb-repository</id> - <url>http://maven.objectweb.org/maven2/</url> - </repository> - - <repository> <id>clojars-repo</id> <url>http://clojars.org/repo</url> </repository> |