Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update Struts to 2.5.33 and bump version for hotfix release #17

Merged
merged 1 commit into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/xtee-misp2-application/debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions packages/xtee-misp2-base/debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions packages/xtee-misp2-orbeon/debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions packages/xtee-misp2-postgresql/debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions web-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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

Expand Down
Loading