You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/03/18 09:30:37 UTC
[activemq] branch activemq-5.16.x updated (34475db -> 880fcd4)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git.
from 34475db AMQ-8184 - Re-enable NIO tests
new aedb4aa [AMQ-8123] Add jaxb-core,istack,activation in lib for RuntimeConfigurationPlugin (with both JDK8 and 11+)
new 880fcd4 [AMQ-8182] Upgrade to Velocity 2.3
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assembly/pom.xml | 17 ++++++++++++++++-
assembly/src/main/descriptors/common-bin.xml | 3 +++
pom.xml | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
[activemq] 02/02: [AMQ-8182] Upgrade to Velocity 2.3
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 880fcd4565028d2fb2cc77445be22e6de258f941
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed Mar 17 21:54:12 2021 +0100
[AMQ-8182] Upgrade to Velocity 2.3
(cherry picked from commit a19bfcb51ee79f26cda2b0fc73c9adce93bb3483)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a7c5f45..232f568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<snappy-version>1.1.2</snappy-version>
<spring-version>4.3.30.RELEASE</spring-version>
<taglibs-version>1.2.5</taglibs-version>
- <velocity-version>2.2</velocity-version>
+ <velocity-version>2.3</velocity-version>
<xalan-version>2.7.2</xalan-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.4.15</xstream-version>
[activemq] 01/02: [AMQ-8123] Add jaxb-core, istack,
activation in lib for RuntimeConfigurationPlugin (with both JDK8
and 11+)
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit aedb4aaf65584db8649ad8a4c8865bb80094e835
Author: jbonofre <jb...@apache.org>
AuthorDate: Fri Jan 15 16:17:58 2021 +0100
[AMQ-8123] Add jaxb-core,istack,activation in lib for RuntimeConfigurationPlugin (with both JDK8 and 11+)
(cherry picked from commit f64c9327d7097b2c4d53325d9731ceefa53ba480)
---
assembly/pom.xml | 17 ++++++++++++++++-
assembly/src/main/descriptors/common-bin.xml | 3 +++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f0e1260..2ca5216 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -468,7 +468,7 @@
<artifactId>jackson-databind</artifactId>
</dependency>
- <!-- JAXB (for JDK11) -->
+ <!-- JAXB/Activation/iStack -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -476,9 +476,24 @@
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.2.11</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <version>3.0.11</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index dca3780..d759634 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -148,6 +148,9 @@
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>javax.xml.bind:jaxb-api</include>
<include>org.glassfish.jaxb:jaxb-runtime</include>
+ <include>org.glassfish.jaxb:jaxb-core</include>
+ <include>com.sun.istack:istack-commons-runtime</include>
+ <include>javax.activation:javax.activation-api</include>
</includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>