From ecfbd0b73fe716d681c70a0c7c10accbcbd6ed92 Mon Sep 17 00:00:00 2001 From: Jarek Pietraszek Date: Wed, 2 Feb 2022 12:05:17 +0100 Subject: [PATCH 1/6] Change freemarker version to 2.3.31 This should fix compatibility problems with Karaf 4.2.15 that caused Rest Endpoin and Test Executor bundles to not start properly. --- osgi-dependencies/aet-features.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osgi-dependencies/aet-features.xml b/osgi-dependencies/aet-features.xml index e6ed37792..64ddc33e4 100644 --- a/osgi-dependencies/aet-features.xml +++ b/osgi-dependencies/aet-features.xml @@ -91,7 +91,7 @@ wrap:mvn:cglib/cglib-nodep/2.2.2 - mvn:org.freemarker/freemarker/2.3.29 + mvn:org.freemarker/freemarker/2.3.31 wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.9 wrap:mvn:org.hamcrest/hamcrest-core/1.3 diff --git a/pom.xml b/pom.xml index f099da05d..de9a7cd12 100644 --- a/pom.xml +++ b/pom.xml @@ -493,7 +493,7 @@ org.freemarker freemarker - 2.3.29 + 2.3.31 provided From 2b0c315ede4065120fb7331c522f6519e87e5bf6 Mon Sep 17 00:00:00 2001 From: Jarek Pietraszek Date: Wed, 2 Feb 2022 15:15:22 +0100 Subject: [PATCH 2/6] Upgrade spring legacy and webconsole features --- osgi-dependencies/aet-features.xml | 2 +- osgi-dependencies/aet-webconsole.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osgi-dependencies/aet-features.xml b/osgi-dependencies/aet-features.xml index 64ddc33e4..dfd7c8677 100644 --- a/osgi-dependencies/aet-features.xml +++ b/osgi-dependencies/aet-features.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0"> - mvn:org.apache.karaf.features/spring-legacy/4.2.0/xml/features + mvn:org.apache.karaf.features/spring-legacy/4.2.15/xml/features mvn:org.apache.activemq/activemq-karaf/5.15.2/xml/features mvn:org.apache.cxf.karaf/apache-cxf/3.2.0/xml/features diff --git a/osgi-dependencies/aet-webconsole.xml b/osgi-dependencies/aet-webconsole.xml index 1b7e84d56..04672ffe2 100644 --- a/osgi-dependencies/aet-webconsole.xml +++ b/osgi-dependencies/aet-webconsole.xml @@ -25,7 +25,7 @@ webconsole - mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/4.1.2 + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/4.2.15 From 66f7bb77813cf67853a638825372cb467be8a5cb Mon Sep 17 00:00:00 2001 From: Jarek Pietraszek Date: Wed, 2 Feb 2022 16:28:23 +0100 Subject: [PATCH 3/6] Upgrade javax.servlet-api --- osgi-dependencies/aet-features.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osgi-dependencies/aet-features.xml b/osgi-dependencies/aet-features.xml index dfd7c8677..3a3419aa7 100644 --- a/osgi-dependencies/aet-features.xml +++ b/osgi-dependencies/aet-features.xml @@ -59,7 +59,7 @@ mvn:org.apache.commons/commons-text/1.8 - mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.2 + mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.4 diff --git a/pom.xml b/pom.xml index de9a7cd12..00ac3d70b 100644 --- a/pom.xml +++ b/pom.xml @@ -331,7 +331,7 @@ org.apache.felix org.apache.felix.http.servlet-api - 1.1.2 + 1.1.4 provided From 2686d4b6b586cd0a44bef6fae8f84160aafed20d Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 3 Feb 2022 11:20:59 +0100 Subject: [PATCH 4/6] upgrade slf4j-log4j12 --- client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/pom.xml b/client/pom.xml index db670890b..f30a5f270 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -118,7 +118,7 @@ org.slf4j slf4j-log4j12 - 1.7.10 + 1.7.35 com.google.code.gson From d1a6e042b3aa1b90c0828d514fdbc0a56db59e6d Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 4 Feb 2022 21:34:02 +0100 Subject: [PATCH 5/6] fix karaf volumes --- dev-env/aet-swarm-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-env/aet-swarm-dev.yml b/dev-env/aet-swarm-dev.yml index 922a97c9b..fc85c6f13 100644 --- a/dev-env/aet-swarm-dev.yml +++ b/dev-env/aet-swarm-dev.yml @@ -95,9 +95,9 @@ services: - hub - activemq volumes: - - ./bundles:/aet/core/bundles + - ./bundles:/aet/custom/bundles - ./configs:/aet/custom/configs - - ./features:/aet/core/features + - ./features:/aet/custom/features secrets: - KARAF_EXAMPLE_SECRET ports: From 3ea77830b73f76a369f144005948f3f41b15b005 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 4 Feb 2022 22:33:03 +0100 Subject: [PATCH 6/6] fix rest-endpoint, test-executor --- pom.xml | 7 +++---- rest-endpoint/pom.xml | 4 ++-- test-executor/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 00ac3d70b..2bd5c80c7 100644 --- a/pom.xml +++ b/pom.xml @@ -225,10 +225,9 @@ - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - 1.2 - provided + javax.servlet + javax.servlet-api + 3.1.0 diff --git a/rest-endpoint/pom.xml b/rest-endpoint/pom.xml index 9fd448c4c..b0bf3f855 100644 --- a/rest-endpoint/pom.xml +++ b/rest-endpoint/pom.xml @@ -72,8 +72,8 @@ validation-api - org.apache.geronimo.specs - geronimo-servlet_2.5_spec + javax.servlet + javax.servlet-api com.google.code.gson diff --git a/test-executor/pom.xml b/test-executor/pom.xml index f049277e7..0fedc5297 100644 --- a/test-executor/pom.xml +++ b/test-executor/pom.xml @@ -76,8 +76,8 @@ validation-api - org.apache.geronimo.specs - geronimo-servlet_2.5_spec + javax.servlet + javax.servlet-api com.google.code.gson