Skip to content

Commit

Permalink
Merge branch 'master' into feature/switch_to_jakarta_jaxb
Browse files Browse the repository at this point in the history
  • Loading branch information
bjagg authored Jan 31, 2025
2 parents 34d3f27 + 545a38e commit addbcb1
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,15 @@
<icu4j.version>72.1</icu4j.version>
<hsqldb.version>2.6.1</hsqldb.version>
<jaxb2basics.version>0.6.0</jaxb2basics.version>
<jaxb.version>2.3.3</jaxb.version>
<jackson.version>2.14.1</jackson.version>
<jackson.version>2.18.2</jackson.version>
<logbackVersion>1.3.12</logbackVersion>
<pluto.version>2.1.0-M3</pluto.version>
<slf4j.version>2.0.6</slf4j.version>
<ehcache-spring-annotations.version>1.2.0</ehcache-spring-annotations.version>
<ehcache.version>2.10.4</ehcache.version>
<ehcache.version>2.10.9.2</ehcache.version>
<portletUtils.version>1.1.3</portletUtils.version>
<spring.version>4.3.30.RELEASE</spring.version>
<resource-server.version>1.0.42</resource-server.version>
<resource-server.version>1.5.0</resource-server.version>
<uportal-libs.version>5.16.1</uportal-libs.version>
</properties>

Expand Down Expand Up @@ -154,7 +153,7 @@
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>2.0</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -229,7 +228,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.8.9</version>
<version>2.4.21</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
Expand Down

0 comments on commit addbcb1

Please sign in to comment.