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.

Sign up for GitHub

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

Jump to bottom

Upgrade aet #673

Open
wants to merge 6 commits into
base: dev-environment-with-docker
Choose a base branch
from
Open

Upgrade aet #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecfbd0b
Change freemarker version to 2.3.31
jaroslaw-pietraszek-wttech Feb 2, 2022
2b0c315
Upgrade spring legacy and webconsole features
jaroslaw-pietraszek-wttech Feb 2, 2022
66f7bb7
Upgrade javax.servlet-api
jaroslaw-pietraszek-wttech Feb 2, 2022
2686d4b
upgrade slf4j-log4j12
dprzybyl Feb 3, 2022
d1a6e04
fix karaf volumes
dprzybyl Feb 4, 2022
3ea7783
fix rest-endpoint, test-executor
dprzybyl Feb 4, 2022
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
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.10</version>
<version>1.7.35</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions dev-env/aet-swarm-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ services:
- hub
- activemq
volumes:
- ./bundles:/aet/core/bundles
- ./bundles:/aet/custom/bundles
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should remain as core. Custom bundles are additional bundles. Core bundles are those which are built as a release artifact form this repository.
If change like this remains, you would have doubled all core bundles.

- ./configs:/aet/custom/configs
- ./features:/aet/core/features
- ./features:/aet/custom/features
secrets:
- KARAF_EXAMPLE_SECRET
ports:
Expand Down
6 changes: 3 additions & 3 deletions osgi-dependencies/aet-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">

<!-- older version of spring required for ActiveMQ -->
<repository>mvn:org.apache.karaf.features/spring-legacy/4.2.0/xml/features</repository>
<repository>mvn:org.apache.karaf.features/spring-legacy/4.2.15/xml/features</repository>
<repository>mvn:org.apache.activemq/activemq-karaf/5.15.2/xml/features</repository>
<repository>mvn:org.apache.cxf.karaf/apache-cxf/3.2.0/xml/features</repository>

Expand Down Expand Up @@ -59,7 +59,7 @@
<bundle>mvn:org.apache.commons/commons-text/1.8</bundle>

<!-- required by fileupload -->
<bundle>mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.2</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.4</bundle>
</feature>

<feature name="aet-jackson" version="0.6.0" description="Bundles for Jackson" install="auto">
Expand Down Expand Up @@ -91,7 +91,7 @@

<bundle>wrap:mvn:cglib/cglib-nodep/2.2.2</bundle>

<bundle>mvn:org.freemarker/freemarker/2.3.29</bundle>
<bundle>mvn:org.freemarker/freemarker/2.3.31</bundle>

<bundle>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.9</bundle>
<bundle>wrap:mvn:org.hamcrest/hamcrest-core/1.3</bundle>
Expand Down
2 changes: 1 addition & 1 deletion osgi-dependencies/aet-webconsole.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<feature name="aet-webconsole" version="0.6.0" description="Felix Web Console" install="auto">
<feature>webconsole</feature>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/4.1.2</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/4.2.15</bundle>
</feature>

</features>
11 changes: 5 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,9 @@
</dependency>
<!-- provided by Karaf: javax.servlet 3.5 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
<scope>provided</scope>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
<!-- provided in Karaf by pax-logging -->
<dependency>
Expand Down Expand Up @@ -331,7 +330,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
<version>1.1.2</version>
<version>1.1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -493,7 +492,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.29</version>
<version>2.3.31</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions rest-endpoint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions test-executor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down