Skip to content

Commit

Permalink
Creating 4.4.4 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] authored and [email protected] committed Jun 22, 2020
1 parent a061b80 commit d24d3f8
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 53 deletions.
6 changes: 3 additions & 3 deletions ncsa-qdl-gui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>ncsa-security-all</artifactId>
<groupId>edu.uiuc.ncsa.security</groupId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>ncsa-qdl-gui</artifactId>
<version>1.1-QDL-SNAPSHOT</version>
<version>1.0.4</version>

<name>Text mode GUI for the QD Language</name>

Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-qdl</artifactId>
<version>1.1-QDL-SNAPSHOT</version>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>com.gitlab.klamonte</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ncsa-qdl-website/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-qdl-website</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>

<name>NCSA QDL Website</name>
<url>http://cilogon.github.io/</url>
Expand Down
24 changes: 12 additions & 12 deletions ncsa-qdl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
edu.uiuc.ncsa.security
</groupId>
<artifactId>ncsa-security-all</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-qdl</artifactId>
<name>The QD Language</name>
<packaging>jar</packaging>
<version>1.1-QDL-SNAPSHOT</version>
<version>1.0.4</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<additionalparam>-Xdoclint:none</additionalparam>
Expand Down Expand Up @@ -152,24 +152,24 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
Expand All @@ -185,34 +185,34 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-storage</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Binary file modified ncsa-qdl/src/main/docs/qdl_configuration.odt
Binary file not shown.
Binary file modified ncsa-qdl/src/main/docs/qdl_extensions.odt
Binary file not shown.
Binary file modified ncsa-qdl/src/main/docs/qdl_reference.odt
Binary file not shown.
Binary file modified ncsa-qdl/src/main/docs/qdl_workspace.odt
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* on 1/27/20 at 4:22 PM
*/
public interface QDLVersion {
static String VERSION = "1.1-QDL-SNAPSHOT";
static String VERSION = "1.0.4";
static String LANGUAGE_NAME = "qdl";
static String DEFAULT_FILE_EXTENSION = ".qdl"; // for scripts
static String DEFAULT_MODULE_FILE_EXTENSION = ".mdl"; // for modules
Expand Down
2 changes: 1 addition & 1 deletion ncsa-security-common/ncsa-security-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>
<artifactId>ncsa-security-core</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
* on 4/9/15 at 9:50 AM
*/
public interface Version {
public String VERSION_NUMBER="4.5-SNAPSHOT";
public String VERSION_NUMBER="4.4.4";
}
6 changes: 3 additions & 3 deletions ncsa-security-common/ncsa-security-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-security-servlet</artifactId>
Expand All @@ -16,12 +16,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Generated by Maven
#Thu Jun 04 08:05:30 CDT 2020
version=4.5-SNAPSHOT
#Mon Jun 22 14:09:13 CDT 2020
version=4.4.4
groupId=edu.uiuc.ncsa.security
artifactId=ncsa-security-servlet
6 changes: 3 additions & 3 deletions ncsa-security-common/ncsa-security-storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-security-storage</artifactId>
Expand All @@ -18,12 +18,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions ncsa-security-common/ncsa-security-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-security-util</artifactId>
Expand Down Expand Up @@ -111,13 +111,13 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ncsa-security-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-all</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>
<artifactId>ncsa-security-common</artifactId>
<packaging>pom</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>
<artifactId>ncsa-security-delegation-client</artifactId>
<name>NCSA delegation layer for clients</name>
Expand All @@ -15,12 +15,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-security-delegation-common</artifactId>
Expand Down Expand Up @@ -34,19 +34,19 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-storage</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>
<artifactId>ncsa-security-delegation-server</artifactId>
<name>NCSA delegation abstract service layer</name>
Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ncsa-security-delegation/ncsa-security-oauth-1.0a/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-security-oauth-1.0a</artifactId>
Expand All @@ -16,12 +16,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-server</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-client</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
Expand Down
16 changes: 8 additions & 8 deletions ncsa-security-delegation/ncsa-security-oauth-2.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</parent>

<artifactId>ncsa-security-oauth-2.0</artifactId>
Expand All @@ -16,37 +16,37 @@
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-server</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>

<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-client</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-servlet</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-core</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
<artifactId>ncsa-security-delegation-common</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-security-util</artifactId>
<version>4.5-SNAPSHOT</version>
<version>4.4.4</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>ncsa-qdl</artifactId>
<version>1.1-QDL-SNAPSHOT</version>
<version>1.0.4</version>
<scope>compile</scope>
</dependency>

Expand Down
Loading

0 comments on commit d24d3f8

Please sign in to comment.