Updated version and re-generate website

ncsa · Oct 25, 2024 · 2bcbe96 · 2bcbe96
1 parent 004b4ce
commit 2bcbe96
Show file tree

Hide file tree

Showing 836 changed files with 3,242 additions and 3,235 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ There are a few environment variables you should define before doing anything. T
 ## Updating the release version
 
 Do a global replace of the SNAPSHOT tag with the version you are creating. 
-E.g. replace `5.6-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in 
+E.g. replace `6.x-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in 
 the documentation. If you are updating teh website, you do not need to update 
 anything in `$NCSA_DEV_INPUT/oa4mp/docs` which will be replaced shortly. 
 
@@ -126,7 +126,7 @@ resolution maven uses tends to have multiple jars created then deploy complains.
 # Building and deploying the website
 
 You can also update the website. You must be able to commit to Github to do this. The basic way this works is that you 
-1. Do a global replace of the SNAPSHOT tag with the version you are creating. E.g. replace `5.6-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in the documentation. You do not need to update anything in `$NCSA_DEV_INPUT/oa4mp/docs` which will be replaced shortly. 
+1. Do a global replace of the SNAPSHOT tag with the version you are creating. E.g. replace `6.x-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in the documentation. You do not need to update anything in `$NCSA_DEV_INPUT/oa4mp/docs` which will be replaced shortly. 
 2. run the `build.sh` script to create all of the basic documentation 
 3. run `$NCSA_DEV_INPUT/oa4mp-website/make-website.sh` which creates the entire website and stick it in `$NCSA_DEV_INPUT/oa4mp/docs`
 4. commit everything to Git

diff --git a/client-api/pom.xml b/client-api/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
     <artifactId>client-api</artifactId>
     <name>OA4MP client API.</name>
@@ -22,24 +22,24 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>client</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>common</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>oauth2</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/client-installer/buildNumber.properties b/client-installer/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Thu Oct 24 15:02:43 CDT 2024
-buildNumber\\d*=528
+#Fri Oct 25 11:57:48 CDT 2024
+buildNumber\\d*=534
diff --git a/client-installer/pom.xml b/client-installer/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-installer</artifactId>
@@ -21,12 +21,12 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>installer</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>installer</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/client-loader/pom.xml b/client-loader/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-loader</artifactId>
@@ -22,12 +22,12 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>client-api</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>myproxy-logon</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>oauth2</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/client-oauth2/pom.xml b/client-oauth2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-oauth2</artifactId>
@@ -22,12 +22,12 @@
        <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>client-loader</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>client-api</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -43,12 +43,12 @@
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>oauth2</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/client-test/pom.xml b/client-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-test</artifactId>
@@ -17,48 +17,48 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>server</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>client-api</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>common</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>core</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>core</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>common</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>util</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>myproxy-logon</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>

diff --git a/client-webapp/pom.xml b/client-webapp/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-webapp</artifactId>
@@ -19,12 +19,12 @@
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>client-api</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/client/pom.xml b/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.oa4mp</groupId>
             <artifactId>common</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.oa4mp</groupId>
         <artifactId>oa4mp-parent</artifactId>
-        <version>5.6-SNAPSHOT</version>
+        <version>6.x-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>util</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>util</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>storage</artifactId>
-            <version>5.6-SNAPSHOT</version>
+            <version>6.x-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/common/src/main/java/org/oa4mp/delegation/common/OA4MPVersion.java b/common/src/main/java/org/oa4mp/delegation/common/OA4MPVersion.java
@@ -6,5 +6,5 @@
  * on 6/11/24 at  11:26 AM
  */
 public class OA4MPVersion {
-    public static final String VERSION_NUMBER = "5.6-SNAPSHOT";
+    public static final String VERSION_NUMBER = "6.x-SNAPSHOT";
 }
diff --git a/docs/apidocs/allclasses-index.html b/docs/apidocs/allclasses-index.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (11.0.24) on Thu Oct 24 15:02:45 CDT 2024 -->
-<title>All Classes (OA4MP Parent Project 5.6-SNAPSHOT API)</title>
+<!-- Generated by javadoc (11.0.24) on Fri Oct 25 11:51:38 CDT 2024 -->
+<title>All Classes (OA4MP Parent Project 6.x-SNAPSHOT API)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2024-10-24">
+<meta name="dc.created" content="2024-10-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
@@ -22,7 +22,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="All Classes (OA4MP Parent Project 5.6-SNAPSHOT API)";
+            parent.document.title="All Classes (OA4MP Parent Project 6.x-SNAPSHOT API)";
         }
     }
     catch(err) {

diff --git a/docs/apidocs/allclasses.html b/docs/apidocs/allclasses.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (11.0.24) on Thu Oct 24 15:02:45 CDT 2024 -->
-<title>All Classes (OA4MP Parent Project 5.6-SNAPSHOT API)</title>
+<!-- Generated by javadoc (11.0.24) on Fri Oct 25 11:51:38 CDT 2024 -->
+<title>All Classes (OA4MP Parent Project 6.x-SNAPSHOT API)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2024-10-24">
+<meta name="dc.created" content="2024-10-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">

diff --git a/docs/apidocs/allpackages-index.html b/docs/apidocs/allpackages-index.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (11.0.24) on Thu Oct 24 15:02:45 CDT 2024 -->
-<title>All Packages (OA4MP Parent Project 5.6-SNAPSHOT API)</title>
+<!-- Generated by javadoc (11.0.24) on Fri Oct 25 11:51:38 CDT 2024 -->
+<title>All Packages (OA4MP Parent Project 6.x-SNAPSHOT API)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2024-10-24">
+<meta name="dc.created" content="2024-10-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
@@ -22,7 +22,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="All Packages (OA4MP Parent Project 5.6-SNAPSHOT API)";
+            parent.document.title="All Packages (OA4MP Parent Project 6.x-SNAPSHOT API)";
         }
     }
     catch(err) {