Merge "Integrate MRI projects for Neon"

[aaa.git] / aaa-cert / pom.xml

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
old mode 100755 (executable)
new mode 100644 (file)
index 599cdff..9278739
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2015 Inocybe Technology. All rights reserved.
+Copyright (c) 2015, 2017 Inocybe Technology. All rights reserved.
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
@@ -10,49 +10,34 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../parent/</relativePath>
+    <version>0.9.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa-cert</artifactId>
+  <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
-  <properties>
-    <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
-    <openflow.protocol.spi.version>0.8.0-SNAPSHOT</openflow.protocol.spi.version>
-  </properties>
-
-
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-encrypt-service</artifactId>
     </dependency>
-
-    <!-- Bouncy Castle dependency -->
     <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
     </dependency>
     <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
     </dependency>
 
-    <!-- openflow dependency -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin</artifactId>
-      <classifier>features</classifier>
-      <version>${openflowplugin.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
+    <!-- Bouncy Castle dependency -->
     <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-spi</artifactId>
-      <version>${openflow.protocol.spi.version}</version>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
 
     <!-- Testing Dependencies -->
@@ -63,7 +48,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.8.9</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -76,9 +62,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.21.0-GA</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>1.7.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -94,6 +87,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.opendaylight.aaa.cert.api.*,
+              org.opendaylight.aaa.cert.impl.*,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.*
+            </Export-Package>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -108,7 +110,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/classes/initial/08-aaa-cert-config.xml</file>
+                  <file>${project.build.directory}/classes/initial/aaa-cert-config.xml</file>
                   <type>xml</type>
                   <classifier>config</classifier>
                 </artifact>
@@ -117,47 +119,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-        <version>${yangtools.version}</version>
-        <executions>
-          <execution>
-            <id>config</id>
-            <goals>
-              <goal>generate-sources</goal>
-            </goals>
-            <configuration>
-              <codeGenerators>
-                <generator>
-                <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                <additionalConfiguration>
-                  <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                  </additionalConfiguration>
-                </generator>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                </generator>
-              </codeGenerators>
-              <inspectDependencies>true</inspectDependencies>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>${config.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>${mdsal.model.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
     </plugins>
   </build>
 </project>