Skip to content

Commit f697f39

Browse files
authored
Merge pull request #18 from nordic-institute/develop
Hotfix 2.9.1 merge
2 parents 6daba54 + 0d8bdab commit f697f39

File tree

7 files changed

+60
-6
lines changed

7 files changed

+60
-6
lines changed

.github/workflows/run-tests.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: MISP2 tests
2+
on: [pull_request]
3+
jobs:
4+
run-test:
5+
runs-on: ubuntu-22.04
6+
steps:
7+
- uses: actions/checkout@v3
8+
with:
9+
submodules: 'true'
10+
- name: Set up JDK 8
11+
uses: actions/setup-java@v3
12+
with:
13+
java-version: '8'
14+
distribution: 'temurin'
15+
- name: Set up Gradle
16+
uses: gradle/gradle-build-action@v2
17+
- name: Run test
18+
run: ./gradlew test
19+
- name: Store upload test artifacts
20+
uses: actions/upload-artifact@v3
21+
if: failure()
22+
with:
23+
name: Test results
24+
path: |
25+
/home/runner/work/misp2/misp2/web-app/build/reports/tests/test/index.html
26+
/home/runner/work/misp2/misp2/web-app/build/it-screenshots/

packages/xtee-misp2-application/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
xtee-misp2-application (2.9.1) stable; urgency=medium
2+
3+
* Update Struts dependency
4+
5+
-- NIIS <[email protected]> Thu, 28 Dec 2023 10:25:04 +0200
6+
17
xtee-misp2-application (2.9.0) stable; urgency=medium
28

39
* Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-base/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
xtee-misp2-base (2.9.1) stable; urgency=medium
2+
3+
* Update Struts dependency
4+
5+
-- NIIS <[email protected]> Thu, 28 Dec 2023 10:25:04 +0200
6+
17
xtee-misp2-base (2.9.0) stable; urgency=medium
28

39
* Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-orbeon/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
xtee-misp2-orbeon (2.9.1) stable; urgency=medium
2+
3+
* Update Struts dependency
4+
5+
-- NIIS <[email protected]> Thu, 28 Dec 2023 10:25:04 +0200
6+
17
xtee-misp2-orbeon (2.9.0) stable; urgency=medium
28

39
* Fix fresh install issues on Ubuntu 22.04

packages/xtee-misp2-postgresql/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
xtee-misp2-postgresql (2.9.1) stable; urgency=medium
2+
3+
* Update Struts dependency
4+
5+
-- NIIS <[email protected]> Thu, 28 Dec 2023 10:25:04 +0200
6+
17
xtee-misp2-postgresql (2.9.0) stable; urgency=medium
28

39
* Fix fresh install issues on Ubuntu 22.04

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pgsql_default_port=5432
2424
pgsql_default_dbname=misp2db
2525
pgsql_dir=/usr/lib/postgresql/14/bin
2626
pgsql_conf_dir=/etc/postgresql/14/main
27-
current_version="2.9.0"
27+
current_version="2.9.1"
2828

2929

3030
error_prefix="\e[1m\e[91mERROR!\e[0m"
@@ -416,6 +416,10 @@ else
416416
if [ "$version" == "2.8.0" ]
417417
then
418418
version="2.9.0"
419+
fi
420+
if [ "$version" == "2.9.0" ]
421+
then
422+
version="2.9.1"
419423
fi
420424
# Substitute schema name in alter scripts
421425
perl -pi -e "s/<misp2_schema>/$schema_name/g" $workdir/tmp.alter.sql

web-app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ dependencies {
2222
implementation 'org.postgresql:postgresql:42.2.19'
2323
implementation 'org.hibernate:hibernate-core:5.4.30.Final'
2424
implementation 'org.hibernate:hibernate-entitymanager:5.4.30.Final'
25-
implementation 'org.apache.struts:struts2-spring-plugin:2.5.30'
26-
implementation 'org.apache.struts:struts2-junit-plugin:2.5.30'
27-
implementation 'org.apache.struts:struts2-sitemesh-plugin:2.5.30'
28-
implementation 'org.apache.struts:struts2-core:2.5.30'
25+
implementation 'org.apache.struts:struts2-spring-plugin:2.5.33'
26+
implementation 'org.apache.struts:struts2-junit-plugin:2.5.33'
27+
implementation 'org.apache.struts:struts2-sitemesh-plugin:2.5.33'
28+
implementation 'org.apache.struts:struts2-core:2.5.33'
2929
implementation 'net.sf.saxon:Saxon-HE:9.5.1-8'
3030
implementation 'cglib:cglib-nodep:3.3.0'
3131
implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
@@ -63,7 +63,7 @@ dependencies {
6363
}
6464

6565
group = 'misp2'
66-
version = '2.9.0'
66+
version = '2.9.1'
6767
description = 'MISP2 web application'
6868
java.sourceCompatibility = JavaVersion.VERSION_1_8
6969

0 commit comments

Comments
 (0)