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

Dependency updates #2142

Merged
merged 5 commits into from
Jun 3, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Build'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Install extra software'
run: sudo apt install -y --no-install-recommends xmlstarlet
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Install extra software'
run: sudo apt install -y --no-install-recommends xmlstarlet
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Javadoc'
run: mvn compile javadoc:javadoc -DskipQA=true
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'QA build with Maven'
run: mvn -B -V -fae -DskipQA=false -Dfmt.action=check -Dpom.fmt.action=verify -Ddocker.skip=true -Dtest.onlyITs= -Dmaven.test.skip=true clean package
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Build and Push docker images'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/owasp-dependency-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Run Check'
continue-on-error: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: "Build Java ${{ matrix.java }}"
run: mvn -U package -Dmaven.test.skip=true -Ddocker.skip=true -Dtest.onlyITs= -DskipQA=true -Dmaven.javadoc.skip=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'datamodel Priming build'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'datamodel Priming build'
run: mvn clean install -Dmaven.test.skip=true -Ddocker.skip=true -Dtest.onlyITs= -B -V -fae -pl 'datamodel' -am -DskipQA=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: 'Set up Maven'
uses: stCarolas/setup-maven@v5
with:
maven-version: '3.9.6'
maven-version: '3.9.7'

- name: 'Priming build'
run: |
Expand Down
17 changes: 5 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<quartz.version>2.3.2</quartz.version>
<slf4j.version>2.0.13</slf4j.version>
<jaxb.api.version>2.3.3</jaxb.api.version>
<jaxb.impl.version>2.3.8</jaxb.impl.version>
<jaxb.impl.version>2.3.9</jaxb.impl.version>
<jackson.version>2.17.1</jackson.version>
<jackson.databind.version>2.17.1</jackson.databind.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
Expand Down Expand Up @@ -511,7 +511,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.3.6</version>
<version>2.3.7</version>
<exclusions>
<!-- deze komen in de Tomcat lib, moeten dus niet in de war file terecht komen -->
<exclusion>
Expand Down Expand Up @@ -1071,7 +1071,7 @@
<plugin>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<version>2.3.6</version>
<version>2.3.7</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
Expand Down Expand Up @@ -1135,7 +1135,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>[3.8,)</version>
<version>[3.9,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>${java.version}</version>
Expand All @@ -1144,14 +1144,7 @@
<excludes>
<exclude>junit:junit</exclude>
<exclude>org.hamcrest:hamcrest-core</exclude>
<!-- helaas is er een transitieve dependency naar joda-time in wss4j-ws-security-common,
dus kunnen we die niet uitsluiten.

[INFO] | +- org.apache.wss4j:wss4j-ws-security-common:jar:2.4.1:compile
[INFO] | | +- joda-time:joda-time:jar:2.10.10:compile

<exclude>joda-time:joda-time</exclude>
-->
<exclude>joda-time:joda-time</exclude>
</excludes>
</bannedDependencies>
</rules>
Expand Down