Skip to content

Commit

Permalink
5.2.8.2. Fixes for CIL-1541, CIL-1538
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] authored and [email protected] committed Oct 26, 2022
1 parent c869d62 commit f2792d5
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 22 deletions.
6 changes: 3 additions & 3 deletions gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>qdl</artifactId>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -22,13 +22,13 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>sas-server</artifactId>
<version>5.2-SNAPSHOT</version>
<version>5.2.8.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>language</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions language/buildNumber.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Wed Oct 26 11:41:45 CDT 2022
buildNumber\\d*=10595
#Wed Oct 26 14:58:10 CDT 2022
buildNumber\\d*=10606
10 changes: 5 additions & 5 deletions language/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>qdl</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</parent>

<artifactId>language</artifactId>
<name>QDL base language</name>
<packaging>jar</packaging>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<additionalparam>-Xdoclint:none</additionalparam>
Expand Down Expand Up @@ -151,13 +151,13 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>storage</artifactId>
<version>5.2-SNAPSHOT</version>
<version>5.2.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>util</artifactId>
<version>5.2-SNAPSHOT</version>
<version>5.2.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -215,7 +215,7 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>sas-server</artifactId>
<version>5.2-SNAPSHOT</version>
<version>5.2.8.2</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion language/src/main/resources/func_help.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2533,7 +2533,7 @@ including the endpoints.]]>

<entry id="version">
<body>
<![CDATA[The current version of QDL is 1.4-QDL-SNAPSHOT]]>
<![CDATA[The current version of QDL is 1.4.8.2]]>
</body>
</entry>
<entry id="if">
Expand Down
2 changes: 1 addition & 1 deletion language/src/main/scripts/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4-QDL-SNAPSHOT
1.4.8.2
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>qdl</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
<name>QDL root module</name>
<packaging>pom</packaging>
<description>The QDL programming Language.</description>
Expand Down
8 changes: 4 additions & 4 deletions qdl-sas/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>qdl</artifactId>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>qdl-sas</artifactId>
Expand All @@ -20,18 +20,18 @@
<dependency>
<groupId>edu.uiuc.ncsa.security</groupId>
<artifactId>sas-server</artifactId>
<version>5.2-SNAPSHOT</version>
<version>5.2.8.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>language</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>language</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>qdl</artifactId>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -19,12 +19,12 @@
<dependency>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>language</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</dependency>
<dependency>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>language</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions website/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>edu.uiuc.ncsa.qdl</groupId>
<artifactId>qdl</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>
</parent>

<artifactId>website</artifactId>
<version>1.4-QDL-SNAPSHOT</version>
<version>1.4.8.2</version>

<name>NCSA QDL Website</name>
<url>http://qdl.github.io/</url>
Expand Down
9 changes: 9 additions & 0 deletions website/src/site/apt/index.apt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ Standard Extensions

*{{{./pdf/qdldb-extension.pdf}The database extension.}}

OA4MP Extensions

*{{{./docs/qdl_server_scripts.pdf}Introduction to writing server-side scripts with QDL}}

*{{{./docs/creating_claim_sources2.pdf}Creating claims in server scripting.}}

*{{{./docs/claim_source_examples.pdf}Examples for creating claim sources.}}

*{{{./docs/token_handler_configuration.pdf}Configuring token handlers.}}

Javadoc for QDL

Expand Down

0 comments on commit f2792d5

Please sign in to comment.