You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/04/06 11:46:02 UTC
[12/50] tinkerpop git commit: if a settings.xml exists in tinkerpop/
then copy it to .m2
if a settings.xml exists in tinkerpop/ then copy it to .m2
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec066ca6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec066ca6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec066ca6
Branch: refs/heads/TINKERPOP-1577
Commit: ec066ca60cd5acdfff6b7a853f89bd26b2aff7aa
Parents: 7def039
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Mar 28 13:23:37 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Mar 28 13:23:37 2017 -0400
----------------------------------------------------------------------
.gitignore | 3 ++-
docker/scripts/build.sh | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec066ca6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a493d4d..a4c1cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@ _bsp/
doc/out
docs/*.asciidoc
ext/
-.glv
\ No newline at end of file
+.glv
+settings.xml
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec066ca6/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 47da2b8..626c1be 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -63,6 +63,13 @@ if [ -d "/usr/src/tinkermem" ]; then
cd /usr/src/tinkermem
fi
+# use a custom maven settings.xml
+if [ -r "settings.xml" ]; then
+ echo "Copying settings.xml"
+ mkdir -p ~/.m2
+ cp settings.xml ~/.m2/
+fi
+
mvn clean install process-resources ${TINKERPOP_BUILD_OPTIONS} || exit 1
[ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1