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.

Author: ctrueden

pom.xml

@@ -1136,6 +1136,14 @@
 		<!-- SnakeYAML Engine - https://bitbucket.org/asomov/snakeyaml-engine -->
 		<snakeyaml-engine.version>2.1</snakeyaml-engine.version>
 
+		<!-- Spring - https://spring.io/ -->
+		<!--
+		NB: 3.2.9.RELEASE is the last version not to depend properly on
+		aopalliance:aopalliance, rather than including org.aopalliance
+		classes unshadowed!
+		-->
+		<spring-aop.version>3.2.9.RELEASE</spring-aop.version>
+
 		<!-- TensorFlow - https://www.tensorflow.org/ -->
 		<tensorflow.version>1.12.0</tensorflow.version>
 		<libtensorflow.version>${tensorflow.version}</libtensorflow.version>
@@ -2614,11 +2622,6 @@
 				<artifactId>omero-server</artifactId>
 				<version>${omero-server.version}</version>
 				<exclusions>
-					<exclusion>
-						<!-- Conflicts with org.springframework:spring-aop -->
-						<groupId>aopalliance</groupId>
-						<artifactId>aopalliance</artifactId>
-					</exclusion>
 					<exclusion>
 						<!-- Conflicts with com.mchange:c3p0 and com.mchange:mchange-commons-java -->
 						<groupId>c3p0</groupId>
@@ -3897,6 +3900,13 @@
 				<version>${snakeyaml-engine.version}</version>
 			</dependency>
 
+			<!-- Spring - https://spring.io/ -->
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-aop</artifactId>
+				<version>${spring-aop.version}</version>
+			</dependency>
+
 			<!-- TensorFlow - https://www.tensorflow.org/ -->
 			<dependency>
 				<groupId>org.tensorflow</groupId>