diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69056d80c..dd77e74e3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,7 +10,7 @@
-
+
@@ -830,7 +830,6 @@
-
@@ -874,7 +873,7 @@
@@ -952,7 +951,7 @@
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"Tomcat Server.OA4MP server.executor": "Run",
"WebServerToolWindowFactoryState": "false",
- "git-widget-placeholder": "master",
+ "git-widget-placeholder": "6.0",
"jdk.selected.JAVA_MODULE": "11 (2)",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "/home/ncsa/dev/ncsa-git/oa4mp/server-test/src/main/resources/flow-tests/local",
@@ -1955,15 +1954,7 @@
-
-
-
-
- 1705433242260
-
-
-
- 1705433242260
+
@@ -2349,7 +2340,15 @@
1729832340815
-
+
+
+ 1729878916804
+
+
+
+ 1729878916804
+
+
@@ -2360,7 +2359,6 @@
-
@@ -2385,7 +2383,8 @@
-
+
+
diff --git a/README.md b/README.md
index f12736096..7b6f30bda 100644
--- 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 `6.x-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in
+E.g. replace `6.0` 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 `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.
+1. Do a global replace of the SNAPSHOT tag with the version you are creating. E.g. replace `6.0` 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
index 5dba10f5c..2ae2bad88 100644
--- a/client-api/pom.xml
+++ b/client-api/pom.xml
@@ -8,7 +8,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.0client-apiOA4MP client API.
@@ -22,24 +22,24 @@
org.oa4mpclient
- 6.x-SNAPSHOT
+ 6.0org.oa4mpcommon
- 6.x-SNAPSHOT
+ 6.0org.oa4mpoauth2
- 6.x-SNAPSHOT
+ 6.0edu.uiuc.ncsa.securityservlet
- 6.x-SNAPSHOT
+ 6.0javax.servlet
diff --git a/client-installer/buildNumber.properties b/client-installer/buildNumber.properties
index ce7ef2926..fe047fb28 100644
--- a/client-installer/buildNumber.properties
+++ b/client-installer/buildNumber.properties
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
-#Fri Oct 25 11:57:48 CDT 2024
-buildNumber\\d*=534
+#Fri Oct 25 13:25:17 CDT 2024
+buildNumber\\d*=542
diff --git a/client-installer/pom.xml b/client-installer/pom.xml
index b60d89ada..b73893c99 100644
--- a/client-installer/pom.xml
+++ b/client-installer/pom.xml
@@ -6,7 +6,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.0client-installer
@@ -21,12 +21,12 @@
org.oa4mpinstaller
- 6.x-SNAPSHOT
+ 6.0org.oa4mpinstaller
- 6.x-SNAPSHOT
+ 6.0compile
diff --git a/client-loader/pom.xml b/client-loader/pom.xml
index c74a0e33b..a8d346508 100644
--- a/client-loader/pom.xml
+++ b/client-loader/pom.xml
@@ -7,7 +7,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.0client-loader
@@ -22,12 +22,12 @@
org.oa4mpclient-api
- 6.x-SNAPSHOT
+ 6.0edu.uiuc.ncsa.securityservlet
- 6.x-SNAPSHOT
+ 6.0org.apache.derby
@@ -37,12 +37,12 @@
org.oa4mpmyproxy-logon
- 6.x-SNAPSHOT
+ 6.0org.oa4mpoauth2
- 6.x-SNAPSHOT
+ 6.0javax.servlet
diff --git a/client-oauth2/pom.xml b/client-oauth2/pom.xml
index 9ed688cde..27d3bec33 100644
--- a/client-oauth2/pom.xml
+++ b/client-oauth2/pom.xml
@@ -7,7 +7,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.0client-oauth2
@@ -22,12 +22,12 @@
org.oa4mpclient-loader
- 6.x-SNAPSHOT
+ 6.0org.oa4mpclient-api
- 6.x-SNAPSHOT
+ 6.0mysql
@@ -43,12 +43,12 @@
edu.uiuc.ncsa.securityservlet
- 6.x-SNAPSHOT
+ 6.0org.oa4mpoauth2
- 6.x-SNAPSHOT
+ 6.0
diff --git a/client-test/pom.xml b/client-test/pom.xml
index bc139b7d2..a2e522fdb 100644
--- a/client-test/pom.xml
+++ b/client-test/pom.xml
@@ -7,7 +7,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.0client-test
@@ -17,33 +17,33 @@
org.oa4mpserver
- 6.x-SNAPSHOT
+ 6.0org.oa4mpclient-api
- 6.x-SNAPSHOT
+ 6.0org.oa4mpcommon
- 6.x-SNAPSHOT
+ 6.0edu.uiuc.ncsa.securitycore
- 6.x-SNAPSHOT
+ 6.0edu.uiuc.ncsa.securityservlet
- 6.x-SNAPSHOT
+ 6.0edu.uiuc.ncsa.securitycore
- 6.x-SNAPSHOT
+ 6.0test-jartest
@@ -51,14 +51,14 @@
org.oa4mpcommon
- 6.x-SNAPSHOT
+ 6.0test-jartestedu.uiuc.ncsa.securityutil
- 6.x-SNAPSHOT
+ 6.0test-jartest
@@ -67,7 +67,7 @@
org.oa4mpmyproxy-logon
- 6.x-SNAPSHOT
+ 6.0org.postgresql
diff --git a/client-webapp/pom.xml b/client-webapp/pom.xml
index 00620c884..98caa9088 100644
--- a/client-webapp/pom.xml
+++ b/client-webapp/pom.xml
@@ -9,7 +9,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.0client-webapp
@@ -19,12 +19,12 @@
edu.uiuc.ncsa.securityservlet
- 6.x-SNAPSHOT
+ 6.0org.oa4mpclient-api
- 6.x-SNAPSHOT
+ 6.0
diff --git a/client/pom.xml b/client/pom.xml
index d3288f0b4..06dcf23c4 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -5,7 +5,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.04.0.0
@@ -28,7 +28,7 @@
org.oa4mpcommon
- 6.x-SNAPSHOT
+ 6.0
diff --git a/common/pom.xml b/common/pom.xml
index 24cd12cd3..04de8003a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
org.oa4mpoa4mp-parent
- 6.x-SNAPSHOT
+ 6.04.0.0
@@ -39,12 +39,12 @@
edu.uiuc.ncsa.securityutil
- 6.x-SNAPSHOT
+ 6.0edu.uiuc.ncsa.securityutil
- 6.x-SNAPSHOT
+ 6.0testtest-jar
@@ -70,7 +70,7 @@
edu.uiuc.ncsa.securitystorage
- 6.x-SNAPSHOT
+ 6.0compile
diff --git a/common/src/main/java/org/oa4mp/delegation/common/OA4MPVersion.java b/common/src/main/java/org/oa4mp/delegation/common/OA4MPVersion.java
index 58c9a18b9..e0f3ae979 100644
--- 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 = "6.x-SNAPSHOT";
+ public static final String VERSION_NUMBER = "6.0";
}
diff --git a/docs/apidocs/allclasses-index.html b/docs/apidocs/allclasses-index.html
index 0085bec70..004386a1b 100644
--- a/docs/apidocs/allclasses-index.html
+++ b/docs/apidocs/allclasses-index.html
@@ -2,8 +2,8 @@
-
-All Classes (OA4MP Parent Project 6.x-SNAPSHOT API)
+
+All Classes (OA4MP Parent Project 6.0 API)
@@ -22,7 +22,7 @@