Skip to content

Commit

Permalink
6.0 release check in
Browse files Browse the repository at this point in the history
  • Loading branch information
@jjg-123
jjg-123 committed Oct 25, 2024
1 parent 2bcbe96 commit 3e38e4d
Show file tree
Hide file tree
Showing 835 changed files with 2,425 additions and 2,426 deletions.
31 changes: 15 additions & 16 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions client-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>
<artifactId>client-api</artifactId>
<name>OA4MP client API.</name>
Expand All @@ -22,24 +22,24 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>client</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>

<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>common</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>

<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>oauth2</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>servlet</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
4 changes: 2 additions & 2 deletions client-installer/buildNumber.properties
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions client-installer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>

<artifactId>client-installer</artifactId>
Expand All @@ -21,12 +21,12 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>installer</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>installer</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions client-loader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>

<artifactId>client-loader</artifactId>
Expand All @@ -22,12 +22,12 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>client-api</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>servlet</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Expand All @@ -37,12 +37,12 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>myproxy-logon</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>oauth2</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
10 changes: 5 additions & 5 deletions client-oauth2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>

<artifactId>client-oauth2</artifactId>
Expand All @@ -22,12 +22,12 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>client-loader</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>client-api</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
Expand All @@ -43,12 +43,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>servlet</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>oauth2</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
</dependencies>

Expand Down
20 changes: 10 additions & 10 deletions client-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>

<artifactId>client-test</artifactId>
Expand All @@ -17,48 +17,48 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>server</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>client-api</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>

<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>common</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>core</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>servlet</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>core</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>common</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>util</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand All @@ -67,7 +67,7 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>myproxy-logon</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
6 changes: 3 additions & 3 deletions client-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>

<artifactId>client-webapp</artifactId>
Expand All @@ -19,12 +19,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>servlet</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>client-api</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.oa4mp</groupId>
<artifactId>oa4mp-parent</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>org.oa4mp</groupId>
<artifactId>common</artifactId>
<version>6.x-SNAPSHOT</version>
<version>6.0</version>
</dependency>
</dependencies>

Expand Down
Loading

0 comments on commit 3e38e4d

Please sign in to comment.