Skip to content

Commit

Permalink
5.3.1 checkin.
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] authored and [email protected] committed May 24, 2023
1 parent 9ad6802 commit f125b01
Show file tree
Hide file tree
Showing 443 changed files with 1,692 additions and 1,468 deletions.
31 changes: 10 additions & 21 deletions admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>cilogon</artifactId>
<groupId>org.cilogon</groupId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<!--
Expand Down Expand Up @@ -58,13 +58,7 @@
-->
<version>3.0.1</version>
</dependency>
<!-- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
-->

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand All @@ -80,26 +74,21 @@
<artifactId>mariadb-java-client</artifactId>
<version>2.7.3</version>
</dependency>
<!-- <dependency>
<artifactId>cilogon-server</artifactId>
<groupId>org.cilogon</groupId>
<version>5.3-SNAPSHOT</version>
</dependency>-->

<dependency>
<artifactId>cilogon-loader</artifactId>
<artifactId>loader</artifactId>
<groupId>org.cilogon</groupId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
</dependency>
<!-- <dependency>
<artifactId>cilogon-admin</artifactId>
<groupId>org.cilogon</groupId>
<version>5.3-SNAPSHOT</version>
</dependency>-->
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>server-admin</artifactId>
<version>5.3.1</version>
</dependency>
<dependency>
<groupId>org.cilogon</groupId>
<artifactId>loader</artifactId>
<version>5.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<profiles>
Expand Down
2 changes: 1 addition & 1 deletion admin/src/main/java/org/cilogon/oauth2/admin/ArchivedUserStoreCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import edu.uiuc.ncsa.security.core.util.MyLoggingFacade;
import edu.uiuc.ncsa.security.util.cli.InputLine;
import org.cilogon.oauth2.servlet.storage.archiveUser.ArchivedUser;
import org.cilogon.oauth2.servlet.storage.archiveUser.ArchivedUserStore;
import org.cilogon.oauth2.servlet.storage.user.User;
import org.cilogon.oauth2.servlet.storage.user.UserNotFoundException;
import org.cilogon.oauth2.servlet.storage.user.UserStore;
import org.cilogon.oauth2.servlet.util.ArchivedUserStore;

import java.util.HashSet;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions admin/src/main/java/org/cilogon/oauth2/admin/TwoFactorCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import edu.uiuc.ncsa.security.core.Store;
import edu.uiuc.ncsa.security.core.util.BasicIdentifier;
import edu.uiuc.ncsa.security.core.util.MyLoggingFacade;
import org.cilogon.oauth2.servlet.twofactor.TwoFactorInfo;
import org.cilogon.oauth2.servlet.twofactor.TwoFactorStore;
import org.cilogon.oauth2.servlet.storage.twofactor.TwoFactorInfo;
import org.cilogon.oauth2.servlet.storage.twofactor.TwoFactorStore;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion admin/src/main/java/org/cilogon/oauth2/admin/UserStoreCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import edu.uiuc.ncsa.security.util.cli.BasicSorter;
import edu.uiuc.ncsa.security.util.cli.InputLine;
import org.cilogon.oauth2.servlet.storage.user.*;
import org.cilogon.oauth2.servlet.util.ArchivedUserStore;
import org.cilogon.oauth2.servlet.util.DNUtil;
import org.cilogon.oauth2.servlet.storage.archiveUser.ArchivedUserStore;

import java.io.IOException;

Expand Down
18 changes: 9 additions & 9 deletions client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<parent>
<artifactId>cilogon</artifactId>
<groupId>org.cilogon</groupId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
</parent>
<!--
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
-->
<name>CILogon client</name>
<artifactId>client</artifactId>
Expand Down Expand Up @@ -50,12 +50,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>client-api</artifactId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>client-oauth2</artifactId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
<type>war</type>
<scope>runtime</scope>
</dependency>
Expand All @@ -67,25 +67,25 @@
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>client-loader-oauth2</artifactId>
<version>5.3-SNAPSHOT</version>
<artifactId>client-loader</artifactId>
<version>5.3.1</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>common</artifactId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
</dependency>
<dependency>
<artifactId>util</artifactId>
<groupId>edu.uiuc.ncsa.security</groupId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<artifactId>common</artifactId>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<version>5.3-SNAPSHOT</version>
<version>5.3.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions docs/apidocs/allclasses-index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.18) on Wed May 24 12:48:46 CDT 2023 -->
<title>All Classes (Cilogon parent module 5.3-SNAPSHOT API)</title>
<!-- Generated by javadoc (11.0.18) on Wed May 24 16:12:55 CDT 2023 -->
<title>All Classes (Cilogon parent module 5.3.1 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-05-24">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
Expand All @@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="All Classes (Cilogon parent module 5.3-SNAPSHOT API)";
parent.document.title="All Classes (Cilogon parent module 5.3.1 API)";
}
}
catch(err) {
Expand Down Expand Up @@ -1085,7 +1085,7 @@ <h1 title="All&amp;nbsp;Classes" class="title">All&nbsp;Classes</h1>
</th>
</tr>
<tr id="i145" class="rowColor">
<td class="colFirst"><a href="org/cilogon/qdl/module/storage/TwoFactorMC.html" title="class in org.cilogon.qdl.module.storage">TwoFactorMC</a>&lt;<a href="org/cilogon/qdl/module/storage/TwoFactorMC.html" title="type parameter in TwoFactorMC">V</a> extends org.cilogon.oauth2.servlet.twofactor.TwoFactorInfo&gt;</td>
<td class="colFirst"><a href="org/cilogon/qdl/module/storage/TwoFactorMC.html" title="class in org.cilogon.qdl.module.storage">TwoFactorMC</a>&lt;<a href="org/cilogon/qdl/module/storage/TwoFactorMC.html" title="type parameter in TwoFactorMC">V</a> extends <a href="org/cilogon/oauth2/servlet/storage/twofactor/TwoFactorInfo.html" title="class in org.cilogon.oauth2.servlet.storage.twofactor">TwoFactorInfo</a>&gt;</td>
<th class="colLast" scope="row">
<div class="block">Created by Jeff Gaynor<br>
on 12/23/20 at 1:25 PM</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/apidocs/allclasses.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.18) on Wed May 24 12:48:46 CDT 2023 -->
<title>All Classes (Cilogon parent module 5.3-SNAPSHOT API)</title>
<!-- Generated by javadoc (11.0.18) on Wed May 24 16:12:55 CDT 2023 -->
<title>All Classes (Cilogon parent module 5.3.1 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-05-24">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
Expand Down
6 changes: 3 additions & 3 deletions docs/apidocs/allpackages-index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.18) on Wed May 24 12:48:46 CDT 2023 -->
<title>All Packages (Cilogon parent module 5.3-SNAPSHOT API)</title>
<!-- Generated by javadoc (11.0.18) on Wed May 24 16:12:55 CDT 2023 -->
<title>All Packages (Cilogon parent module 5.3.1 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-05-24">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
Expand All @@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="All Packages (Cilogon parent module 5.3-SNAPSHOT API)";
parent.document.title="All Packages (Cilogon parent module 5.3.1 API)";
}
}
catch(err) {
Expand Down
6 changes: 3 additions & 3 deletions docs/apidocs/constant-values.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.18) on Wed May 24 12:48:46 CDT 2023 -->
<title>Constant Field Values (Cilogon parent module 5.3-SNAPSHOT API)</title>
<!-- Generated by javadoc (11.0.18) on Wed May 24 16:12:55 CDT 2023 -->
<title>Constant Field Values (Cilogon parent module 5.3.1 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-05-24">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
Expand All @@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Constant Field Values (Cilogon parent module 5.3-SNAPSHOT API)";
parent.document.title="Constant Field Values (Cilogon parent module 5.3.1 API)";
}
}
catch(err) {
Expand Down
6 changes: 3 additions & 3 deletions docs/apidocs/deprecated-list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.18) on Wed May 24 12:48:46 CDT 2023 -->
<title>Deprecated List (Cilogon parent module 5.3-SNAPSHOT API)</title>
<!-- Generated by javadoc (11.0.18) on Wed May 24 16:12:55 CDT 2023 -->
<title>Deprecated List (Cilogon parent module 5.3.1 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-05-24">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
Expand All @@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Deprecated List (Cilogon parent module 5.3-SNAPSHOT API)";
parent.document.title="Deprecated List (Cilogon parent module 5.3.1 API)";
}
}
catch(err) {
Expand Down
6 changes: 3 additions & 3 deletions docs/apidocs/help-doc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.18) on Wed May 24 12:48:46 CDT 2023 -->
<title>API Help (Cilogon parent module 5.3-SNAPSHOT API)</title>
<!-- Generated by javadoc (11.0.18) on Wed May 24 16:12:55 CDT 2023 -->
<title>API Help (Cilogon parent module 5.3.1 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-05-24">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
Expand All @@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="API Help (Cilogon parent module 5.3-SNAPSHOT API)";
parent.document.title="API Help (Cilogon parent module 5.3.1 API)";
}
}
catch(err) {
Expand Down
Loading

0 comments on commit f125b01

Please sign in to comment.