Skip to content
This repository has been archived by the owner on Dec 21, 2021. It is now read-only.

Commit

Permalink
Version 1.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@jjg-123
jjg-123 committed Nov 7, 2018
1 parent a6ee655 commit 715c30f
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 81 deletions.
8 changes: 5 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-java</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
<name>Parent module for SciTokens.</name>
<packaging>pom</packaging>
<description>SciTokens Java library.</description>
Expand Down Expand Up @@ -99,7 +99,7 @@
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<configuration>
<skip>true</skip>
<skip>false</skip>
</configuration>
<executions>
<execution>
Expand All @@ -123,7 +123,9 @@
<goal>jar</goal>
</goals>
<configuration>
<!-- Java 8 specific or empty javadoc tags make the build fail -->
<!-- Java 8 specific
or empty javadoc tags make the build fail -->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>

Expand Down
4 changes: 2 additions & 2 deletions scitokens-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-java</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</parent>

<artifactId>scitokens-cli</artifactId>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-common</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</dependency>

<!-- Need this for the monitor -->
Expand Down
4 changes: 2 additions & 2 deletions scitokens-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-java</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</parent>

<artifactId>scitokens-client</artifactId>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-common</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
Expand Down
4 changes: 2 additions & 2 deletions scitokens-common/buildNumber.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Wed Nov 07 11:27:23 CST 2018
buildNumber\\d*=422
#Wed Nov 07 12:47:16 CST 2018
buildNumber\\d*=449
86 changes: 18 additions & 68 deletions scitokens-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-java</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</parent>

<properties>
Expand All @@ -19,20 +19,6 @@
<name>Common code for SciTokens</name>
<packaging>jar</packaging>
<dependencies>
<!-- <dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>oa4mp-server-oauth2</artifactId>
<version>4.1.1</version>
<type>war</type>
<scope>runtime</scope>
</dependency>-->
<!-- <dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>oa4mp-server-oauth2</artifactId>
<version>4.1.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>-->
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>oa4mp-server-api</artifactId>
Expand All @@ -58,28 +44,6 @@
<artifactId>oa4mp-server-loader-oauth2</artifactId>
<version>4.1.1</version>
</dependency>
<!-- <dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.1.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>-->
<!-- <dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-common</artifactId>
<version>4.1.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>-->

<!-- <dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>oa4mp-server-test</artifactId>
<version>4.1.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>-->
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-oauth-2.0</artifactId>
Expand Down Expand Up @@ -181,39 +145,25 @@
</items>
</configuration>
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<inherited>true</inherited>
<phase>package</phase>
<goals>
<goal>war</goal>
</goals>
</execution>
</executions>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- Java 8 specific or empty javadoc tags make the build fail -->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>

<configuration>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
<manifestEntries>
<application-version>${pom.version}</application-version>
<application-name>${pom.name}</application-name>
<build-time>${timestamp}</build-time>
<implementation-version>${project.version}</implementation-version>
<implementation-build>${buildNumber}</implementation-build>
</manifestEntries>
</archive>
</execution>
</executions>

</configuration>
</plugin>-->
</plugin>
</plugins>
<finalName>scitokens-common</finalName>
</build>
Expand Down
4 changes: 2 additions & 2 deletions scitokens-server/buildNumber.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Wed Nov 07 11:27:39 CST 2018
buildNumber\\d*=303
#Wed Nov 07 12:54:04 CST 2018
buildNumber\\d*=322
4 changes: 2 additions & 2 deletions scitokens-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-java</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</parent>

<properties>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.scitokens</groupId>
<artifactId>scitokens-common</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.1</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
Expand Down

0 comments on commit 715c30f

Please sign in to comment.