Bump versions to 0.18.1-SNAPSHOT

[aaa.git] / aaa-cli-jar / pom.xml

diff --git a/aaa-cli-jar/pom.xml b/aaa-cli-jar/pom.xml
index 007c71cf9d6ffaae6f710798e9c426798ca0d7d3..d3749049ef31ea498068095712a0eda7bf2d754c 100644 (file)
--- a/aaa-cli-jar/pom.xml
+++ b/aaa-cli-jar/pom.xml
@@ -6,14 +6,13 @@ 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
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.18.1-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -29,14 +28,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>net.sf.jopt-simple</groupId>
       <artifactId>jopt-simple</artifactId>
-      <version>5.0.3</version>
+      <version>5.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-shiro</artifactId>
+      <artifactId>aaa-idm-store-h2</artifactId>
       <exclusions>
         <exclusion>
-    <!-- Completely disable transitive dependencies -->
+          <!-- Completely disable transitive dependencies -->
           <groupId>*</groupId>
           <artifactId>*</artifactId>
         </exclusion>
@@ -49,9 +48,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <artifactId>commons-text</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>compile</scope>
     </dependency>
-    <!-- Note that com.h2database:h2 is already shaded into aaa-h2-store -->
 
     <!-- Now for the FAT JAR we need to fix up some <scope>provided to be <scope>compile -->
     <dependency>
@@ -66,20 +69,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <!-- Testing Dependencies -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>testutils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-password-service-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>testutils</artifactId>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-password-service-impl</artifactId>
     </dependency>
   </dependencies>
 
@@ -117,29 +116,42 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
               <createDependencyReducedPom>false</createDependencyReducedPom>
               <minimizeJar>true</minimizeJar>
               <filters>
+                  <filter>
+                    <artifact>*:*</artifact>
+                    <excludes>
+                      <exclude>META-INF/*.SF</exclude>
+                      <exclude>META-INF/*.DSA</exclude>
+                      <exclude>META-INF/*.RSA</exclude>
+                    </excludes>
+                  </filter>
                 <filter>
                   <artifact>org.opendaylight.aaa:aaa-shiro</artifact>
                   <includes>
                     <include>org/opendaylight/**</include>
-                    <include>org/h2/Driver.class</include>
-                    <include>org/h2/upgrade/**</include>
-                    <include>org/h2/util/**</include>
-                    <include>org/h2/jdbc/**</include>
-                    <include>org/h2/message/**</include>
-                    <include>org/h2/value/**</include>
-                    <include>org/h2/engine/**</include>
-                    <include>org/h2/command/**</include>
-                    <include>org/h2/security/**</include>
-                    <include>org/h2/store/**</include>
-                    <include>org/h2/compress/**</include>
-                    <include>org/h2/schema/**</include>
-                    <include>org/h2/result/**</include>
-                    <include>org/h2/api/**</include>
-                    <include>org/h2/mvstore/**</include>
-                    <include>org/h2/table/**</include>
-                    <include>org/h2/expression/**</include>
-                    <include>org/h2/index/**</include>
-                    <include>org/h2/constraint/**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>com.h2database:h2</artifact>
+                  <excludes>
+                    <!-- AAA cli does not use bnf, fulltext, jdbcx, jmx, server and tools -->
+                    <exclude>org/h2/bnf/**</exclude>
+                    <exclude>org/h2/fulltext/**</exclude>
+                    <exclude>org/h2/jdbcx/**</exclude>
+                    <exclude>org/h2/jmx/**</exclude>
+                    <exclude>org/h2/server/**</exclude>
+                    <exclude>org/h2/tools/**</exclude>
+                  </excludes>
+                </filter>
+                <filter>
+                  <artifact>org.opendaylight.aaa:aaa-password-service-api</artifact>
+                  <includes>
+                    <include>org/opendaylight/**</include>
+                  </includes>
+                </filter>
+                <filter>
+                  <artifact>org.opendaylight.aaa:aaa-password-service-impl</artifact>
+                  <includes>
+                    <include>org/opendaylight/**</include>
                   </includes>
                 </filter>
               </filters>
@@ -152,22 +164,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-         <configuration>
-          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-        </configuration>
-      </plugin>
-<!-- TODO
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <failOnError>true</failOnError>
-        </configuration>
-      </plugin>
-  -->
     </plugins>
   </build>