diff options
author | su622b <sunil.unnava@att.com> | 2018-04-08 13:50:31 -0400 |
---|---|---|
committer | su622b <sunil.unnava@att.com> | 2018-04-08 13:50:41 -0400 |
commit | 40077be45039102b97347e4129a8b9c301a82c16 (patch) | |
tree | fa43def0daf6b3e955646a45e67484f7f0bc81d6 /auth | |
parent | 99f14fb5acc4657255bb0028be8e36b01177361e (diff) |
updated the poms with project versions
Issue-ID: AAF-215
Change-Id: I48ab110906f6e165cde0b3bb21b52178d36eb566
Signed-off-by: su622b <sunil.unnava@att.com>
Diffstat (limited to 'auth')
-rw-r--r-- | auth/auth-batch/pom.xml | 5 | ||||
-rw-r--r-- | auth/auth-cass/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-certman/pom.xml | 3 | ||||
-rw-r--r-- | auth/auth-client/pom.xml | 7 | ||||
-rw-r--r-- | auth/auth-cmd/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-core/pom.xml | 4 | ||||
-rw-r--r-- | auth/auth-deforg/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-fs/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-gui/pom.xml | 7 | ||||
-rw-r--r-- | auth/auth-hello/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-locate/pom.xml | 3 | ||||
-rw-r--r-- | auth/auth-oauth/pom.xml | 3 | ||||
-rw-r--r-- | auth/auth-service/pom.xml | 7 | ||||
-rw-r--r-- | auth/docker/dbuild.sh | 2 | ||||
-rw-r--r-- | auth/pom.xml | 18 |
15 files changed, 57 insertions, 12 deletions
diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index bd049804..8d97f105 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -97,26 +97,31 @@ <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-env</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-rosetta</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-cass</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index 75125537..88f49b63 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -88,11 +88,13 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 0d37ac8b..e1a40cdf 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -48,16 +48,19 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-cass</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 0cf34aa8..997bbccd 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -23,12 +23,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>super-pom</artifactId> + <version>2.1.0-SNAPSHOT</version> + </parent> <!-- No Parent on Purpose!!! --> <artifactId>aaf-auth-client</artifactId> <name>AAF Auth Client</name> <description>XSD Generated classes for AAF Auth</description> <groupId>org.onap.aaf.authz.auth</groupId> - <version>2.10-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 064495ce..956094b8 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -172,11 +172,13 @@ <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index e7538042..ef6ac493 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -92,10 +92,12 @@ <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-env</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> @@ -106,11 +108,13 @@ <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-log4j</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 1998bdce..738f5f87 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -95,11 +95,13 @@ <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index bb61fb59..c0bbf45f 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -86,11 +86,13 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-core</artifactId> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index c0221f8c..774aa04a 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -50,16 +50,19 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-client</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-cmd</artifactId> + <version>${project.version}</version> </dependency> <!-- Add the Organizations you wish to support. You can delete ONAP if @@ -68,21 +71,25 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-deforg</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-client</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-xgen</artifactId> + <version>${project.version}</version> </dependency> diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 10164fea..6ebd7b8a 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -49,11 +49,13 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 3fab08b8..0a94a9d0 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -49,16 +49,19 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-cass</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index e9ce8b37..ce51d0b7 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -49,16 +49,19 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-cass</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 8d9bd76b..87b723ad 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -50,11 +50,13 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-client</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-core</artifactId> + <version>${project.version}</version> </dependency> <!-- Add the Organizations you wish to support. You can delete ONAP if @@ -63,26 +65,31 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-deforg</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-cass</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-oauth</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-rosetta</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index 54d9926a..501530db 100644 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -3,7 +3,7 @@ # Docker Building Script. Reads all the components generated by install, on per-version basis # # Pull in Variables from d.props -. d.props +./d.props # TODO add ability to do DEBUG settings if ["$1" == ""]; then diff --git a/auth/pom.xml b/auth/pom.xml index c0bd6af9..410e88b2 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -38,8 +38,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion> - <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> @@ -386,43 +384,43 @@ <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-env</artifactId> - <version>${project.miscVersion}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-log4j</artifactId> - <version>${project.miscVersion}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-rosetta</artifactId> - <version>${project.miscVersion}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.misc</groupId> <artifactId>aaf-misc-xgen</artifactId> - <version>${project.miscVersion}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-core</artifactId> - <version>${project.cadiVersion}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-client</artifactId> - <version>${project.cadiVersion}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aaf.authz.cadi</groupId> <artifactId>aaf-cadi-aaf</artifactId> - <version>${project.cadiVersion}</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.cassandra</groupId> @@ -434,7 +432,7 @@ <dependency> <groupId>org.onap.aaf.authz.auth</groupId> <artifactId>aaf-auth-client</artifactId> - <version>${project.interfaceVersion}</version> + <version>${project.version}</version> </dependency> <dependency> |