Skip to content

Commit 69bcc76

Browse files
committed
Update dependencies and exclusions
Remove dependency exclusions for ANTLR4 now that we use Java 11+. Add sitemesh to the dependency exclusions since it requires Java 17+.
1 parent 5ced526 commit 69bcc76

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

gemma-rest/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,4 @@
165165
</dependency>
166166
</dependencies>
167167

168-
<properties>
169-
<antlr4.version>4.13.1</antlr4.version>
170-
</properties>
171-
172168
</project>

pom.xml

+5-8
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@
439439
<dependency>
440440
<groupId>com.h2database</groupId>
441441
<artifactId>h2</artifactId>
442-
<version>2.3.230</version>
442+
<version>2.3.232</version>
443443
<scope>test</scope>
444444
</dependency>
445445

@@ -571,7 +571,6 @@
571571
<plugin>
572572
<groupId>org.codehaus.mojo</groupId>
573573
<artifactId>versions-maven-plugin</artifactId>
574-
<!-- a newer version with better filters can be enabled with -Pdepcheck, but it's incompatible with the Maven minimum requirement -->
575574
<version>2.17.1</version>
576575
<configuration>
577576
<allowMajorUpdates>false</allowMajorUpdates>
@@ -588,12 +587,9 @@
588587
<dependencyExclude>org.springframework.ws:spring-ws-core:*</dependencyExclude>
589588
<dependencyExclude>org.glassfish.jersey.*:*:*</dependencyExclude>
590589
<dependencyExclude>javax.ws.rs:javax.ws.rs-api:*</dependencyExclude>
591-
<dependencyExclude>org.antlr:antlr4-runtime:*</dependencyExclude>
592590
<dependencyExclude>com.jayway.jsonpath:json-path:*</dependencyExclude>
591+
<dependencyExclude>opensymphony:sitemesh:*</dependencyExclude>
593592
</dependencyExcludes>
594-
<pluginDependencyExcludes>
595-
<pluginDependencyExclude>org.antlr:antlr4-maven-plugin:*</pluginDependencyExclude>
596-
</pluginDependencyExcludes>
597593
</configuration>
598594
</plugin>
599595
</plugins>
@@ -751,11 +747,12 @@
751747
<jawr.version>3.9</jawr.version>
752748
<lucene.version>3.6.2</lucene.version>
753749
<slack.version>1.40.3</slack.version>
754-
<micrometer.version>1.13.2</micrometer.version>
750+
<micrometer.version>1.13.3</micrometer.version>
755751
<dom4j.version>2.1.4</dom4j.version>
756752
<mysql.version>8.4.0</mysql.version>
757-
<tomcat.version>9.0.91</tomcat.version>
753+
<tomcat.version>9.0.93</tomcat.version>
758754
<mockito.version>5.12.0</mockito.version>
755+
<antlr4.version>4.13.2</antlr4.version>
759756
<!-- 5.0.7.Final is broken due to https://github.com/ocpsoft/prettytime/issues/276 -->
760757
<prettytime.version>5.0.6.Final</prettytime.version>
761758
<!-- this ensures that -DexcludedGroups works properly -->

0 commit comments

Comments
 (0)