Fix outdated/missing spring-related references, use 9.0.0 target

Author: tylercamp

pom.xml

@@ -19,9 +19,7 @@
     <packaging>atlassian-plugin</packaging>
 
     <properties>
-        <!-- Note: change to 7.1.1 for local testing using `atlas-*` commands due to icu4j init errors in earlier Bamboo
-                   versions when using recent Java 8 versions -->
-        <bamboo.version>7.1.1</bamboo.version>
+        <bamboo.version>9.0.0</bamboo.version>
         <bamboo.data.version>${bamboo.version}</bamboo.data.version>
         <amps.version>8.1.2</amps.version>
         <plugin.testrunner.version>2.0.2</plugin.testrunner.version>
@@ -48,13 +46,15 @@
 
         <!-- test dependencies -->
         <dependency>
+            <!-- TODO - update (?) -->
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
+            <!-- TODO - update (?) -->
             <groupId>com.atlassian.bamboo</groupId>
             <artifactId>atlassian-bamboo-web</artifactId>
             <version>${bamboo.version}</version>
@@ -63,12 +63,14 @@
 
         <!-- https://mvnrepository.com/artifact/org.apache.ant/ant -->
         <dependency>
+            <!-- TODO - update -->
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
             <version>1.8.2</version>
         </dependency>
 
         <dependency>
+            <!-- TODO - update -->
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.2.2-atlassian-1</version>
@@ -136,6 +138,23 @@
                     <enableQuickReload>true</enableQuickReload>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>com.atlassian.plugin</groupId>
+                <artifactId>atlassian-spring-scanner-maven-plugin</artifactId>
+                <version>${atlassian.spring.scanner.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>atlassian-spring-scanner</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <verbose>false</verbose>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/resources/META-INF/spring/plugin-context.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:atlassian-scanner="http://www.atlassian.com/schema/atlassian-scanner"
+       xmlns:atlassian-scanner="http://www.atlassian.com/schema/atlassian-scanner/2"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.atlassian.com/schema/atlassian-scanner
         http://www.atlassian.com/schema/atlassian-scanner/atlassian-scanner.xsd">
     <atlassian-scanner:scan-indexes/>
-</beans>
+</beans>