From ed64cc708dcfdae8536010db7ee8391a2a603a77 Mon Sep 17 00:00:00 2001 From: Henry Avetisyan Date: Sun, 22 Jan 2017 23:36:03 -0800 Subject: [PATCH] Update version for client release with SIA Provider --- assembly/components/zts.xml | 4 - assembly/pom.xml | 2 +- clients/go/zms/pom.xml | 2 +- clients/go/zts/pom.xml | 2 +- clients/java/zms/pom.xml | 258 +++++++++-------- clients/java/zpe/pom.xml | 2 +- clients/java/zts/pom.xml | 260 +++++++++--------- .../java/com/yahoo/athenz/zts/ZTSClient.java | 6 +- core/zms/pom.xml | 46 ++-- core/zts/pom.xml | 46 ++-- libs/java/auth_core/pom.xml | 2 +- libs/java/client_common/pom.xml | 2 +- libs/java/server_common/pom.xml | 2 +- pom.xml | 2 +- servers/zms/pom.xml | 63 ++--- servers/zts/pom.xml | 66 ++--- travis/publish_to_bintray.sh | 20 +- ui/pom.xml | 2 +- utils/athenz_conf/pom.xml | 2 +- utils/zms_cli/pom.xml | 2 +- utils/zpe_policy_updater/pom.xml | 2 +- 21 files changed, 373 insertions(+), 420 deletions(-) diff --git a/assembly/components/zts.xml b/assembly/components/zts.xml index 441f888768f..853a1924bce 100644 --- a/assembly/components/zts.xml +++ b/assembly/components/zts.xml @@ -35,10 +35,6 @@ zts_start.sh - - ${basedir}/../servers/zts/target/dependency - lib/jars - ${basedir}/../utils/zms_cli/target bin diff --git a/assembly/pom.xml b/assembly/pom.xml index 0ee72f4a1ab..f7edb8cdfb8 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../pom.xml diff --git a/clients/go/zms/pom.xml b/clients/go/zms/pom.xml index 28f4befc3be..6e877c5530a 100644 --- a/clients/go/zms/pom.xml +++ b/clients/go/zms/pom.xml @@ -20,7 +20,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml diff --git a/clients/go/zts/pom.xml b/clients/go/zts/pom.xml index 7ec8ff1fc30..94ba63e3a27 100644 --- a/clients/go/zts/pom.xml +++ b/clients/go/zts/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml diff --git a/clients/java/zms/pom.xml b/clients/java/zms/pom.xml index f4472ed9ed9..8c5333ac665 100644 --- a/clients/java/zms/pom.xml +++ b/clients/java/zms/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml @@ -67,135 +67,133 @@ - - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - - exec - - generate-sources - - - - bash - - scripts/make_stubs.sh - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - prepare-package - - jar - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - package - - shade - - - - - - - org.glassfish.hk2 - org.glassfish.hk2.external - org.glassfish.jersey - org.glassfish.jersey.ext - org.glassfish.jersey.core - org.glassfish.jersey.media - org.glassfish.jersey.bundles.repackaged - com.fasterxml.jackson.core - com.fasterxml.jackson.jaxrs - com.fasterxml.jackson.module - javax.ws.rs - javax.annotation - javax.inject - jersey.repackaged.com.google.common - org.aopalliance - - - - - javax.inject - athenz.shade.zms.javax.inject - - - org.aopalliance - athenz.shade.zms.org.aopalliance - - - jersey.repackaged.com.google.common - athenz.shade.zms.jersey.repackaged.com.google.common - - - javax.ws.rs - athenz.shade.zms.javax.ws.rs - - - javax.annotation - athenz.shade.zms.javax.annotation - - - org.glassfish.jersey - athenz.shade.zms.org.glassfish.jersey - - - org.glassfish.hk2 - athenz.shade.zms.org.glassfish.hk2 - - - org.glassfish.hk2.external - athenz.shade.zms.org.glassfish.hk2.external - - - org.jvnet.hk2 - athenz.shade.zms.org.jvnet.hk2 - - - org.jvnet.tiger_types - athenz.shade.zms.org.jvnet.tiger_types - - - com.fasterxml.jackson - athenz.shade.zms.com.fasterxml.jackson - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + + exec + + generate-sources + + + + bash + + scripts/make_stubs.sh + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + prepare-package + + jar + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + + + + + org.glassfish.hk2 + org.glassfish.hk2.external + org.glassfish.jersey + org.glassfish.jersey.ext + org.glassfish.jersey.core + org.glassfish.jersey.media + org.glassfish.jersey.bundles.repackaged + com.fasterxml.jackson.core + com.fasterxml.jackson.jaxrs + com.fasterxml.jackson.module + javax.ws.rs + javax.annotation + javax.inject + jersey.repackaged.com.google.common + org.aopalliance + + + + + javax.inject + athenz.shade.zms.javax.inject + + + org.aopalliance + athenz.shade.zms.org.aopalliance + + + jersey.repackaged.com.google.common + athenz.shade.zms.jersey.repackaged.com.google.common + + + javax.ws.rs + athenz.shade.zms.javax.ws.rs + + + javax.annotation + athenz.shade.zms.javax.annotation + + + org.glassfish.jersey + athenz.shade.zms.org.glassfish.jersey + + + org.glassfish.hk2 + athenz.shade.zms.org.glassfish.hk2 + + + org.glassfish.hk2.external + athenz.shade.zms.org.glassfish.hk2.external + + + org.jvnet.hk2 + athenz.shade.zms.org.jvnet.hk2 + + + org.jvnet.tiger_types + athenz.shade.zms.org.jvnet.tiger_types + + + com.fasterxml.jackson + athenz.shade.zms.com.fasterxml.jackson + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + diff --git a/clients/java/zpe/pom.xml b/clients/java/zpe/pom.xml index 1925d20eccd..2c45d48c37f 100644 --- a/clients/java/zpe/pom.xml +++ b/clients/java/zpe/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml diff --git a/clients/java/zts/pom.xml b/clients/java/zts/pom.xml index 483cdaa854c..ca401bd4955 100644 --- a/clients/java/zts/pom.xml +++ b/clients/java/zts/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml @@ -67,136 +67,134 @@ - - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - - exec - - generate-sources - - - - bash - - scripts/make_stubs.sh - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - prepare-package - - jar - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - package - - shade - - - - - - - - org.glassfish.hk2 - org.glassfish.hk2.external - org.glassfish.jersey - org.glassfish.jersey.ext - org.glassfish.jersey.core - org.glassfish.jersey.media - org.glassfish.jersey.bundles.repackaged - com.fasterxml.jackson.core - com.fasterxml.jackson.jaxrs - com.fasterxml.jackson.module - javax.ws.rs - javax.annotation - javax.inject - jersey.repackaged.com.google.common - org.aopalliance - - - - - javax.inject - athenz.shade.zts.javax.inject - - - org.aopalliance - athenz.shade.zts.org.aopalliance - - - jersey.repackaged.com.google.common - athenz.shade.zts.jersey.repackaged.com.google.common - - - javax.ws.rs - athenz.shade.zts.javax.ws.rs - - - javax.annotation - athenz.shade.zts.javax.annotation - - - org.glassfish.jersey - athenz.shade.zts.org.glassfish.jersey - - - org.glassfish.hk2 - athenz.shade.zts.org.glassfish.hk2 - - - org.glassfish.hk2.external - athenz.shade.zts.org.glassfish.hk2.external - - - org.jvnet.hk2 - athenz.shade.zts.org.jvnet.hk2 - - - org.jvnet.tiger_types - athenz.shade.zts.org.jvnet.tiger_types - - - com.fasterxml.jackson - athenz.shade.zts.com.fasterxml.jackson - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + + exec + + generate-sources + + + + bash + + scripts/make_stubs.sh + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + prepare-package + + jar + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + + + + + + org.glassfish.hk2 + org.glassfish.hk2.external + org.glassfish.jersey + org.glassfish.jersey.ext + org.glassfish.jersey.core + org.glassfish.jersey.media + org.glassfish.jersey.bundles.repackaged + com.fasterxml.jackson.core + com.fasterxml.jackson.jaxrs + com.fasterxml.jackson.module + javax.ws.rs + javax.annotation + javax.inject + jersey.repackaged.com.google.common + org.aopalliance + + + + + javax.inject + athenz.shade.zts.javax.inject + + + org.aopalliance + athenz.shade.zts.org.aopalliance + + + jersey.repackaged.com.google.common + athenz.shade.zts.jersey.repackaged.com.google.common + + + javax.ws.rs + athenz.shade.zts.javax.ws.rs + + + javax.annotation + athenz.shade.zts.javax.annotation + + + org.glassfish.jersey + athenz.shade.zts.org.glassfish.jersey + + + org.glassfish.hk2 + athenz.shade.zts.org.glassfish.hk2 + + + org.glassfish.hk2.external + athenz.shade.zts.org.glassfish.hk2.external + + + org.jvnet.hk2 + athenz.shade.zts.org.jvnet.hk2 + + + org.jvnet.tiger_types + athenz.shade.zts.org.jvnet.tiger_types + + + com.fasterxml.jackson + athenz.shade.zts.com.fasterxml.jackson + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + diff --git a/clients/java/zts/src/main/java/com/yahoo/athenz/zts/ZTSClient.java b/clients/java/zts/src/main/java/com/yahoo/athenz/zts/ZTSClient.java index bd6a729567d..840be5bf39c 100644 --- a/clients/java/zts/src/main/java/com/yahoo/athenz/zts/ZTSClient.java +++ b/clients/java/zts/src/main/java/com/yahoo/athenz/zts/ZTSClient.java @@ -151,7 +151,7 @@ static boolean initConfigValues() { * that require no authentication or setting the principal using * addCredentials method before calling any other athentication * protected API. - * @param url ZTS Server's URL (optional) + * @param ztsUrl ZTS Server's URL (optional) */ public ZTSClient(String ztsUrl) { initClient(ztsUrl, null, null, null, null); @@ -166,7 +166,7 @@ public ZTSClient(String ztsUrl) { * 30000ms (30sec). The application can change these values by using the * athenz.zts.client.read_timeout and athenz.zts.client.connct_timeout * system properties. The values specified for timeouts must be in milliseconds. - * @param url ZTS Server's URL (optional) + * @param ztsUrl ZTS Server's URL (optional) * @param identity Principal identity for authenticating requests */ public ZTSClient(String ztsUrl, Principal identity) { @@ -192,7 +192,7 @@ public ZTSClient(String ztsUrl, Principal identity) { * 30000ms (30sec). The application can change these values by using the * athenz.zts.client.read_timeout and athenz.zts.client.connct_timeout * system properties. The values specified for timeouts must be in milliseconds. - * @param url ZTS Server's URL (optional) + * @param ztsUrl ZTS Server's URL (optional) * @param domainName name of the domain * @param serviceName name of the service * @param siaProvider service identity provider for the client to request principals diff --git a/core/zms/pom.xml b/core/zms/pom.xml index 2d503cff9aa..639c25859be 100644 --- a/core/zms/pom.xml +++ b/core/zms/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml @@ -41,29 +41,27 @@ - - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - - exec - - generate-sources - - - - bash - - scripts/make_stubs.sh - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + + exec + + generate-sources + + + + bash + + scripts/make_stubs.sh + + + + diff --git a/core/zts/pom.xml b/core/zts/pom.xml index 1458643c4e1..cb2f7c0c0cf 100644 --- a/core/zts/pom.xml +++ b/core/zts/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml @@ -41,29 +41,27 @@ - - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - - exec - - generate-sources - - - - bash - - scripts/make_stubs.sh - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + + exec + + generate-sources + + + + bash + + scripts/make_stubs.sh + + + + diff --git a/libs/java/auth_core/pom.xml b/libs/java/auth_core/pom.xml index 0cbd6ed2831..bb6850c6b70 100644 --- a/libs/java/auth_core/pom.xml +++ b/libs/java/auth_core/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml diff --git a/libs/java/client_common/pom.xml b/libs/java/client_common/pom.xml index 44829fe5754..566d3b9d4d5 100644 --- a/libs/java/client_common/pom.xml +++ b/libs/java/client_common/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml diff --git a/libs/java/server_common/pom.xml b/libs/java/server_common/pom.xml index 4f8323aa1b5..8d07b3c4936 100644 --- a/libs/java/server_common/pom.xml +++ b/libs/java/server_common/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../../pom.xml diff --git a/pom.xml b/pom.xml index 7c41894c64a..35d6c8d5388 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.yahoo.athenz athenz pom - 1.1-SNAPSHOT + 1.1.1 AthenZ diff --git a/servers/zms/pom.xml b/servers/zms/pom.xml index 10a8a714df7..d38bae2af8c 100644 --- a/servers/zms/pom.xml +++ b/servers/zms/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml @@ -163,46 +163,27 @@ - - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - - exec - - generate-sources - - - - bash - - scripts/make_stubs.sh - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - copy-dependencies - package - - copy-dependencies - - - runtime - - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + + exec + + generate-sources + + + + bash + + scripts/make_stubs.sh + + + + diff --git a/servers/zts/pom.xml b/servers/zts/pom.xml index 10c0765fca1..e505691bc5a 100644 --- a/servers/zts/pom.xml +++ b/servers/zts/pom.xml @@ -4,7 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +20,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml @@ -146,45 +148,27 @@ - - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - - exec - - generate-sources - - - - bash - - scripts/make_stubs.sh - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - copy-dependencies - package - - copy-dependencies - - - runtime - - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + + exec + + generate-sources + + + + bash + + scripts/make_stubs.sh + + + + + diff --git a/travis/publish_to_bintray.sh b/travis/publish_to_bintray.sh index e289e751eb5..f087637bc34 100755 --- a/travis/publish_to_bintray.sh +++ b/travis/publish_to_bintray.sh @@ -2,13 +2,13 @@ set -ev -mvn deploy --projects com.yahoo.athenz:athenz --settings travis/settings-athenz-parent.xml -mvn deploy --projects com.yahoo.athenz:zms_core --settings travis/settings-zms-core.xml -mvn deploy --projects com.yahoo.athenz:zts_core --settings travis/settings-zts-core.xml -mvn deploy --projects com.yahoo.athenz:auth_core --settings travis/settings-auth-core.xml -mvn deploy --projects com.yahoo.athenz:zms_java_client --settings travis/settings-zms-java-client.xml -mvn deploy --projects com.yahoo.athenz:zts_java_client --settings travis/settings-zts-java-client.xml -mvn deploy --projects com.yahoo.athenz:zpe_java_client --settings travis/settings-zpe-java-client.xml -mvn deploy --projects com.yahoo.athenz:client_common --settings travis/settings-client-common.xml -mvn deploy --projects com.yahoo.athenz:server_common --settings travis/settings-server-common.xml -mvn deploy --projects com.yahoo.athenz:zpe_policy_updater --settings travis/settings-zpe-policy-updater.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:athenz --settings travis/settings-athenz-parent.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:zms_core --settings travis/settings-zms-core.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:zts_core --settings travis/settings-zts-core.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:auth_core --settings travis/settings-auth-core.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:zms_java_client --settings travis/settings-zms-java-client.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:zts_java_client --settings travis/settings-zts-java-client.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:zpe_java_client --settings travis/settings-zpe-java-client.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:client_common --settings travis/settings-client-common.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:server_common --settings travis/settings-server-common.xml +mvn deploy -Dmaven.test.skip=true --projects com.yahoo.athenz:zpe_policy_updater --settings travis/settings-zpe-policy-updater.xml diff --git a/ui/pom.xml b/ui/pom.xml index f7ad0603ba0..d61f3b6fc59 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../pom.xml diff --git a/utils/athenz_conf/pom.xml b/utils/athenz_conf/pom.xml index 05b92b60b5e..2c184c5ddfd 100644 --- a/utils/athenz_conf/pom.xml +++ b/utils/athenz_conf/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml diff --git a/utils/zms_cli/pom.xml b/utils/zms_cli/pom.xml index 296dd09142a..92f1b8d6927 100644 --- a/utils/zms_cli/pom.xml +++ b/utils/zms_cli/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml diff --git a/utils/zpe_policy_updater/pom.xml b/utils/zpe_policy_updater/pom.xml index ad4b91a68ce..f1d3a7426f2 100644 --- a/utils/zpe_policy_updater/pom.xml +++ b/utils/zpe_policy_updater/pom.xml @@ -18,7 +18,7 @@ com.yahoo.athenz athenz - 1.1-SNAPSHOT + 1.1.1 ../../pom.xml