Merge pull request #18 from nordic-institute/develop

Hotfix 2.9.1 merge

Author: raits

.github/workflows/run-tests.yml

@@ -0,0 +1,26 @@
+name: MISP2 tests
+on: [pull_request]
+jobs:
+  run-test:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Run test
+        run: ./gradlew test
+      - name: Store upload test artifacts
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: Test results
+          path: |
+            /home/runner/work/misp2/misp2/web-app/build/reports/tests/test/index.html
+            /home/runner/work/misp2/misp2/web-app/build/it-screenshots/

packages/xtee-misp2-application/debian/changelog

@@ -1,3 +1,9 @@
+xtee-misp2-application (2.9.1) stable; urgency=medium
+
+  * Update Struts dependency
+
+ -- NIIS <[email protected]>  Thu, 28 Dec 2023 10:25:04 +0200
+
 xtee-misp2-application (2.9.0) stable; urgency=medium
 
   * Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-base/debian/changelog

@@ -1,3 +1,9 @@
+xtee-misp2-base (2.9.1) stable; urgency=medium
+
+  * Update Struts dependency
+
+ -- NIIS <[email protected]>  Thu, 28 Dec 2023 10:25:04 +0200
+
 xtee-misp2-base (2.9.0) stable; urgency=medium
 
   * Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-orbeon/debian/changelog

@@ -1,3 +1,9 @@
+xtee-misp2-orbeon (2.9.1) stable; urgency=medium
+
+  * Update Struts dependency
+
+ -- NIIS <[email protected]>  Thu, 28 Dec 2023 10:25:04 +0200
+
 xtee-misp2-orbeon (2.9.0) stable; urgency=medium
 
   * Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-postgresql/debian/changelog

@@ -1,3 +1,9 @@
+xtee-misp2-postgresql (2.9.1) stable; urgency=medium
+
+  * Update Struts dependency
+
+ -- NIIS <[email protected]>  Thu, 28 Dec 2023 10:25:04 +0200
+
 xtee-misp2-postgresql (2.9.0) stable; urgency=medium
 
   * Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-postgresql/install-misp2-postgresql-debconf.sh

@@ -24,7 +24,7 @@ pgsql_default_port=5432
 pgsql_default_dbname=misp2db
 pgsql_dir=/usr/lib/postgresql/14/bin
 pgsql_conf_dir=/etc/postgresql/14/main
-current_version="2.9.0"
+current_version="2.9.1"
 
 
 error_prefix="\e[1m\e[91mERROR!\e[0m"
@@ -416,6 +416,10 @@ else
 	if [ "$version" == "2.8.0" ]
     	then
     		version="2.9.0"
+    fi
+	if [ "$version" == "2.9.0" ]
+    	then
+    		version="2.9.1"
     fi
 	# Substitute schema name in alter scripts
 	perl -pi -e "s/<misp2_schema>/$schema_name/g" $workdir/tmp.alter.sql

web-app/build.gradle

@@ -22,10 +22,10 @@ dependencies {
   implementation 'org.postgresql:postgresql:42.2.19'
   implementation 'org.hibernate:hibernate-core:5.4.30.Final'
   implementation 'org.hibernate:hibernate-entitymanager:5.4.30.Final'
-  implementation 'org.apache.struts:struts2-spring-plugin:2.5.30'
-  implementation 'org.apache.struts:struts2-junit-plugin:2.5.30'
-  implementation 'org.apache.struts:struts2-sitemesh-plugin:2.5.30'
-  implementation 'org.apache.struts:struts2-core:2.5.30'
+  implementation 'org.apache.struts:struts2-spring-plugin:2.5.33'
+  implementation 'org.apache.struts:struts2-junit-plugin:2.5.33'
+  implementation 'org.apache.struts:struts2-sitemesh-plugin:2.5.33'
+  implementation 'org.apache.struts:struts2-core:2.5.33'
   implementation 'net.sf.saxon:Saxon-HE:9.5.1-8'
   implementation 'cglib:cglib-nodep:3.3.0'
   implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
@@ -63,7 +63,7 @@ dependencies {
 }
 
 group = 'misp2'
-version = '2.9.0'
+version = '2.9.1'
 description = 'MISP2 web application'
 java.sourceCompatibility = JavaVersion.VERSION_1_8