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 Jul 18, 2024
2 parents 7664e65 + 0a369be commit 6091e4a
Show file tree
Hide file tree
Showing 14 changed files with 39 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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-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.20-SNAPSHOT</version>
<version>5.5.21-SNAPSHOT</version>
</parent>

<properties />
Expand Down
26 changes: 25 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
## Release 5.5.16 -- _June 07, 2024_
## Release 5.5.20 -- _June 28, 2024_
**Changes**

>**Hurry application only to user that can submit application**
>
>[c8527d92e081c7b](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/c8527d92e081c7b) marco.spasiano *June 28, 2024*

## Release 5.5.19 -- _June 26, 2024_
**Changes**

>**Fixed BUGS when extracting scores in xls.**
>
>[75ea50f3ac8934c](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/75ea50f3ac8934c) marco.spasiano *June 26, 2024*
>**Added control on the copy of the application, in case you can submit your application to the target call.**
>
>[a0e1e8529381bca](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/a0e1e8529381bca) marco.spasiano *June 15, 2024*

## Release 5.5.17 -- _June 15, 2024_
**Changes**

>**Added control on the copy of the application, in case you can submit your application to the target call.**
>
>[d744d28108ca5ed](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/d744d28108ca5ed) marco.spasiano *June 15, 2024*
>**It is always possible to appoint the commission by the administrator and the superuser when the call has been extended**
>
>[a23b50b92930843](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/a23b50b92930843) marco.spasiano *June 07, 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.19'
release = '5.5.20'
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.20-SNAPSHOT</version>
<version>5.5.21-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-06-26'
releaseDate: '2024-06-28'
landingURL: 'https://selezionionline.cnr.it'
url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
applicationSuite: cool
softwareVersion: 5.5.19
softwareVersion: 5.5.20
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 6091e4a

Please sign in to comment.