Merge "Resolve Bug:623 : Generate private key using bouncycastle."
authorTony Tkacik <ttkacik@cisco.com>
Tue, 8 Apr 2014 09:59:15 +0000 (09:59 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 8 Apr 2014 09:59:15 +0000 (09:59 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml
opendaylight/distribution/opendaylight/pom.xml

index 1e06679a3b9e929dc77ba5061db02c6aa3dcda11,1a068eca693261b051fb5b86a38a748958313899..3690b8542bc0d5b867fdc0a5bcc42a62fa99bf19
            <artifactId>config-persister-api</artifactId>
            <version>${config.version}</version>
          </dependency>
 -        <dependency>
 -          <groupId>org.opendaylight.controller</groupId>
 -          <artifactId>config-persister-file-adapter</artifactId>
 -          <version>${config.version}</version>
 -        </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>config-persister-file-xml-adapter</artifactId>
            <version>${config.version}</version>
          </dependency>
 -        <dependency>
 -          <groupId>org.opendaylight.controller</groupId>
 -          <artifactId>config-persister-directory-adapter</artifactId>
 -          <version>${config.version}</version>
 -        </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>config-persister-directory-xml-adapter</artifactId>
            <version>${config.version}</version>
          </dependency>
 -        <dependency>
 -          <groupId>org.opendaylight.controller</groupId>
 -          <artifactId>config-persister-directory-autodetect-adapter</artifactId>
 -          <version>${config.version}</version>
 -        </dependency>
  
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
              <artifactId>configuration</artifactId>
              <version>${configuration.version}</version>
            </dependency>
+             <dependency>
+                 <groupId>org.bouncycastle</groupId>
+                 <artifactId>bcprov-jdk15on</artifactId>
+                 <version>1.50</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.bouncycastle</groupId>
+                 <artifactId>bcpkix-jdk15on</artifactId>
+                 <version>1.50</version>
+             </dependency>
      </dependencies>
    </dependencyManagement>
  
index a6d1019c42f03da052a5012047d83c201059bfa1,8a9318ea0be1c310939d706837776d886057af16..776fb7a0f6816b7de10b41b087739a71f482bbd9
                      <groupId>org.opendaylight.controller</groupId>
                      <artifactId>config-persister-api</artifactId>
                  </dependency>
 -                <dependency>
 -                    <groupId>org.opendaylight.controller</groupId>
 -                    <artifactId>config-persister-file-adapter</artifactId>
 -                </dependency>
                  <dependency>
                      <groupId>org.opendaylight.controller</groupId>
                      <artifactId>config-persister-file-xml-adapter</artifactId>
                  </dependency>
 -                <dependency>
 -                    <groupId>org.opendaylight.controller</groupId>
 -                    <artifactId>config-persister-directory-adapter</artifactId>
 -                </dependency>
                  <dependency>
                      <groupId>org.opendaylight.controller</groupId>
                      <artifactId>config-persister-directory-xml-adapter</artifactId>
                  </dependency>
 -                <dependency>
 -                    <groupId>org.opendaylight.controller</groupId>
 -                    <artifactId>config-persister-directory-autodetect-adapter</artifactId>
 -                </dependency>
  
                  <dependency>
                      <groupId>org.opendaylight.controller</groupId>
                      <artifactId>org.apache.xml.resolver</artifactId>
                      <version>1.2.0</version>
                  </dependency>
+                 <dependency>
+                     <groupId>org.bouncycastle</groupId>
+                     <artifactId>bcprov-jdk15on</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>org.bouncycastle</groupId>
+                     <artifactId>bcpkix-jdk15on</artifactId>
+                 </dependency>
  
                  <!-- threadpool -->
                  <dependency>