commit 01b3d87f10444b44ce06a24ba3bd0057b2711cda
author Edwin Kempin <edwin.kempin@gmail.com> Mon Oct 22 03:47:46 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 22 03:47:47 2012 -0700
tree 5e886312d856d6596280388832e3f8a73cb718b7
parent 8941eb6707456797dbc15e472b859e7310ccf0d7
parent 36e093f22da4670096ca2fe3a791ee2a72529572

Merge "Allow web UI plugins to auto-register"

gerrit-gwtdebug/pom.xml

diff --git a/gerrit-gwtdebug/pom.xml b/gerrit-gwtdebug/pom.xml
index 7437174..9db434a 100644
--- a/gerrit-gwtdebug/pom.xml
+++ b/gerrit-gwtdebug/pom.xml
@@ -73,14 +73,12 @@
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
-      <version>140</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcpg-jdk15</artifactId>
-      <version>140</version>
       <scope>provided</scope>
     </dependency>
 

gerrit-server/pom.xml

diff --git a/gerrit-server/pom.xml b/gerrit-server/pom.xml
index 2795424..0b13fbd 100644
--- a/gerrit-server/pom.xml
+++ b/gerrit-server/pom.xml
@@ -80,7 +80,6 @@
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcpg-jdk15</artifactId>
-      <version>140</version>
       <scope>provided</scope>
     </dependency>
 

gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java
index d3fa35b..057ce99 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java
@@ -32,6 +32,6 @@
   }
 
   public String required(String name) {
-    return ConfigUtil.getRequired(cfg, null, name);
+    return ConfigUtil.getRequired(cfg, section, name);
   }
 }

gerrit-war/pom.xml

diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml
index b993405..ed473c6 100644
--- a/gerrit-war/pom.xml
+++ b/gerrit-war/pom.xml
@@ -59,14 +59,12 @@
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
-      <version>140</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcpg-jdk15</artifactId>
-      <version>140</version>
       <scope>provided</scope>
     </dependency>
 

pom.xml

diff --git a/pom.xml b/pom.xml
index af02f9f..da02e83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
     <gwtjsonrpcVersion>1.3</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.2.6</gwtexpuiVersion>
     <gwtVersion>2.4.0</gwtVersion>
+    <bouncyCastleVersion>140</bouncyCastleVersion>
     <slf4jVersion>1.6.1</slf4jVersion>
     <guiceVersion>3.0</guiceVersion>
     <jettyVersion>7.2.1.v20101111</jettyVersion>
@@ -684,7 +685,13 @@
       <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>