Skip to content

Commit f6d3531

Browse files
committed
Downgrade spring-aop to 3.2.9.RELEASE
It is the last version not to act as an unshaded uberjar. Starting with 3.3.0.RELEASE, it includes org.aopalliance classes (from aopalliance:aopalliance) unshaded, clashing with other libraries that depend on aopalliance:aopalliance, notably com.google.inject:guice.
1 parent d1a422d commit f6d3531

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

pom.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,6 +1136,14 @@
11361136
<!-- SnakeYAML Engine - https://bitbucket.org/asomov/snakeyaml-engine -->
11371137
<snakeyaml-engine.version>2.1</snakeyaml-engine.version>
11381138

1139+
<!-- Spring - https://spring.io/ -->
1140+
<!--
1141+
NB: 3.2.9.RELEASE is the last version not to depend properly on
1142+
aopalliance:aopalliance, rather than including org.aopalliance
1143+
classes unshadowed!
1144+
-->
1145+
<spring-aop.version>3.2.9.RELEASE</spring-aop.version>
1146+
11391147
<!-- TensorFlow - https://www.tensorflow.org/ -->
11401148
<tensorflow.version>1.12.0</tensorflow.version>
11411149
<libtensorflow.version>${tensorflow.version}</libtensorflow.version>
@@ -2614,11 +2622,6 @@
26142622
<artifactId>omero-server</artifactId>
26152623
<version>${omero-server.version}</version>
26162624
<exclusions>
2617-
<exclusion>
2618-
<!-- Conflicts with org.springframework:spring-aop -->
2619-
<groupId>aopalliance</groupId>
2620-
<artifactId>aopalliance</artifactId>
2621-
</exclusion>
26222625
<exclusion>
26232626
<!-- Conflicts with com.mchange:c3p0 and com.mchange:mchange-commons-java -->
26242627
<groupId>c3p0</groupId>
@@ -3897,6 +3900,13 @@
38973900
<version>${snakeyaml-engine.version}</version>
38983901
</dependency>
38993902

3903+
<!-- Spring - https://spring.io/ -->
3904+
<dependency>
3905+
<groupId>org.springframework</groupId>
3906+
<artifactId>spring-aop</artifactId>
3907+
<version>${spring-aop.version}</version>
3908+
</dependency>
3909+
39003910
<!-- TensorFlow - https://www.tensorflow.org/ -->
39013911
<dependency>
39023912
<groupId>org.tensorflow</groupId>

0 commit comments

Comments
 (0)