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 Nov 23, 2023
2 parents 79d40cc + a953fd1 commit 729b475
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 14 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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-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.3.5-SNAPSHOT</version>
<version>5.3.6-SNAPSHOT</version>
</parent>

<properties />
Expand Down
36 changes: 36 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
## Release 5.3.5 -- _November 22, 2023_
**Changes**

>**Management of the video for gender equality by the commissioners, the use of the video takes place through the PeerTube API**
>
>[490b094c1d54b3f](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/490b094c1d54b3f) marco.spasiano *November 22, 2023*
>**Add aspect and change labels**
>
>[6549c8a538f1178](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/6549c8a538f1178) marco.spasiano *November 21, 2023*
>**Add aspect and change labels**
>
>[d3b6a3640ab40da](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/d3b6a3640ab40da) marco.spasiano *November 21, 2023*
>**Management of the commissioners' register**
>
>[d54e1814bcaeb20](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/d54e1814bcaeb20) marco.spasiano *November 20, 2023*
>**Management of the commissioners' register**
>
>[4a57b9ea6dce257](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/4a57b9ea6dce257) marco.spasiano *November 20, 2023*
>**The RdP can now also publish the call**
>
>[9ac3e8039689727](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/9ac3e8039689727) marco.spasiano *November 17, 2023*
>**Management of the video for gender equality by the commissioners, the use of the video takes place through the PeerTube API**
>
>[74b8c9b61edfc06](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/74b8c9b61edfc06) marco.spasiano *November 13, 2023*
>**ASI has been added among the entities being reused**
>
>[7189c1eeb16a47d](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/7189c1eeb16a47d) marco.spasiano *November 08, 2023*

## Release 5.3.1 -- _November 02, 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.3.4'
release = '5.3.5'
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.3.5-SNAPSHOT</version>
<version>5.3.6-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-11-21'
releaseDate: '2023-11-22'
landingURL: 'https://selezionionline.cnr.it'
url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
applicationSuite: cool
softwareVersion: 5.3.4
softwareVersion: 5.3.5
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 729b475

Please sign in to comment.