This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis-native.git
The following commit(s) were added to refs/heads/master by this push:
new 0abc8f2 NO-JIRA renaming artifactID to include activemq on the jar
0abc8f2 is described below
commit 0abc8f25e58034a9a09cbd170f2b0a8fe391e779
Author: Clebert Suconic <[email protected]>
AuthorDate: Fri Mar 1 09:48:26 2019 -0500
NO-JIRA renaming artifactID to include activemq on the jar
---
README.md | 2 +-
pom.xml | 6 +++---
scripts/32test.sh | 4 ++--
scripts/64test.sh | 4 ++--
scripts/compile-using-docker.sh | 12 ++++++------
src/main/c/CMakeLists.txt | 2 +-
src/main/docker/Dockerfile-centos | 2 +-
src/main/docker/Dockerfile-ubuntu | 2 +-
src/main/docker/Dockerfile-ubuntu-32 | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index 6b7fac0..ef5f841 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Mailing List: [email protected]
From the project base directory, run:
-```docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder
. && docker run -v $PWD/target/bin:/work/bin artemis-native-builder && sudo
chown -Rv $USER:$GID target/bin```
+```docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder
. && docker run -v $PWD/target/bin:/work/target/bin artemis-native-builder &&
sudo chown -Rv $USER:$GID target/bin```
## Steps to build (manual)
diff --git a/pom.xml b/pom.xml
index d27ab3a..a9ea38f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.activemq</groupId>
- <artifactId>artemis-native</artifactId>
+ <artifactId>activemq-artemis-native</artifactId>
<packaging>bundle</packaging>
<version>1.0-SNAPSHOT</version>
@@ -324,7 +324,7 @@
<outputDirectory>${basedir}/target/output/lib/linux-i686/</outputDirectory>
<resources>
<resource>
- <directory>bin/</directory>
+ <directory>target/bin/</directory>
<includes>
<include>libartemis-native-32.so</include>
</includes>
@@ -342,7 +342,7 @@
<outputDirectory>${basedir}/target/output/lib/linux-x86_64/</outputDirectory>
<resources>
<resource>
- <directory>bin/</directory>
+ <directory>target/bin/</directory>
<includes>
<include>libartemis-native-64.so</include>
</includes>
diff --git a/scripts/32test.sh b/scripts/32test.sh
index fb1e3f5..2e3dd57 100755
--- a/scripts/32test.sh
+++ b/scripts/32test.sh
@@ -20,7 +20,7 @@
docker build -f src/main/docker/Dockerfile-ubuntu-32 -t
artemis-native-builder-32 .
# This is mapping your maven repository inside the image to avoid you
downloading the internet again
-docker run -it --rm -v $PWD/bin:/work/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder-32 ./mvnw test
+docker run -it --rm -v $PWD/target/bin:/work/target/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder-32 ./mvnw test
# you could use it this way
-#docker run -it --rm -v $PWD/bin:/work/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder-64 bash
+#docker run -it --rm -v $PWD/target/bin:/work/target/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder-64 bash
diff --git a/scripts/64test.sh b/scripts/64test.sh
index ca8a1be..b21dd1b 100755
--- a/scripts/64test.sh
+++ b/scripts/64test.sh
@@ -21,7 +21,7 @@
docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
# This is mapping your maven repository inside the image to avoid you
downloading the internet again
-docker run -it --rm -v $PWD/bin:/work/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder ./mvnw test
+docker run -it --rm -v $PWD/target/bin:/work/target/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder ./mvnw test
# you could use it this way
-#docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
&& docker run -it --rm -v $PWD/bin:/work/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder bash
+#docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
&& docker run -it --rm -v $PWD/target/bin:/work/target/bin -v
$HOME/.m2/repository/:/root/.m2/repository artemis-native-builder bash
diff --git a/scripts/compile-using-docker.sh b/scripts/compile-using-docker.sh
index 8007f9f..5221a43 100755
--- a/scripts/compile-using-docker.sh
+++ b/scripts/compile-using-docker.sh
@@ -19,12 +19,12 @@
if [ -d "./bin" ]; then rm -Rf ./bin; fi
mkdir bin
docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
-docker run --rm -v $PWD/bin:/work/bin artemis-native-builder "$@"
+docker run --rm -v $PWD/target/bin:/work/target/bin artemis-native-builder "$@"
chown -Rv $USER:$GID ./bin
ls -liat ./bin
# Note: You may need to authorize docker to map folder at your folder structure
-#docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
&& docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash
+#docker build -f src/main/docker/Dockerfile-centos -t artemis-native-builder .
&& docker run -it --rm -v $PWD/target/bin:/work/target/bin
artemis-native-builder bash
## 64 bits build
@@ -32,16 +32,16 @@ ls -liat ./bin
#docker build -f ./src/main/docker/Dockerfile-ubuntu -t artemis-native-builder
.
# Note: You may need to authorize docker to map folder at your folder structure
-#docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash
./compile-native.sh
+#docker run -it --rm -v $PWD/target/bin:/work/target/bin
artemis-native-builder bash ./compile-native.sh
## if you need to debug compilation
-#docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder bash
+#docker run -it --rm -v $PWD/target/bin:/work/target/bin
artemis-native-builder bash
#docker image rm artemis-native-builder-32 -f
#docker build -f ./src/main/docker/Dockerfile-ubuntu-32 -t
artemis-native-builder-32 .
# Note: You may need to authorize docker to map folder at your folder structure
-#docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder-32 bash
./compile-native.sh
+#docker run -it --rm -v $PWD/target/bin:/work/target/bin
artemis-native-builder-32 bash ./compile-native.sh
## if you need to debug compilation
-#docker run -it --rm -v $PWD/bin:/work/bin artemis-native-builder-32 bash
+#docker run -it --rm -v $PWD/target/bin:/work/target/bin
artemis-native-builder-32 bash
diff --git a/src/main/c/CMakeLists.txt b/src/main/c/CMakeLists.txt
index 9f8626a..2662bca 100644
--- a/src/main/c/CMakeLists.txt
+++ b/src/main/c/CMakeLists.txt
@@ -73,6 +73,6 @@ ADD_LIBRARY(artemis-native SHARED
org_apache_activemq_artemis_nativo_jlibaio_Lib
target_link_libraries(artemis-native ${LIBAIO_LIB})
set_target_properties(artemis-native PROPERTIES
- LIBRARY_OUTPUT_DIRECTORY ../../../bin
+ LIBRARY_OUTPUT_DIRECTORY ../../../target/bin
LIBRARY_OUTPUT_NAME ${ARTEMIS_LIB_NAME})
message(STATUS "Setting up library as ${ARTEMIS_LIB_NAME} based on current
architecture")
diff --git a/src/main/docker/Dockerfile-centos
b/src/main/docker/Dockerfile-centos
index b0be544..a0ccb34 100644
--- a/src/main/docker/Dockerfile-centos
+++ b/src/main/docker/Dockerfile-centos
@@ -31,7 +31,7 @@ ADD . /work
WORKDIR /work
-VOLUME ["/work/bin"]
+VOLUME ["/work/target/bin"]
VOLUME ["/root/.m2/repository"]
WORKDIR /work
diff --git a/src/main/docker/Dockerfile-ubuntu
b/src/main/docker/Dockerfile-ubuntu
index 9621357..e9bf5f9 100644
--- a/src/main/docker/Dockerfile-ubuntu
+++ b/src/main/docker/Dockerfile-ubuntu
@@ -40,7 +40,7 @@ RUN groupadd -g 1001 -r artemis && useradd -r -u 1001 -g
artemis artemis
ADD . /work
# Expose some outstanding folders
-VOLUME ["/work/bin"]
+VOLUME ["/work/target/bin"]
WORKDIR /work
CMD ["RUN"]
diff --git a/src/main/docker/Dockerfile-ubuntu-32
b/src/main/docker/Dockerfile-ubuntu-32
index cd6d57b..27b62a1 100644
--- a/src/main/docker/Dockerfile-ubuntu-32
+++ b/src/main/docker/Dockerfile-ubuntu-32
@@ -34,7 +34,7 @@ RUN groupadd -g 1001 -r artemis && useradd -r -u 1001 -g
artemis artemis
ADD . /work
# Expose some outstanding folders
-VOLUME ["/work/bin"]
+VOLUME ["/work/target/bin"]
#VOLUME ["/root/.m2/repository"]
WORKDIR /work
