- ./data2:/data\r
# - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh\r
# - ./com.osaaf.common.props:/opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props\r
- # - ./cadi-core-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-1.3.0.jar\r
- # - ./cadi-aaf-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-1.3.0.jar\r
- # - ./cadi-client-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-1.3.0.jar\r
+ # - ./cadi-core-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-2.1.0.jar\r
+ # - ./cadi-aaf-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-2.1.0.jar\r
+ # - ./cadi-client-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-2.1.0.jar\r
# - ./authz-service-2.0.15.jar:/opt/app/aaf/authz-service/2.0.15/lib/authz-service-2.0.15.jar\r
# - ./dme2-3.1.200.jar:/opt/app/aaf/authz-service/2.0.15/lib/dme2-3.1.200.jar\r
entrypoint: ["bash", "-c", "/tmp/wait_for_host_port.sh cassandra_container 9042; sleep 20; /bin/sh -c ./startup.sh"]\r
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
- <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
- <project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion>
+ <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
+ <project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion>
<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
<parent>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
<relativePath>..</relativePath>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<name>AAF CADI Sample OAuth EndUser</name>
<groupId>org.onap.aaf.authz.cadi</groupId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<artifactId>aaf-cadi-oauth-enduser</artifactId>
<packaging>jar</packaging>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<inceptionYear>2015-07-20</inceptionYear>
<organization>
<name>ONAP</name>
<properties>
<skipSigning>true</skipSigning>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
+ <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
<project.authClientVersion>2.10-SNAPSHOT</project.authClientVersion>
<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
<parent>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>parent</artifactId>
<name>AAF Misc Parent</name>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<parent>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
# because they are used in Jenkins, whose plug-in doesn't support\r
\r
-major=1\r
-minor=0\r
-patch=1\r
+major=2\r
+minor=1\r
+patch=0\r
\r
base_version=${major}.${minor}.${patch}\r
\r