From 715c30f81e9d63ef3026aa47277f0696d311c973 Mon Sep 17 00:00:00 2001
From: Jeff Gaynor <gaynor@illinois.edu>
Date: Wed, 7 Nov 2018 13:03:05 -0600
Subject: [PATCH] Version 1.1 release

---
 pom.xml                                 |  8 ++-
 scitokens-cli/pom.xml                   |  4 +-
 scitokens-client/pom.xml                |  4 +-
 scitokens-common/buildNumber.properties |  4 +-
 scitokens-common/pom.xml                | 86 ++++++-------------------
 scitokens-server/buildNumber.properties |  4 +-
 scitokens-server/pom.xml                |  4 +-
 7 files changed, 33 insertions(+), 81 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ee845283..2a4c96056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -99,7 +99,7 @@
                 <artifactId>maven-gpg-plugin</artifactId>
                 <version>1.6</version>
                 <configuration>
-                    <skip>true</skip>
+                    <skip>false</skip>
                 </configuration>
                 <executions>
                     <execution>
@@ -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>
 
diff --git a/scitokens-cli/pom.xml b/scitokens-cli/pom.xml
index 17743437c..5f009de95 100644
--- a/scitokens-cli/pom.xml
+++ b/scitokens-cli/pom.xml
@@ -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>
@@ -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 -->
diff --git a/scitokens-client/pom.xml b/scitokens-client/pom.xml
index 7ee766657..fac9ddd8b 100644
--- a/scitokens-client/pom.xml
+++ b/scitokens-client/pom.xml
@@ -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>
@@ -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>
diff --git a/scitokens-common/buildNumber.properties b/scitokens-common/buildNumber.properties
index 32731065b..afe5a9557 100644
--- a/scitokens-common/buildNumber.properties
+++ b/scitokens-common/buildNumber.properties
@@ -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
diff --git a/scitokens-common/pom.xml b/scitokens-common/pom.xml
index e74750c30..f567dc5f3 100644
--- a/scitokens-common/pom.xml
+++ b/scitokens-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.scitokens</groupId>
         <artifactId>scitokens-java</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.1</version>
     </parent>
 
     <properties>
@@ -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>
@@ -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>
@@ -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>
diff --git a/scitokens-server/buildNumber.properties b/scitokens-server/buildNumber.properties
index 3cf453362..096717763 100644
--- a/scitokens-server/buildNumber.properties
+++ b/scitokens-server/buildNumber.properties
@@ -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
diff --git a/scitokens-server/pom.xml b/scitokens-server/pom.xml
index b1372191a..2b7ac42b5 100644
--- a/scitokens-server/pom.xml
+++ b/scitokens-server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.scitokens</groupId>
         <artifactId>scitokens-java</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.1</version>
     </parent>
 
     <properties>
@@ -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>