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 2018/03/08 21:18:44 UTC
[1/2] activemq-artemis git commit: This closes #1944
Repository: activemq-artemis
Updated Branches:
refs/heads/master d81696a7c -> 524ca73a3
This closes #1944
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/524ca73a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/524ca73a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/524ca73a
Branch: refs/heads/master
Commit: 524ca73a3fcacdbfa6d4716b0280826001cf677c
Parents: d81696a e7da61a
Author: Justin Bertram <jb...@apache.org>
Authored: Thu Mar 8 15:14:21 2018 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu Mar 8 15:14:21 2018 -0600
----------------------------------------------------------------------
artemis-native/pom.xml | 13 +++++++++++++
pom.xml | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1739 Set automatic module
name for native
Posted by jb...@apache.org.
ARTEMIS-1739 Set automatic module name for native
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e7da61a0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e7da61a0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e7da61a0
Branch: refs/heads/master
Commit: e7da61a06f10dc71ce677bd074a2f843a2c1bb56
Parents: d81696a
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Mar 8 20:57:46 2018 +0000
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu Mar 8 15:14:21 2018 -0600
----------------------------------------------------------------------
artemis-native/pom.xml | 13 +++++++++++++
pom.xml | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e7da61a0/artemis-native/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-native/pom.xml b/artemis-native/pom.xml
index 5d59498..8b78258 100644
--- a/artemis-native/pom.xml
+++ b/artemis-native/pom.xml
@@ -26,6 +26,7 @@
<artifactId>artemis-native</artifactId>
<packaging>bundle</packaging>
+
<dependencies>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -66,6 +67,18 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${version.maven.jar.plugin}</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>artemis.jni</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e7da61a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0cfb9e1..ada3fe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,7 @@
<servicemix.json-1.1.spec.version>2.9.0</servicemix.json-1.1.spec.version>
<version.org.jacoco>0.7.9</version.org.jacoco>
<version.org.jacoco.plugin>0.7.9</version.org.jacoco.plugin>
+ <version.maven.jar.plugin>2.4</version.maven.jar.plugin>
<!-- used on tests -->
<groovy.version>2.4.3</groovy.version>
@@ -1372,7 +1373,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>${version.maven.jar.plugin}</version>
</plugin>
<plugin>
<groupId>net.sf.maven-sar</groupId>