See #5 (comment) (#6)

cquoss · Jan 3, 2022 · 9240123 · 9240123
1 parent a92e754
commit 9240123
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 51 deletions.
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
@@ -45,11 +45,6 @@
       <artifactId>groovy-all</artifactId>
       <version>1.0-jsr-03</version>
     </dependency>
-    <dependency>
-      <groupId>groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <version>1.0-jsr-03</version>
-    </dependency>
     <dependency>
       <groupId>annogen</groupId>
       <artifactId>annogen</artifactId>

diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
@@ -80,6 +80,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
+        <version>${xbean-version}</version>
         <executions>
           <execution>
             <configuration>

diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
@@ -130,6 +130,11 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>2.5.6</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>

diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
@@ -99,7 +99,12 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
@@ -34,37 +34,6 @@
   <packaging>jar</packaging>
   <name>ActiveMQ :: XMPP</name>
 
-  <repositories>
-    <repository>
-      <id>codehaus</id>
-      <name>Codehaus Maven 2 Repository</name>
-      <url>http://repository.codehaus.org/</url>
-    </repository>
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Maven 2 Repository</name>
-      <url>https://maven2-repository.dev.java.net/nonav/repository</url>
-    </repository>
-    <repository>
-      <id>maven-repository.dev.java.net</id>
-      <name>Java.net Maven 1 Repository (legacy)</name>
-      <url>https://maven-repository.dev.java.net/nonav/repository</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven2-repository.dev.java.net</id>
-      <url>https://maven2-repository.dev.java.net/nonav/repository</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>maven-repository.dev.java.net</id>
-      <name>Java.net Maven 1 Repository (legacy)</name>
-      <url>https://maven-repository.dev.java.net/nonav/repository</url>
-      <layout>legacy</layout>
-    </pluginRepository>
-  </pluginRepositories>
-
   <dependencies>
     <!-- activemq -->
     <dependency>
@@ -136,7 +105,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
-      <version>2.0</version>
+      <version>2.5.6</version>
     </dependency>
 
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -28,10 +28,6 @@
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
 
-  <prerequisites>
-    <maven>2.0.4</maven>
-  </prerequisites>
-
   <url>http://activemq.apache.org/</url>
   <organization>
     <name>Apache Software Foundation</name>
@@ -354,7 +350,7 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
-        <version>2.0</version>
+        <version>2.5.6</version>
         <optional>true</optional>
         <exclusions>
           <exclusion>
@@ -516,13 +512,6 @@
         <version>1.3</version>
       </dependency>
 
-      <!-- To use XPath using JAXP 1.2 (easier to add to Java 1.4.x) -->
-      <dependency>
-        <groupId>activesoap</groupId>
-        <artifactId>jaxp-api</artifactId>
-        <version>1.3</version>
-      </dependency>
-
       <dependency>
         <groupId>xalan</groupId>
         <artifactId>xalan</artifactId>
@@ -808,6 +797,17 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <version>2.10</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.2.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -962,7 +962,7 @@
     <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
     <xstream-version>1.1.2</xstream-version>
-    <xbean-version>2.8</xbean-version>
+    <xbean-version>4.20</xbean-version>
     <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>
     <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>