Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mspasiano committed May 15, 2024
2 parents dfe6a07 + 95aa040 commit 60fd883
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 15 deletions.
2 changes: 1 addition & 1 deletion cool-jconon-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-backend</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-io</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-keycloak/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-keycloak</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-pagopa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-pagopa</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-print/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-print</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-remote/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-remote</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-spid/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-spid</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<artifactId>cool-jconon-utils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-webapp-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<properties />
Expand Down
2 changes: 1 addition & 1 deletion cool-jconon-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>cool-jconon-parent</artifactId>
<groupId>it.cnr.si.cool.jconon</groupId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
</parent>

<properties />
Expand Down
14 changes: 13 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
## Release 5.5.11 -- _April 30, 2024_
## Release 5.5.12 -- _May 09, 2024_
**Changes**

>**FIX: java.lang.IllegalArgumentException: Invalid char (/) found at index (23) in sheet name**
>
>[cbd72fa5bd5e699](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/cbd72fa5bd5e699) marco.spasiano *May 09, 2024*
>**Changed documentation for the helpdesk section of the call**
>
>[3c0406617ac174e](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/3c0406617ac174e) marco.spasiano *May 07, 2024*
>**Changed documentation for the helpdesk section of the call**
>
>[51077ff86e14306](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/51077ff86e14306) marco.spasiano *May 07, 2024*
>**Added compressed archives in the call templates**
>
>[9ed52158b770f68](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/9ed52158b770f68) marco.spasiano *April 30, 2024*
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

project = 'Selezioni on-line'
release = '5.5.11'
release = '5.5.12'
author = u'Consiglio Nazionale delle Ricerche'

show_authors = True
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</parent>

<artifactId>cool-jconon-parent</artifactId>
<version>5.5.12-SNAPSHOT</version>
<version>5.5.13-SNAPSHOT</version>
<groupId>it.cnr.si.cool.jconon</groupId>
<name>Concorsi On-Line Parent</name>

Expand Down
4 changes: 2 additions & 2 deletions publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

publiccodeYmlVersion: '0.3'
name: cool-jconon
releaseDate: '2024-04-30'
releaseDate: '2024-05-09'
landingURL: 'https://selezionionline.cnr.it'
url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
applicationSuite: cool
softwareVersion: 5.5.11
softwareVersion: 5.5.12
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 60fd883

Please sign in to comment.