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 12, 2023
2 parents f62fa5a + 75a01d9 commit 909da0c
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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.2-SNAPSHOT</version>
<version>5.2.3-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.2.1 -- _May 02, 2023_
## Release 5.2.2 -- _May 06, 2023_
**Changes**

>**Added the display of provisional applications even with an expired call by an administrator**
>
>[6990fe84431f650](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/6990fe84431f650) marco.spasiano *May 06, 2023*
>**Added the permissions to the pagoPa payment receipt**
>
>[8ce35cb4999e63b](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/8ce35cb4999e63b) marco.spasiano *May 04, 2023*
>**Manual update for payment through pagoPA**
>
>[72d5255d013d829](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/72d5255d013d829) marco.spasiano *May 03, 2023*
>**Remove http basic from keycloak configuration**
>
>[84d9cec23cab73b](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/84d9cec23cab73b) marco.spasiano *May 02, 2023*
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.2.1'
release = '5.2.2'
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.2.2-SNAPSHOT</version>
<version>5.2.3-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: '2023-05-02'
releaseDate: '2023-05-06'
landingURL: 'https://selezionionline.cnr.it'
url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
applicationSuite: cool
softwareVersion: 5.2.1
softwareVersion: 5.2.2
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 909da0c

Please sign in to comment.