summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2021-04-07 10:18:09 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2021-04-13 08:28:54 +0800
commit0800c8bb3b6d443d9c280000f8e79fbf380f9415 (patch)
tree3b60bfff66b8cf671c2a89101de5b666f7076086
parente336b8bbdaa0364e5185ac5a0c6422e62820bc59 (diff)
Fixed the Start-up Failure in the Dualstack Env
Change-Id: I17d2a8cd5cba6276e131f67365143db1dda53114 Issue-ID: HOLMES-429 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
-rw-r--r--pom.xml2
-rw-r--r--rulemgt-frontend/pom.xml2
-rw-r--r--rulemgt-standalone/pom.xml2
-rw-r--r--rulemgt-standalone/src/main/assembly/bin/run.sh2
-rw-r--r--rulemgt/pom.xml2
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java1
-rw-r--r--version.properties2
7 files changed, 6 insertions, 7 deletions
diff --git a/pom.xml b/pom.xml
index 6d8273c..21d91dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>holmes-rule-management</name>
<modules>
diff --git a/rulemgt-frontend/pom.xml b/rulemgt-frontend/pom.xml
index acf65b2..c2695a8 100644
--- a/rulemgt-frontend/pom.xml
+++ b/rulemgt-frontend/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.3-SNAPSHOT</version>
</parent>
<artifactId>holmes-rulemgt-frontend</artifactId>
diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index d8c3720..3658a22 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.3-SNAPSHOT</version>
</parent>
<artifactId>holmes-rulemgt-standalone</artifactId>
diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index 69b5df5..3f32d4e 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -53,7 +53,7 @@ sed -i "s|password:.*|password: $JDBC_PASSWORD|" "$main_path/conf/rulemgt.yml"
sed -i "s|url:.*|url: jdbc:postgresql://$URL_JDBC/$DB_NAME|" "$main_path/conf/rulemgt.yml"
sed -i "s|msbServerAddr:.*|msbServerAddr: http://$MSB_ADDR|" "$main_path/conf/rulemgt.yml"
-export SERVICE_IP=`hostname -i`
+export SERVICE_IP=`hostname -i | awk '{print $1}'`
echo SERVICE_IP=${SERVICE_IP}
if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml
index facac64..b264edc 100644
--- a/rulemgt/pom.xml
+++ b/rulemgt/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.3-SNAPSHOT</version>
</parent>
<artifactId>holmes-rulemgt</artifactId>
diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java
index 91be5d3..e581699 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineServiceTest.java
@@ -33,7 +33,6 @@ import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.rule.PowerMockRule;
import org.powermock.reflect.Whitebox;
import java.util.HashMap;
diff --git a/version.properties b/version.properties
index 0969948..78b140e 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=1
minor=3
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}