Skip to content

Commit

Permalink
Update version for client release with SIA Provider
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry Avetisyan committed Jan 23, 2017
1 parent 4063b5b commit ed64cc7
Show file tree
Hide file tree
Showing 21 changed files with 373 additions and 420 deletions.
4 changes: 0 additions & 4 deletions assembly/components/zts.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
<include>zts_start.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/../servers/zts/target/dependency</directory>
<outputDirectory>lib/jars</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/../utils/zms_cli/target</directory>
<outputDirectory>bin</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion clients/go/zms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion clients/go/zts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
258 changes: 128 additions & 130 deletions clients/java/zms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -67,135 +67,133 @@
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
<phase>generate-sources</phase>
</execution>
</executions>
<configuration>
<executable>bash</executable>
<arguments>
<argument>scripts/make_stubs.sh</argument>
</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- Shade all the jaxrs/jackson dependencies to avoid conflicts -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> </transformers>
<artifactSet>
<includes>
<include>org.glassfish.hk2</include>
<include>org.glassfish.hk2.external</include>
<include>org.glassfish.jersey</include>
<include>org.glassfish.jersey.ext</include>
<include>org.glassfish.jersey.core</include>
<include>org.glassfish.jersey.media</include>
<include>org.glassfish.jersey.bundles.repackaged</include>
<include>com.fasterxml.jackson.core</include>
<include>com.fasterxml.jackson.jaxrs</include>
<include>com.fasterxml.jackson.module</include>
<include>javax.ws.rs</include>
<include>javax.annotation</include>
<include>javax.inject</include>
<include>jersey.repackaged.com.google.common</include>
<include>org.aopalliance</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>javax.inject</pattern>
<shadedPattern>athenz.shade.zms.javax.inject</shadedPattern>
</relocation>
<relocation>
<pattern>org.aopalliance</pattern>
<shadedPattern>athenz.shade.zms.org.aopalliance</shadedPattern>
</relocation>
<relocation>
<pattern>jersey.repackaged.com.google.common</pattern>
<shadedPattern>athenz.shade.zms.jersey.repackaged.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>javax.ws.rs</pattern>
<shadedPattern>athenz.shade.zms.javax.ws.rs</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
<shadedPattern>athenz.shade.zms.javax.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish.jersey</pattern>
<shadedPattern>athenz.shade.zms.org.glassfish.jersey</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish.hk2</pattern>
<shadedPattern>athenz.shade.zms.org.glassfish.hk2</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish.hk2.external</pattern>
<shadedPattern>athenz.shade.zms.org.glassfish.hk2.external</shadedPattern>
</relocation>
<relocation>
<pattern>org.jvnet.hk2</pattern>
<shadedPattern>athenz.shade.zms.org.jvnet.hk2</shadedPattern>
</relocation>
<relocation>
<pattern>org.jvnet.tiger_types</pattern>
<shadedPattern>athenz.shade.zms.org.jvnet.tiger_types</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>athenz.shade.zms.com.fasterxml.jackson</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
<phase>generate-sources</phase>
</execution>
</executions>
<configuration>
<executable>bash</executable>
<arguments>
<argument>scripts/make_stubs.sh</argument>
</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- Shade all the jaxrs/jackson dependencies to avoid conflicts -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> </transformers>
<artifactSet>
<includes>
<include>org.glassfish.hk2</include>
<include>org.glassfish.hk2.external</include>
<include>org.glassfish.jersey</include>
<include>org.glassfish.jersey.ext</include>
<include>org.glassfish.jersey.core</include>
<include>org.glassfish.jersey.media</include>
<include>org.glassfish.jersey.bundles.repackaged</include>
<include>com.fasterxml.jackson.core</include>
<include>com.fasterxml.jackson.jaxrs</include>
<include>com.fasterxml.jackson.module</include>
<include>javax.ws.rs</include>
<include>javax.annotation</include>
<include>javax.inject</include>
<include>jersey.repackaged.com.google.common</include>
<include>org.aopalliance</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>javax.inject</pattern>
<shadedPattern>athenz.shade.zms.javax.inject</shadedPattern>
</relocation>
<relocation>
<pattern>org.aopalliance</pattern>
<shadedPattern>athenz.shade.zms.org.aopalliance</shadedPattern>
</relocation>
<relocation>
<pattern>jersey.repackaged.com.google.common</pattern>
<shadedPattern>athenz.shade.zms.jersey.repackaged.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>javax.ws.rs</pattern>
<shadedPattern>athenz.shade.zms.javax.ws.rs</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
<shadedPattern>athenz.shade.zms.javax.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish.jersey</pattern>
<shadedPattern>athenz.shade.zms.org.glassfish.jersey</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish.hk2</pattern>
<shadedPattern>athenz.shade.zms.org.glassfish.hk2</shadedPattern>
</relocation>
<relocation>
<pattern>org.glassfish.hk2.external</pattern>
<shadedPattern>athenz.shade.zms.org.glassfish.hk2.external</shadedPattern>
</relocation>
<relocation>
<pattern>org.jvnet.hk2</pattern>
<shadedPattern>athenz.shade.zms.org.jvnet.hk2</shadedPattern>
</relocation>
<relocation>
<pattern>org.jvnet.tiger_types</pattern>
<shadedPattern>athenz.shade.zms.org.jvnet.tiger_types</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>athenz.shade.zms.com.fasterxml.jackson</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/zpe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit ed64cc7

Please sign in to comment.