diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6c3bc38e4..69056d80c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,23 +10,19 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -35,7 +31,6 @@
-
@@ -65,6 +60,8 @@
+
+
@@ -89,6 +86,8 @@
+
+
@@ -323,6 +322,7 @@
+
@@ -338,6 +338,7 @@
+
@@ -719,7 +720,6 @@
-
@@ -753,6 +753,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -804,42 +817,36 @@
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1948,15 +1955,7 @@
-
-
-
-
- 1704237008240
-
-
-
- 1704237008240
+
@@ -2342,7 +2341,15 @@
1729343653210
-
+
+
+ 1729832340815
+
+
+
+ 1729832340815
+
+
@@ -2353,7 +2360,6 @@
-
@@ -2378,7 +2384,8 @@
-
+
+
diff --git a/README.md b/README.md
index 2aaedec8d..f12736096 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 `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
index 26a1c08a4..5dba10f5c 100644
--- a/client-api/pom.xml
+++ b/client-api/pom.xml
@@ -8,7 +8,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTclient-apiOA4MP client API.
@@ -22,24 +22,24 @@
org.oa4mpclient
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpcommon
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpoauth2
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTedu.uiuc.ncsa.securityservlet
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTjavax.servlet
diff --git a/client-installer/buildNumber.properties b/client-installer/buildNumber.properties
index 866d2430a..ce7ef2926 100644
--- 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
index 12eceb118..b60d89ada 100644
--- a/client-installer/pom.xml
+++ b/client-installer/pom.xml
@@ -6,7 +6,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTclient-installer
@@ -21,12 +21,12 @@
org.oa4mpinstaller
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpinstaller
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTcompile
diff --git a/client-loader/pom.xml b/client-loader/pom.xml
index 6a20f324e..c74a0e33b 100644
--- a/client-loader/pom.xml
+++ b/client-loader/pom.xml
@@ -7,7 +7,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTclient-loader
@@ -22,12 +22,12 @@
org.oa4mpclient-api
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTedu.uiuc.ncsa.securityservlet
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.apache.derby
@@ -37,12 +37,12 @@
org.oa4mpmyproxy-logon
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpoauth2
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTjavax.servlet
diff --git a/client-oauth2/pom.xml b/client-oauth2/pom.xml
index 371b67f94..9ed688cde 100644
--- a/client-oauth2/pom.xml
+++ b/client-oauth2/pom.xml
@@ -7,7 +7,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTclient-oauth2
@@ -22,12 +22,12 @@
org.oa4mpclient-loader
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpclient-api
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTmysql
@@ -43,12 +43,12 @@
edu.uiuc.ncsa.securityservlet
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpoauth2
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOT
diff --git a/client-test/pom.xml b/client-test/pom.xml
index e6dfb19cf..bc139b7d2 100644
--- a/client-test/pom.xml
+++ b/client-test/pom.xml
@@ -7,7 +7,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTclient-test
@@ -17,33 +17,33 @@
org.oa4mpserver
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpclient-api
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpcommon
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTedu.uiuc.ncsa.securitycore
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTedu.uiuc.ncsa.securityservlet
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTedu.uiuc.ncsa.securitycore
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTtest-jartest
@@ -51,14 +51,14 @@
org.oa4mpcommon
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTtest-jartestedu.uiuc.ncsa.securityutil
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTtest-jartest
@@ -67,7 +67,7 @@
org.oa4mpmyproxy-logon
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.postgresql
diff --git a/client-webapp/pom.xml b/client-webapp/pom.xml
index bedb4e781..00620c884 100644
--- a/client-webapp/pom.xml
+++ b/client-webapp/pom.xml
@@ -9,7 +9,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTclient-webapp
@@ -19,12 +19,12 @@
edu.uiuc.ncsa.securityservlet
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTorg.oa4mpclient-api
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOT
diff --git a/client/pom.xml b/client/pom.xml
index 554e6bed8..d3288f0b4 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -5,7 +5,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOT4.0.0
@@ -28,7 +28,7 @@
org.oa4mpcommon
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOT
diff --git a/common/pom.xml b/common/pom.xml
index 6a09a4646..24cd12cd3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
org.oa4mpoa4mp-parent
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOT4.0.0
@@ -39,12 +39,12 @@
edu.uiuc.ncsa.securityutil
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTedu.uiuc.ncsa.securityutil
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTtesttest-jar
@@ -70,7 +70,7 @@
edu.uiuc.ncsa.securitystorage
- 5.6-SNAPSHOT
+ 6.x-SNAPSHOTcompile
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 095cc8eb4..58c9a18b9 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 = "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
index 7b4def682..0085bec70 100644
--- a/docs/apidocs/allclasses-index.html
+++ b/docs/apidocs/allclasses-index.html
@@ -2,10 +2,10 @@
-
-All Classes (OA4MP Parent Project 5.6-SNAPSHOT API)
+
+All Classes (OA4MP Parent Project 6.x-SNAPSHOT API)
-
+
@@ -22,7 +22,7 @@