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 Oct 16, 2023
2 parents a322c25 + 12f6413 commit 4a82f32
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 13 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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-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.60-SNAPSHOT</version>
<version>5.2.61-SNAPSHOT</version>
</parent>

<properties />
Expand Down
16 changes: 16 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## Release 5.2.60 -- _October 13, 2023_
**Changes**

>**FIX call detail i18n**
>
>[64e322f67c97f07](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/64e322f67c97f07) marco.spasiano *October 13, 2023*

## Release 5.2.59 -- _October 13, 2023_
**Changes**

>**Passed the list of aspects during the update of the availability**
>
>[2f896187aa8c514](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/2f896187aa8c514) marco.spasiano *October 13, 2023*

## Release 5.2.58 -- _October 12, 2023_
**Changes**

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.59'
release = '5.2.60'
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.60-SNAPSHOT</version>
<version>5.2.61-SNAPSHOT</version>
<groupId>it.cnr.si.cool.jconon</groupId>
<name>Concorsi On-Line Parent</name>

Expand Down
2 changes: 1 addition & 1 deletion publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ releaseDate: '2023-10-13'
landingURL: 'https://selezionionline.cnr.it'
url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
applicationSuite: cool
softwareVersion: 5.2.59
softwareVersion: 5.2.60
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 4a82f32

Please sign in to comment.