[streams] branch master updated: STREAMS-571 remove application.conf from release.sh (#415)

[ra...@apache.org]

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

rawkintrevo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git


The following commit(s) were added to refs/heads/master by this push:
     new fa30b01  STREAMS-571 remove application.conf from release.sh (#415)
fa30b01 is described below

commit fa30b01db2d31b954fed7ac5d08e68c325d11ac1
Author: Trevor Grant <tr...@gmail.com>
AuthorDate: Fri Jan 5 10:20:16 2018 -0600

    STREAMS-571 remove application.conf from release.sh (#415)
    
    * STREAMS-563 Remove Incubating from all pom.xml
    
    * STREAMS-563 Update all poms to 0.5.1-SNAPSHOT
    
    * STREAMS-571 Remove application.conf from release.sh
    
    * STREAMS-571 Remove application.conf from release.sh
---
 release.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/release.sh b/release.sh
index 274f2e7..7d6a33f 100755
--- a/release.sh
+++ b/release.sh
@@ -64,9 +64,7 @@ mvn $REPO clean apache-rat:check -e -DskipTests=true  > ../logs/streams-project_
 checkStatus ../logs/streams-project_apache-rat_check.txt
 
 cp ../streams-c84fa47bd759.p12 .
-cp ../application.conf .
-sed -i '' "s#<WORK>#$(pwd)#g" application.conf
-cat application.conf
+cp ../*.conf .
 
 mvn -PdockerITs $REPO docker:start > ../logs/streams_docker-start.txt
 checkStatus ../logs/streams_docker-start.txt
@@ -75,7 +73,7 @@ sleep 30
 docker ps
 head *.properties
 
-mvn clean verify $REPO -DskipTests=true -DskipITs=false -DargLine="-Dconfig.file=`pwd`/application.conf" > ../logs/streams_integrationtests.txt
+mvn clean verify $REPO -DskipTests=true -DskipITs=false > ../logs/streams_integrationtests.txt
 checkStatus ../logs/streams_integrationtests.txt
 
 mvn -PdockerITs $REPO docker:stop > ../logs/streams_docker-stop.txt
@@ -102,8 +100,7 @@ mvn $REPO clean verify > ../logs/streams-examples_unittests.txt
 checkStatus ../logs/streams-examples_unittests.txt
 
 cp ../streams-c84fa47bd759.p12 .
-cp ../application.conf .
-sed -i '' "s#<WORK>#$(pwd)#g" application.conf
+cp ../*.conf .
 
 mvn $REPO -PdockerITs -N docker:start > ../logs/streams-examples_docker-start.txt
 checkStatus ../logs/streams-examples_docker-start.txt
@@ -112,7 +109,7 @@ sleep 30
 docker ps
 head *.properties
 
-mvn $REPO clean verify -DskipTests=true -DskipITs=false -DargLine="-Dconfig.file=`pwd`/application.conf" > ../logs/streams-examples_integrationtests.txt
+mvn $REPO clean verify -DskipTests=true -DskipITs=false  > ../logs/streams-examples_integrationtests.txt
 checkStatus ../logs/streams-examples_integrationtests.txt
 
 mvn $REPO -Papache-release release:prepare -DpushChanges=false -DautoVersionSubmodules=true -DreleaseVersion=$REL -DdevelopmentVersion=$DEV-SNAPSHOT -Dtag=streams-examples-$REL > ../logs/streams-examples_release-prepare.txt

-- 
To stop receiving notification emails like this one, please contact
['"commits@streams.apache.org" <co...@streams.apache.org>'].