Merge remote-tracking branch 'origin/master'

consiglionazionaledellericerche · Jul 27, 2023 · 9c4c203 · 9c4c203
2 parents 4e97386 + 0a3be88
commit 9c4c203
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 15 deletions.
diff --git a/cool-jconon-backend/pom.xml b/cool-jconon-backend/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cool-jconon-parent</artifactId>
         <groupId>it.cnr.si.cool.jconon</groupId>
-        <version>5.2.33-SNAPSHOT</version>
+        <version>5.2.34-SNAPSHOT</version>
     </parent>
 
     <artifactId>cool-jconon-backend</artifactId>

diff --git a/cool-jconon-io/pom.xml b/cool-jconon-io/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cool-jconon-parent</artifactId>
         <groupId>it.cnr.si.cool.jconon</groupId>
-        <version>5.2.33-SNAPSHOT</version>
+        <version>5.2.34-SNAPSHOT</version>
     </parent>
 
     <artifactId>cool-jconon-io</artifactId>

diff --git a/cool-jconon-keycloak/pom.xml b/cool-jconon-keycloak/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cool-jconon-parent</artifactId>
         <groupId>it.cnr.si.cool.jconon</groupId>
-        <version>5.2.33-SNAPSHOT</version>
+        <version>5.2.34-SNAPSHOT</version>
     </parent>
 
     <artifactId>cool-jconon-keycloak</artifactId>

diff --git a/cool-jconon-pagopa/pom.xml b/cool-jconon-pagopa/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cool-jconon-parent</artifactId>
         <groupId>it.cnr.si.cool.jconon</groupId>
-        <version>5.2.33-SNAPSHOT</version>
+        <version>5.2.34-SNAPSHOT</version>
     </parent>
 
     <artifactId>cool-jconon-pagopa</artifactId>

diff --git a/cool-jconon-print/pom.xml b/cool-jconon-print/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>cool-jconon-parent</artifactId>
     <groupId>it.cnr.si.cool.jconon</groupId>
-    <version>5.2.33-SNAPSHOT</version>
+    <version>5.2.34-SNAPSHOT</version>
   </parent>
 
   <artifactId>cool-jconon-print</artifactId>

diff --git a/cool-jconon-remote/pom.xml b/cool-jconon-remote/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>cool-jconon-parent</artifactId>
     <groupId>it.cnr.si.cool.jconon</groupId>
-    <version>5.2.33-SNAPSHOT</version>
+    <version>5.2.34-SNAPSHOT</version>
   </parent>
 
   <artifactId>cool-jconon-remote</artifactId>

diff --git a/cool-jconon-spid/pom.xml b/cool-jconon-spid/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>cool-jconon-parent</artifactId>
     <groupId>it.cnr.si.cool.jconon</groupId>
-    <version>5.2.33-SNAPSHOT</version>
+    <version>5.2.34-SNAPSHOT</version>
   </parent>
 
   <artifactId>cool-jconon-spid</artifactId>

diff --git a/cool-jconon-utils/pom.xml b/cool-jconon-utils/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>cool-jconon-parent</artifactId>
     <groupId>it.cnr.si.cool.jconon</groupId>
-    <version>5.2.33-SNAPSHOT</version>
+    <version>5.2.34-SNAPSHOT</version>
   </parent>
 
   <artifactId>cool-jconon-utils</artifactId>

diff --git a/cool-jconon-webapp-resources/pom.xml b/cool-jconon-webapp-resources/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>cool-jconon-parent</artifactId>
     <groupId>it.cnr.si.cool.jconon</groupId>
-    <version>5.2.33-SNAPSHOT</version>
+    <version>5.2.34-SNAPSHOT</version>
   </parent>
 
   <properties />

diff --git a/cool-jconon-webapp/pom.xml b/cool-jconon-webapp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cool-jconon-parent</artifactId>
         <groupId>it.cnr.si.cool.jconon</groupId>
-        <version>5.2.33-SNAPSHOT</version>
+        <version>5.2.34-SNAPSHOT</version>
     </parent>
 
     <properties />

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,26 @@
-## Release 5.2.31  -- _July 21, 2023_ 
+## Release 5.2.33  -- _July 26, 2023_ 
 **Changes**
 
+>**Added customizations for Research Grants**
+>
+>[64bc4fc3b425a3f](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/64bc4fc3b425a3f) marco.spasiano *July 26, 2023*
+
+>**Added pagoPA for PNRR calls**
+>
+>[0cdfe9cb0919783](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/0cdfe9cb0919783) marco.spasiano *July 26, 2023*
+
+
+## Release 5.2.32  -- _July 25, 2023_ 
+**Changes**
+
+>**FIX button authorization on file attchments on call**
+>
+>[60f7cbac22e6a97](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/60f7cbac22e6a97) marco.spasiano *July 25, 2023*
+
+>**Remove file name from print application**
+>
+>[5d779bf9bba8f17](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/5d779bf9bba8f17) marco.spasiano *July 25, 2023*
+
 >**Activate sonar profile & remove validate attachments when load application**
 >
 >[a2883670448a4a3](https://github.com/consiglionazionaledellericerche/cool-jconon/commit/a2883670448a4a3) marco.spasiano *July 21, 2023*

diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,7 @@
 }
 
 project = 'Selezioni on-line'
-release = '5.2.32'
+release = '5.2.33'
 author = u'Consiglio Nazionale delle Ricerche'
 
 show_authors = True

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
     </parent>
 
     <artifactId>cool-jconon-parent</artifactId>
-    <version>5.2.33-SNAPSHOT</version>
+    <version>5.2.34-SNAPSHOT</version>
     <groupId>it.cnr.si.cool.jconon</groupId>
     <name>Concorsi On-Line Parent</name>
 

diff --git a/publiccode.yml b/publiccode.yml
@@ -4,11 +4,11 @@
 
 publiccodeYmlVersion: '0.3'
 name: cool-jconon
-releaseDate: '2023-07-25'
+releaseDate: '2023-07-26'
 landingURL: 'https://selezionionline.cnr.it'
 url: 'https://github.com/consiglionazionaledellericerche/cool-jconon'
 applicationSuite: cool
-softwareVersion: 5.2.32
+softwareVersion: 5.2.33
 developmentStatus: stable
 softwareType: standalone/web
 platforms: