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 Jan 10, 2025
2 parents f788cb0 + e90c65d commit 0e3994a
Show file tree
Hide file tree
Showing 14 changed files with 19 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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-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.34-SNAPSHOT</version>
<version>5.5.35-SNAPSHOT</version>
</parent>

<properties />
Expand Down
6 changes: 5 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## Release 5.5.33 -- _December 17, 2024_
## Release 5.5.34 -- _December 20, 2024_
**Changes**

>**Gestione dei supervisori delle sedi di lavoro**
>
>[9ce848cd2a0daa4](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/9ce848cd2a0daa4) marco.spasiano *December 20, 2024*
>**Cambiata etichetta da "Titolo della Tesi" a "Argomento della Tesi" per il dottorato delle scheda anonima, e caricate anche le tipologie della scheda anonima nel cambio dell'etichetta**
>
>[1bd27fe37bac267](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/1bd27fe37bac267) marco.spasiano *December 17, 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.33'
release = '5.5.34'
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.34-SNAPSHOT</version>
<version>5.5.35-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.4.0'
name: cool-jconon
releaseDate: '2024-12-17'
releaseDate: '2024-12-20'
landingURL: 'https://selezionionline.cnr.it'
url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
applicationSuite: cool
softwareVersion: 5.5.33
softwareVersion: 5.5.34
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 0e3994a

Please sign in to comment.