Skip to content

Commit 3ffd3bb

Browse files
committed
Set jakarta version to 6.0.
1 parent c080ca2 commit 3ffd3bb

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/post_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
script: |
2222
core.setFailed('This workflow can not run on master branch')
2323
- uses: actions/checkout@v3
24-
- name: Set up JDK 21
24+
- name: Set up JDK 17
2525
uses: actions/setup-java@v3
2626
with:
2727
java-version: '17.x'

.github/workflows/pre_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
script: |
3838
core.setFailed('This workflow can not run on master branch')
3939
- uses: actions/checkout@v3
40-
- name: Set up JDK 21
40+
- name: Set up JDK 17
4141
uses: actions/setup-java@v3
4242
with:
4343
java-version: '17.x'

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<!-- platform BOM versions -->
1515
<tomcat.port>8080</tomcat.port>
16-
<tomcat.version>11.0.22</tomcat.version>
16+
<tomcat.version>10.1.55</tomcat.version>
1717
<jackson.version>2.19.4</jackson.version>
1818
<metrics.version>4.2.12</metrics.version>
1919
<guava.version>32.0.0-jre</guava.version>
@@ -28,7 +28,7 @@
2828
<commons-collections.version>3.2.2</commons-collections.version>
2929
<commons-io.version>2.14.0</commons-io.version>
3030
<commons-logging.version>1.2</commons-logging.version>
31-
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
31+
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
3232
<jaxws-api.version>4.0.3</jaxws-api.version>
3333
<json-lib.version>2.4.2-geoserver</json-lib.version>
3434
<json-patch.version>1.13</json-patch.version>

product/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<version>${cargo.version}</version>
277277
<configuration>
278278
<container>
279-
<containerId>tomcat11x</containerId>
279+
<containerId>tomcat10x</containerId>
280280
<systemProperties>
281281
<datadir.location>${datadir.location}</datadir.location>
282282
<security.integration>${security.integration}</security.integration>

0 commit comments

Comments
 (0)