[sling-whiteboard] branch master updated: Setting the .m2/settings.xml to use the stage repository, which I think will resolve the issue with trying to build multiple projects in a single release and setting the sling starter to use the run directory

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new b05fb1d  Setting the .m2/settings.xml to use the stage repository, which I think will resolve the issue with trying to build multiple projects in a single release and setting the sling starter to use the run directory
b05fb1d is described below

commit b05fb1d3a4a480e57c1743bb4367445ef578d13a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri May 10 23:26:08 2019 -0400

    Setting the .m2/settings.xml to use the stage repository, which I think will resolve the issue with trying to build multiple projects in a single release and setting the sling starter to use the run directory
---
 release-validator/run.sh | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/release-validator/run.sh b/release-validator/run.sh
index ba51361..a18b5ce 100644
--- a/release-validator/run.sh
+++ b/release-validator/run.sh
@@ -19,6 +19,28 @@ else
   echo "Check successful!"
 fi
 
+echo "Updating .m2/settings.xml..."
+mkdir ~/.m2
+cat > ~/.m2/settings.xml <<EOF
+<settings>
+ <profiles>
+   <profile>
+     <id>staging</id>
+     <repositories>
+       <repository>
+         <id>my-repo2</id>
+         <name>your custom repo</name>
+         <url>https://repository.apache.org/content/repositories/orgapachesling-$RELEASE_ID</url>
+       </repository>
+     </repositories>
+   </profile>
+ </profiles>
+ <activeProfiles>
+   <activeProfile>staging</activeProfile>
+  </activeProfiles>
+</settings>
+EOF
+
 HAS_BUNDLE=false
 for RELEASE_FOLDER in tmp/${RELEASE_ID}/org/apache/sling/*
 do
@@ -64,12 +86,12 @@ then
   
   echo "Starting Sling Starter..."
 
-  mkdir -p sling/logs
+  mkdir -p run/sling/logs
   (
     (
-      java -server -Xmx1024m -XX:MaxPermSize=256M -Djava.awt.headless=true -jar run/*.jar  -p 8080 &
+      java -server -Xmx1024m -XX:MaxPermSize=256M -Djava.awt.headless=true -jar run/*.jar  -p 8080 -c run/sling &
     echo $! > app.pid
-    ) >> sling/logs/stdout.log 2>&1
+    ) >> run/sling/logs/stdout.log 2>&1
   ) &
   
   echo "Waiting for Sling to fully start..."
@@ -110,7 +132,7 @@ then
   	echo "Leaving Sling Starter running for $TIMEOUT for testing..."
   	
   	printf "Run the following command to see the URL to connect to the Sling Starter under the PORT parameter:\n"
-  	printf "\tdocker ps | grep sling-check-release"
+  	printf "\tdocker ps\n"
 
     sleep $TIMEOUT
   fi