Skip to content

Commit

Permalink
Merge pull request #481 from axonivy-market/improve
Browse files Browse the repository at this point in the history
Use latest commons-lang3 to have no clashes with dep hierarchy
  • Loading branch information
alexsuter authored Nov 1, 2023
2 parents f166f41 + 48fbc0e commit a6a259b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.8.6-eclipse-temurin-17
FROM maven:3.9.5-eclipse-temurin-17

# add an user with 1000 for the build in jenkins
RUN addgroup --gid 1000 build && adduser --uid 1000 --gid 1000 --disabled-password --gecos "" build
10 changes: 10 additions & 0 deletions connectivity/connectivity-demos-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@
<version>4.2.0</version>
<scope>test</scope>
</dependency>

<!-- fix this version. because axon ivy engine is using commons.text 1.11.0 which
requires commons.lang3 3.13.0. but this maven dependency hierarchy includes an older
version -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 0 additions & 3 deletions docker-entrypoint.sh

This file was deleted.

10 changes: 10 additions & 0 deletions workflow/workflow-demos-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@
<version>${web.tester.version}</version>
<scope>test</scope>
</dependency>

<!-- fix this version. because axon ivy engine is using commons.text 1.11.0 which
requires commons.lang3 3.13.0. but this maven dependency hierarchy includes an older
version -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down

0 comments on commit a6a259b

Please sign in to comment.