Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-9239] jakarta.jms - pom.xml, Jenkinsfile and dependency changes

This commit is contained in:
Matt Pavlovich 2023-08-06 15:15:53 -05:00
parent 8d322df244
commit 699a0b6e7f
2 changed files with 46 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile vendored
View File

@ -30,7 +30,7 @@ pipeline {
tools { tools {
// ... tell Jenkins what java version, maven version or other tools are required ... // ... tell Jenkins what java version, maven version or other tools are required ...
maven 'maven_3_latest' maven 'maven_3_latest'
jdk 'jdk_11_latest' jdk 'jdk_17_latest'
} }
options { options {
@ -92,18 +92,6 @@ pipeline {
} }
} }
stage('Build JDK 11') {
tools {
jdk "jdk_11_latest"
}
steps {
echo 'Building JDK 11'
sh 'java -version'
sh 'mvn -version'
sh 'mvn -U -B -e clean install -DskipTests'
}
}
stage('Verify') { stage('Verify') {
steps { steps {
echo 'Running apache-rat:check' echo 'Running apache-rat:check'

96
pom.xml
View File

@ -67,16 +67,15 @@
<httpcore-version>4.4.16</httpcore-version> <httpcore-version>4.4.16</httpcore-version>
<insight-version>1.2.0.Beta4</insight-version> <insight-version>1.2.0.Beta4</insight-version>
<jackson-version>2.15.2</jackson-version> <jackson-version>2.15.2</jackson-version>
<jakarta-jms-api-version>2.0.3</jakarta-jms-api-version> <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
<jakarta-jms-api-v3-version>3.1.0</jakarta-jms-api-v3-version>
<jasypt-version>1.9.3</jasypt-version> <jasypt-version>1.9.3</jasypt-version>
<jaxb-bundle-version>2.3.2_1</jaxb-bundle-version> <jaxb-bundle-version>2.3.2_1</jaxb-bundle-version>
<jetty9-version>9.4.51.v20230217</jetty9-version> <jetty11-version>11.0.15</jetty11-version>
<jetty-version>${jetty9-version}</jetty-version> <jetty-version>${jetty11-version}</jetty-version>
<jmdns-version>3.5.8</jmdns-version> <jmdns-version>3.5.8</jmdns-version>
<tomcat-api-version>9.0.65</tomcat-api-version> <tomcat-api-version>9.0.65</tomcat-api-version>
<jettison-version>1.5.4</jettison-version> <jettison-version>1.5.4</jettison-version>
<jmock-version>2.5.1</jmock-version> <jmock-version>2.12.0</jmock-version>
<jolokia-version>1.7.1</jolokia-version> <jolokia-version>1.7.1</jolokia-version>
<josql-version>1.5_5</josql-version> <josql-version>1.5_5</josql-version>
<!-- for json-simple use same version as jolokia uses --> <!-- for json-simple use same version as jolokia uses -->
@ -91,14 +90,14 @@
<org-apache-derby-version>10.15.2.0</org-apache-derby-version> <org-apache-derby-version>10.15.2.0</org-apache-derby-version>
<osgi-version>6.0.0</osgi-version> <osgi-version>6.0.0</osgi-version>
<qpid-proton-version>0.34.1</qpid-proton-version> <qpid-proton-version>0.34.1</qpid-proton-version>
<qpid-jms-version>1.9.0</qpid-jms-version> <qpid-jms-version>2.4.0</qpid-jms-version>
<netty-version>4.1.94.Final</netty-version> <netty-version>4.1.94.Final</netty-version>
<regexp-version>1.4</regexp-version> <regexp-version>1.4</regexp-version>
<rome-version>2.1.0</rome-version> <rome-version>2.1.0</rome-version>
<shiro-version>1.11.0</shiro-version> <shiro-version>1.11.0</shiro-version>
<slf4j-version>2.0.6</slf4j-version> <slf4j-version>2.0.6</slf4j-version>
<snappy-version>1.1.2</snappy-version> <snappy-version>1.1.2</snappy-version>
<spring-version>5.3.27</spring-version> <spring-version>6.0.7</spring-version>
<taglibs-version>1.2.5</taglibs-version> <taglibs-version>1.2.5</taglibs-version>
<velocity-version>2.3</velocity-version> <velocity-version>2.3</velocity-version>
<xpp3-version>1.1.4c</xpp3-version> <xpp3-version>1.1.4c</xpp3-version>
@ -106,7 +105,7 @@
<xbean-version>4.23</xbean-version> <xbean-version>4.23</xbean-version>
<xerces-version>2.12.2</xerces-version> <xerces-version>2.12.2</xerces-version>
<jaxb-basics-version>0.12.0</jaxb-basics-version> <jaxb-basics-version>0.12.0</jaxb-basics-version>
<stompjms-version>1.27</stompjms-version> <stompjms-version>3.1.0</stompjms-version>
<pax-logging-version>2.1.3</pax-logging-version> <pax-logging-version>2.1.3</pax-logging-version>
<pax-exam-version>4.13.1</pax-exam-version> <pax-exam-version>4.13.1</pax-exam-version>
@ -115,7 +114,7 @@
<site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url> <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
<source-version>11</source-version> <source-version>11</source-version>
<target-version>11</target-version> <target-version>17</target-version>
<javase-javadoc-url>http://docs.oracle.com/javase/8/docs/api/</javase-javadoc-url> <javase-javadoc-url>http://docs.oracle.com/javase/8/docs/api/</javase-javadoc-url>
<javaee-javadoc-url>http://download.oracle.com/javaee/6/api/</javaee-javadoc-url> <javaee-javadoc-url>http://download.oracle.com/javaee/6/api/</javaee-javadoc-url>
@ -135,6 +134,7 @@
<maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version> <maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version>
<maven-install-plugin-version>2.5.2</maven-install-plugin-version> <maven-install-plugin-version>2.5.2</maven-install-plugin-version>
<maven-shade-plugin-version>3.4.1</maven-shade-plugin-version> <maven-shade-plugin-version>3.4.1</maven-shade-plugin-version>
<exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
<findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version> <findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
<javacc-maven-plugin-version>3.0.1</javacc-maven-plugin-version> <javacc-maven-plugin-version>3.0.1</javacc-maven-plugin-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version> <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
@ -439,9 +439,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<version>1.1.1</version> <version>2.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
@ -451,39 +451,32 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>jakarta.resource</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> <artifactId>jakarta.resource-api</artifactId>
<version>2.0.0</version> <version>2.1.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.4</version>
</dependency>
<!-- Servlet 5.0 and JSP -->
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>jakarta.servlet.jsp</groupId>
<artifactId>asm</artifactId> <artifactId>jakarta.servlet.jsp-api</artifactId>
<version>9.4</version> <version>3.1.1</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.1.0</version>
</dependency> </dependency>
<!-- Servlet 3.1 and JSP -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
<version>${tomcat-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${tomcat-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-websocket-api</artifactId>
<version>${tomcat-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
<version>1.3</version>
</dependency>
<!-- =============================== --> <!-- =============================== -->
<!-- Optional dependencies --> <!-- Optional dependencies -->
@ -980,6 +973,7 @@
<groupId>org.apache.geronimo.components</groupId> <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId> <artifactId>geronimo-transaction</artifactId>
<version>3.1.5</version> <version>3.1.5</version>
<classifier>jakarta</classifier>
</dependency> </dependency>
<dependency> <dependency>
@ -998,9 +992,9 @@
<version>2.3.1</version> <version>2.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.annotation</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version> <version>2.1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -1370,13 +1364,13 @@
<links> <links>
<link>${javase-javadoc-url}</link> <link>${javase-javadoc-url}</link>
<link>${javaee-javadoc-url}</link> <link>${javaee-javadoc-url}</link>
<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link> <link>https://commons.apache.org/proper/commons-collections/javadocs/api-${commons-collections-version}/</link>
<link>http://jakarta.apache.org/commons/dbcp/apidocs/</link> <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
<link>http://jakarta.apache.org/commons/fileupload/apidocs/</link> <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
<link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link> <link>https://javadoc.io/doc/org.apache.httpcomponents/httpclient/${httpclient-version}/</link>
<link>http://jakarta.apache.org/commons/pool/apidocs/</link> <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
<link>http://junit.sourceforge.net/javadoc/</link> <link>https://junit.org/junit4/javadoc/latest/</link>
<link>http://logging.apache.org/log4j/docs/api/</link> <link>https://logging.apache.org/log4j/2.x/javadoc/log4j-api/</link>
</links> </links>
<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile> <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
<maxmemory>2048m</maxmemory> <maxmemory>2048m</maxmemory>
@ -1555,9 +1549,9 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>jetty9</id> <id>jetty11</id>
<properties> <properties>
<jetty-version>${jetty9-version}</jetty-version> <jetty-version>${jetty11-version}</jetty-version>
</properties> </properties>
</profile> </profile>