summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--auth/cli-codegen/pom.xml2
-rw-r--r--auth/cli-editor/pom.xml2
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java89
-rw-r--r--auth/pom.xml2
-rw-r--r--client/client-common/pom.xml2
-rw-r--r--client/client-deployment/pom.xml2
-rw-r--r--client/client-editor/pom.xml2
-rw-r--r--client/client-full/pom.xml2
-rw-r--r--client/client-monitoring/pom.xml2
-rw-r--r--client/pom.xml2
-rw-r--r--context/context-management/pom.xml2
-rw-r--r--context/pom.xml2
-rw-r--r--core/core-deployment/pom.xml2
-rw-r--r--core/core-engine/pom.xml2
-rw-r--r--core/core-infrastructure/pom.xml2
-rw-r--r--core/core-protocols/pom.xml2
-rw-r--r--core/pom.xml2
-rw-r--r--examples/examples-aadm/pom.xml2
-rw-r--r--examples/examples-adaptive/pom.xml2
-rw-r--r--examples/examples-decisionmaker/pom.xml2
-rw-r--r--examples/examples-grpc/pom.xml2
-rw-r--r--examples/examples-myfirstpolicy/pom.xml2
-rw-r--r--examples/examples-onap-bbs/pom.xml2
-rw-r--r--examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java8
-rw-r--r--examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java13
-rw-r--r--examples/examples-onap-vcpe/pom.xml2
-rw-r--r--examples/examples-pcvs/pom.xml2
-rw-r--r--examples/examples-periodic/pom.xml2
-rw-r--r--examples/examples-servlet/pom.xml2
-rw-r--r--examples/pom.xml2
-rw-r--r--model/basic-model/pom.xml2
-rw-r--r--model/context-model/pom.xml2
-rw-r--r--model/engine-model/pom.xml2
-rw-r--r--model/event-model/pom.xml2
-rw-r--r--model/model-api/pom.xml2
-rw-r--r--model/policy-model/pom.xml2
-rw-r--r--model/pom.xml2
-rw-r--r--model/utilities/pom.xml2
-rw-r--r--packages/apex-pdp-docker/pom.xml2
-rw-r--r--packages/apex-pdp-package-full/pom.xml2
-rw-r--r--packages/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-distribution/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-locking/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-persistence/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml2
-rw-r--r--plugins/plugins-context/plugins-context-schema/pom.xml2
-rw-r--r--plugins/plugins-context/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-carrier/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml2
-rw-r--r--plugins/plugins-event/plugins-event-protocol/pom.xml2
-rw-r--r--plugins/plugins-event/pom.xml2
-rw-r--r--plugins/plugins-executor/plugins-executor-java/pom.xml2
-rw-r--r--plugins/plugins-executor/plugins-executor-javascript/pom.xml2
-rw-r--r--plugins/plugins-executor/plugins-executor-jruby/pom.xml2
-rw-r--r--plugins/plugins-executor/plugins-executor-jython/pom.xml2
-rw-r--r--plugins/plugins-executor/plugins-executor-mvel/pom.xml2
-rw-r--r--plugins/plugins-executor/pom.xml2
-rw-r--r--plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml2
-rw-r--r--plugins/plugins-persistence/plugins-persistence-jpa/pom.xml2
-rw-r--r--plugins/plugins-persistence/pom.xml2
-rw-r--r--plugins/pom.xml2
-rw-r--r--pom.xml8
-rw-r--r--releases/2.3.1-container.yaml8
-rw-r--r--releases/2.3.1.yaml4
-rw-r--r--services/pom.xml2
-rw-r--r--services/services-engine/pom.xml2
-rw-r--r--services/services-onappf/pom.xml2
-rw-r--r--testsuites/apex-pdp-stability/pom.xml2
-rw-r--r--testsuites/integration/integration-common/pom.xml2
-rw-r--r--testsuites/integration/integration-context-test/pom.xml2
-rw-r--r--testsuites/integration/integration-executor-test/pom.xml2
-rw-r--r--testsuites/integration/integration-uservice-test/pom.xml2
-rw-r--r--testsuites/integration/pom.xml2
-rw-r--r--testsuites/performance/performance-benchmark-test/pom.xml2
-rw-r--r--testsuites/performance/pom.xml2
-rw-r--r--testsuites/pom.xml2
-rw-r--r--tools/model-generator/pom.xml2
-rw-r--r--tools/pom.xml2
-rw-r--r--tools/simple-wsclient/pom.xml2
-rw-r--r--tools/tools-common/pom.xml2
-rw-r--r--version.properties2
94 files changed, 163 insertions, 143 deletions
diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml
index 2bbc3fc77..5d0142318 100644
--- a/auth/cli-codegen/pom.xml
+++ b/auth/cli-codegen/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.auth</groupId>
<artifactId>auth</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>cli-codegen</artifactId>
diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml
index a1322875b..11021a698 100644
--- a/auth/cli-editor/pom.xml
+++ b/auth/cli-editor/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.auth</groupId>
<artifactId>auth</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>cli-editor</artifactId>
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
index 93a8f0d14..d882b1a21 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
@@ -56,6 +56,7 @@ import org.slf4j.ext.XLoggerFactory;
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
public class CommandLineEditorLoop {
+
// Get a reference to the logger
private static final XLogger LOGGER = XLoggerFactory.getXLogger(CommandLineEditorLoop.class);
@@ -79,12 +80,12 @@ public class CommandLineEditorLoop {
/**
* Initiate the loop with the keyword node tree.
*
- * @param properties The CLI editor properties defined for execution
- * @param modelHandler the model handler that will handle commands
+ * @param properties The CLI editor properties defined for execution
+ * @param modelHandler the model handler that will handle commands
* @param rootKeywordNode The root keyword node tree
*/
public CommandLineEditorLoop(final Properties properties, final ApexModelHandler modelHandler,
- final KeywordNode rootKeywordNode) {
+ final KeywordNode rootKeywordNode) {
this.modelHandler = modelHandler;
keywordNodeDeque.push(rootKeywordNode);
@@ -96,14 +97,14 @@ public class CommandLineEditorLoop {
/**
* Run a command loop.
*
- * @param inputStream The stream to read commands from
+ * @param inputStream The stream to read commands from
* @param outputStream The stream to write command output and messages to
- * @param parameters The parameters for the CLI editor
+ * @param parameters The parameters for the CLI editor
* @return the exit code from command processing
* @throws IOException Thrown on exceptions on IO
*/
public int runLoop(final InputStream inputStream, final OutputStream outputStream,
- final CommandLineParameters parameters) throws IOException {
+ final CommandLineParameters parameters) throws IOException {
// Readers and writers for input and output
final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
final PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream));
@@ -141,7 +142,7 @@ public class CommandLineEditorLoop {
* Check if the command processing loop has come to an end.
*
* @param executionStatus a pair containing the result of the last command and the accumulated error count
- * @param parameters the input parameters for command execution
+ * @param parameters the input parameters for command execution
* @return true if the command processing loop should exit
*/
private boolean endOfCommandExecution(Pair<Result, Integer> executionStatus, CommandLineParameters parameters) {
@@ -155,13 +156,13 @@ public class CommandLineEditorLoop {
/**
* Process the incoming commands one by one.
*
- * @param parameters the parameters to the CLI editor
- * @param reader the reader to read the logic block from
- * @param writer the writer to write results and error messages on
+ * @param parameters the parameters to the CLI editor
+ * @param reader the reader to read the logic block from
+ * @param writer the writer to write results and error messages on
* @param executionStatus the status of the logic block read
*/
private void processIncomingCommands(final CommandLineParameters parameters, final BufferedReader reader,
- final PrintWriter writer, final CommandLineParser parser, MutablePair<Result, Integer> executionStatus) {
+ final PrintWriter writer, final CommandLineParser parser, MutablePair<Result, Integer> executionStatus) {
try {
// Output prompt and get a line of input
@@ -197,8 +198,8 @@ public class CommandLineEditorLoop {
final CommandLineCommand command = findCommand(commandWords);
if (command != null) {
// Check the arguments of the command
- final TreeMap<String, CommandLineArgumentValue> argumentValues =
- getArgumentValues(command, commandWords);
+ final TreeMap<String, CommandLineArgumentValue> argumentValues = getArgumentValues(command,
+ commandWords);
// Execute the command, a FINISHED result means a command causes the loop to
// leave execution
@@ -222,16 +223,15 @@ public class CommandLineEditorLoop {
/**
* Read a logic block, a block of program logic for a policy.
*
- * @param parameters the parameters to the CLI editor
- * @param reader the reader to read the logic block from
- * @param writer the writer to write results and error messages on
+ * @param parameters the parameters to the CLI editor
+ * @param reader the reader to read the logic block from
+ * @param writer the writer to write results and error messages on
* @param executionStatus the status of the logic block read
* @return the result of the logic block read
*/
private String readLogicBlock(final CommandLineParameters parameters, final BufferedReader reader,
- final PrintWriter writer, MutablePair<Result, Integer> executionStatus) {
- String logicBlock;
- logicBlock = "";
+ final PrintWriter writer, MutablePair<Result, Integer> executionStatus) {
+ StringBuilder logicBlock = new StringBuilder();
while (true) {
try {
@@ -249,10 +249,10 @@ public class CommandLineEditorLoop {
}
if (logicLine.trim().endsWith(logicBlockEndTag)) {
- logicBlock += logicLine.replace(logicBlockEndTag, "").trim() + "\n";
- return logicBlock;
+ logicBlock.append(logicLine.replace(logicBlockEndTag, "").trim() + "\n");
+ return logicBlock.toString();
} else {
- logicBlock += logicLine + "\n";
+ logicBlock.append(logicLine + "\n");
}
}
// Print any error messages from command parsing and finding
@@ -311,15 +311,16 @@ public class CommandLineEditorLoop {
// If the node entries found is not equal to one, then we have either no command or more
// than one command matching
- final List<Entry<String, KeywordNode>> foundNodeEntries =
- findMatchingEntries(searchKeywordNode.getChildren(), commandWords.get(i));
+ final List<Entry<String, KeywordNode>> foundNodeEntries = findMatchingEntries(
+ searchKeywordNode.getChildren(), commandWords.get(i));
if (foundNodeEntries.isEmpty()) {
unwindStack(startKeywordNode);
throw new CommandLineException("command not found: " + stringAL2String(commandWords));
} else if (foundNodeEntries.size() > 1) {
unwindStack(startKeywordNode);
- throw new CommandLineException("multiple commands matched: " + stringAL2String(commandWords) + " ["
- + nodeAL2String(foundNodeEntries) + ']');
+ throw new CommandLineException(
+ "multiple commands matched: " + stringAL2String(commandWords) + " [" + nodeAL2String(
+ foundNodeEntries) + ']');
}
// Record the fully expanded command word
@@ -360,12 +361,12 @@ public class CommandLineEditorLoop {
/**
* Check the arguments of the command.
*
- * @param command The command to check
+ * @param command The command to check
* @param commandWords The command words entered
* @return the argument values
*/
private TreeMap<String, CommandLineArgumentValue> getArgumentValues(final CommandLineCommand command,
- final List<String> commandWords) {
+ final List<String> commandWords) {
final TreeMap<String, CommandLineArgumentValue> argumentValues = new TreeMap<>();
for (final CommandLineArgument argument : command.getArgumentList()) {
if (argument != null) {
@@ -375,14 +376,15 @@ public class CommandLineEditorLoop {
// Set the value of the arguments
for (final Entry<String, String> argument : getCommandArguments(commandWords)) {
- final List<Entry<String, CommandLineArgumentValue>> foundArguments =
- TreeMapUtils.findMatchingEntries(argumentValues, argument.getKey());
+ final List<Entry<String, CommandLineArgumentValue>> foundArguments = TreeMapUtils
+ .findMatchingEntries(argumentValues, argument.getKey());
if (foundArguments.isEmpty()) {
- throw new CommandLineException(COMMAND + stringAL2String(commandWords) + ": " + " argument \""
- + argument.getKey() + "\" not allowed on command");
+ throw new CommandLineException(
+ COMMAND + stringAL2String(commandWords) + ": " + " argument \"" + argument.getKey()
+ + "\" not allowed on command");
} else if (foundArguments.size() > 1) {
throw new CommandLineException(COMMAND + stringAL2String(commandWords) + ": " + " argument " + argument
- + " matches multiple arguments [" + argumentAL2String(foundArguments) + ']');
+ + " matches multiple arguments [" + argumentAL2String(foundArguments) + ']');
}
// Set the value of the argument, stripping off any quotes
@@ -395,8 +397,9 @@ public class CommandLineEditorLoop {
// Argument values are null by default so if this argument is not nullable it is
// mandatory
if (!argumentValue.isSpecified() && !argumentValue.getCliArgument().isNullable()) {
- throw new CommandLineException(COMMAND + stringAL2String(commandWords) + ": " + " mandatory argument \""
- + argumentValue.getCliArgument().getArgumentName() + "\" not specified");
+ throw new CommandLineException(
+ COMMAND + stringAL2String(commandWords) + ": " + " mandatory argument \"" + argumentValue
+ .getCliArgument().getArgumentName() + "\" not specified");
}
}
@@ -417,8 +420,8 @@ public class CommandLineEditorLoop {
for (final String word : commandWords) {
final int equalsPos = word.indexOf('=');
if (equalsPos > 0) {
- arguments.add(
- new SimpleEntry<>(word.substring(0, equalsPos), word.substring(equalsPos + 1, word.length())));
+ arguments
+ .add(new SimpleEntry<>(word.substring(0, equalsPos), word.substring(equalsPos + 1, word.length())));
}
}
@@ -428,13 +431,13 @@ public class CommandLineEditorLoop {
/**
* Execute system and editor commands.
*
- * @param command The command to execute
+ * @param command The command to execute
* @param argumentValues The arguments input on the command line to invoke the command
- * @param writer The writer to use for any output from the command
+ * @param writer The writer to use for any output from the command
* @return the result of execution of the command
*/
private Result executeCommand(final CommandLineCommand command,
- final TreeMap<String, CommandLineArgumentValue> argumentValues, final PrintWriter writer) {
+ final TreeMap<String, CommandLineArgumentValue> argumentValues, final PrintWriter writer) {
if (command.isSystemCommand()) {
return exceuteSystemCommand(command, writer);
} else {
@@ -446,7 +449,7 @@ public class CommandLineEditorLoop {
* Execute system commands.
*
* @param command The command to execute
- * @param writer The writer to use for any output from the command
+ * @param writer The writer to use for any output from the command
* @return the result of execution of the command
*/
private Result exceuteSystemCommand(final CommandLineCommand command, final PrintWriter writer) {
@@ -551,7 +554,7 @@ public class CommandLineEditorLoop {
* line with the file contents.
*
* @param parameters The parameters for the CLI editor
- * @param line The line with the macro keyword in it
+ * @param line The line with the macro keyword in it
* @return the expanded line
*/
private String expandMacroFile(final CommandLineParameters parameters, final String line) {
@@ -576,7 +579,7 @@ public class CommandLineEditorLoop {
macroFileName = macroFileName.substring(1, macroFileName.length() - 1);
} else {
throw new CommandLineException(
- "macro file name \"" + macroFileName + "\" must exist and be quoted with double quotes \"\"");
+ "macro file name \"" + macroFileName + "\" must exist and be quoted with double quotes \"\"");
}
// Append the working directory to the macro file name
diff --git a/auth/pom.xml b/auth/pom.xml
index 8c0b35726..dda09c1ce 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.auth</groupId>
diff --git a/client/client-common/pom.xml b/client/client-common/pom.xml
index 7b9dcdb45..8a09c1e4d 100644
--- a/client/client-common/pom.xml
+++ b/client/client-common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
<artifactId>apex-client</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-client-common</artifactId>
diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml
index 40913e3a1..7469f2d27 100644
--- a/client/client-deployment/pom.xml
+++ b/client/client-deployment/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
<artifactId>apex-client</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-client-deployment</artifactId>
diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml
index 0389bb160..26eb288ba 100644
--- a/client/client-editor/pom.xml
+++ b/client/client-editor/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
<artifactId>apex-client</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-client-editor</artifactId>
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index d35793e2e..3dad42cb5 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
<artifactId>apex-client</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-client-full</artifactId>
diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml
index e2e6f8ee3..5bc93f5b3 100644
--- a/client/client-monitoring/pom.xml
+++ b/client/client-monitoring/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
<artifactId>apex-client</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-client-monitoring</artifactId>
diff --git a/client/pom.xml b/client/pom.xml
index 7f4831a13..d58bbe7be 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml
index 7a7576c2b..4586e2c26 100644
--- a/context/context-management/pom.xml
+++ b/context/context-management/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.context</groupId>
<artifactId>context</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>context-management</artifactId>
diff --git a/context/pom.xml b/context/pom.xml
index 1bf5e1dc2..e31adccb5 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.context</groupId>
diff --git a/core/core-deployment/pom.xml b/core/core-deployment/pom.xml
index a37c02728..89476a839 100644
--- a/core/core-deployment/pom.xml
+++ b/core/core-deployment/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.core</groupId>
<artifactId>core</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>core-deployment</artifactId>
diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml
index 9e893a96b..1d7cbdbe2 100644
--- a/core/core-engine/pom.xml
+++ b/core/core-engine/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.core</groupId>
<artifactId>core</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>core-engine</artifactId>
diff --git a/core/core-infrastructure/pom.xml b/core/core-infrastructure/pom.xml
index 34c9340d0..fcae62e04 100644
--- a/core/core-infrastructure/pom.xml
+++ b/core/core-infrastructure/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.core</groupId>
<artifactId>core</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>core-infrastructure</artifactId>
diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml
index eea2623cd..9c153903a 100644
--- a/core/core-protocols/pom.xml
+++ b/core/core-protocols/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.core</groupId>
<artifactId>core</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>core-protocols</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 49fc75a0e..ae2bdb7b3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.core</groupId>
diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml
index b4a39f9be..c080532ec 100644
--- a/examples/examples-aadm/pom.xml
+++ b/examples/examples-aadm/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-aadm</artifactId>
diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index 98f344d22..b79d03e7a 100644
--- a/examples/examples-adaptive/pom.xml
+++ b/examples/examples-adaptive/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-adaptive</artifactId>
diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml
index 7e32e66e2..8767d27f3 100644
--- a/examples/examples-decisionmaker/pom.xml
+++ b/examples/examples-decisionmaker/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-decisionmaker</artifactId>
diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml
index 9848bf41c..172c4f227 100644
--- a/examples/examples-grpc/pom.xml
+++ b/examples/examples-grpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-grpc</artifactId>
<name>examples-grpc</name>
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index 6eebf6320..8a37c8902 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-myfirstpolicy</artifactId>
diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml
index 3f8716ae9..10a0877ff 100644
--- a/examples/examples-onap-bbs/pom.xml
+++ b/examples/examples-onap-bbs/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-onap-bbs</artifactId>
diff --git a/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java b/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java
index edaff6b52..884708d03 100644
--- a/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java
+++ b/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java
@@ -34,7 +34,6 @@ import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
-import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -64,6 +63,10 @@ public class WebClient {
// Duplicated string constants
private static final String BBS_POLICY = "BBS Policy";
+ //Features to prevent XXE injection
+ private static final String XML_DISALLOW_DOCTYPE_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl";
+ private static final String XML_EXTERNAL_ENTITY_FEATURE = "http://xml.org/sax/features/external-general-entities";
+
/**
* Send simple https rest request.
*
@@ -140,7 +143,8 @@ public class WebClient {
try (ByteArrayInputStream br = new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))) {
DocumentBuilderFactory df = DocumentBuilderFactory.newInstance();
- df.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ df.setFeature(XML_DISALLOW_DOCTYPE_FEATURE, true);
+ df.setFeature(XML_EXTERNAL_ENTITY_FEATURE, false);
Document document = df.newDocumentBuilder().parse(new InputSource(br));
document.normalize();
diff --git a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java
index 3cb588dc7..ba1481c0b 100644
--- a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java
+++ b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
import org.mockito.Mockito;
public class WebClientTest {
+
HttpsURLConnection mockedHttpsUrlConnection;
String sampleString = "Response Code :200";
@@ -55,24 +56,24 @@ public class WebClientTest {
@Test
public void testHttpsRequest() {
WebClient cl = new WebClient();
- String result =
- cl.httpRequest("https://some.random.url/data", "POST", null, "admin", "admin", "application/json");
+ String result = cl
+ .httpRequest("https://some.random.url/data", "POST", null, "admin", "admin", "application/json");
assertNotNull(result);
}
@Test
public void testHttpRequest() {
WebClient cl = new WebClient();
- String result =
- cl.httpRequest("http://some.random.url/data", "GET", null, "admin", "admin", "application/json");
+ String result = cl
+ .httpRequest("http://some.random.url/data", "GET", null, "admin", "admin", "application/json");
assertNotNull(result);
}
@Test
public void testToPrettyString() {
String xmlSample = "<input xmlns=\"org:onap:sdnc:northbound:generic-resource\">"
- + "<sdnc-request-header> <svc-action>update</svc-action> </sdnc-request-header></input>";
+ + "<sdnc-request-header> <svc-action>update</svc-action> </sdnc-request-header></input>";
WebClient cl = new WebClient();
- cl.toPrettyString(xmlSample, 4);
+ assertNotNull(cl.toPrettyString(xmlSample, 4));
}
}
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index 2580658a8..fca1bbffc 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-onap-vcpe</artifactId>
diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index e559ab6ef..80e4dcf55 100644
--- a/examples/examples-pcvs/pom.xml
+++ b/examples/examples-pcvs/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-pcvs</artifactId>
diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml
index 1da32b00c..b4b80fef2 100644
--- a/examples/examples-periodic/pom.xml
+++ b/examples/examples-periodic/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-periodic</artifactId>
diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml
index 093a5da45..dcae48a4d 100644
--- a/examples/examples-servlet/pom.xml
+++ b/examples/examples-servlet/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>examples-servlet</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 76fafc8bf..5d181857d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml
index a682cff2c..3e11381a5 100644
--- a/model/basic-model/pom.xml
+++ b/model/basic-model/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>basic-model</artifactId>
diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml
index ba7a558db..435e60f22 100644
--- a/model/context-model/pom.xml
+++ b/model/context-model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>context-model</artifactId>
diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml
index 5c6e47e1a..b1a27ca10 100644
--- a/model/engine-model/pom.xml
+++ b/model/engine-model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>engine-model</artifactId>
diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml
index fa8c73ba5..a9be3fc99 100644
--- a/model/event-model/pom.xml
+++ b/model/event-model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>event-model</artifactId>
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index cb9c1ebbb..8897cb4da 100644
--- a/model/model-api/pom.xml
+++ b/model/model-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>model-api</artifactId>
diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml
index b2f502cfd..d5f105179 100644
--- a/model/policy-model/pom.xml
+++ b/model/policy-model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>policy-model</artifactId>
diff --git a/model/pom.xml b/model/pom.xml
index 5b736cf2f..1bf794776 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml
index 5cec0111a..eb4664394 100644
--- a/model/utilities/pom.xml
+++ b/model/utilities/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.model</groupId>
<artifactId>model</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>utilities</artifactId>
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 6adecaa62..86bfc5aaa 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.packages</groupId>
<artifactId>apex-packages</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-pdp-docker</artifactId>
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index 1f68a6b5e..177a1cafa 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.packages</groupId>
<artifactId>apex-packages</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>apex-pdp-package-full</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index e6d170b08..f64b9c010 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.packages</groupId>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
index a37cf01ad..99f597450 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
<artifactId>plugins-context-distribution</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-context-distribution-hazelcast</artifactId>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index cf4be2128..2eb9ed4df 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
<artifactId>plugins-context-distribution</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-context-distribution-infinispan</artifactId>
diff --git a/plugins/plugins-context/plugins-context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml
index 8044f7f97..646f1ec1e 100644
--- a/plugins/plugins-context/plugins-context-distribution/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
<artifactId>plugins-context</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
index 34aa8c8a4..68ae63bed 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
<artifactId>plugins-context-locking</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-context-locking-curator</artifactId>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
index e018d58a7..e022c1072 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
<artifactId>plugins-context-locking</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-context-locking-hazelcast</artifactId>
diff --git a/plugins/plugins-context/plugins-context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml
index 254be9934..3ed5f5d5a 100644
--- a/plugins/plugins-context/plugins-context-locking/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
<artifactId>plugins-context</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
diff --git a/plugins/plugins-context/plugins-context-persistence/pom.xml b/plugins/plugins-context/plugins-context-persistence/pom.xml
index 369d92331..a184d1868 100644
--- a/plugins/plugins-context/plugins-context-persistence/pom.xml
+++ b/plugins/plugins-context/plugins-context-persistence/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
<artifactId>plugins-context</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-persistence</groupId>
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
index d0c65ac0c..118a8bf13 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
<artifactId>plugins-context-schema</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-context-schema-avro</artifactId>
diff --git a/plugins/plugins-context/plugins-context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml
index 04cf346f6..44412c9c1 100644
--- a/plugins/plugins-context/plugins-context-schema/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
<artifactId>plugins-context</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml
index 9656870ee..94987cf6f 100644
--- a/plugins/plugins-context/pom.xml
+++ b/plugins/plugins-context/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
index f51b2c265..873a18224 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-grpc</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
index e6524609d..1fddd1c9d 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-jms</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index 16d722c7a..6ce1f648e 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-kafka</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
index 090f22053..bdbbe935f 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-restclient</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
index b71b68924..4df42383b 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-restrequestor</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
index 68b034270..25caacdc3 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-restserver</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
index 84bc62c03..337bc8145 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
<artifactId>plugins-event-carrier</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-carrier-websocket</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/pom.xml b/plugins/plugins-event/plugins-event-carrier/pom.xml
index fb2fdbb27..9bc469d19 100644
--- a/plugins/plugins-event/plugins-event-carrier/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
<artifactId>plugins-event</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
index 5f3136756..d8dcca765 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
<artifactId>plugins-event-protocol</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-protocol-jms</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
index b37ccd6f1..9d9f2eaec 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
<artifactId>plugins-event-protocol</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-protocol-xml</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
index 6dd7ff4cc..fd0c4dc53 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
<artifactId>plugins-event-protocol</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-event-protocol-yaml</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/pom.xml b/plugins/plugins-event/plugins-event-protocol/pom.xml
index 715909fe3..eac9fd978 100644
--- a/plugins/plugins-event/plugins-event-protocol/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
<artifactId>plugins-event</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
diff --git a/plugins/plugins-event/pom.xml b/plugins/plugins-event/pom.xml
index cca3d540f..f22c1c36d 100644
--- a/plugins/plugins-event/pom.xml
+++ b/plugins/plugins-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
diff --git a/plugins/plugins-executor/plugins-executor-java/pom.xml b/plugins/plugins-executor/plugins-executor-java/pom.xml
index 34aa52519..2c980f314 100644
--- a/plugins/plugins-executor/plugins-executor-java/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-java/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
<artifactId>plugins-executor</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-executor-java</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-javascript/pom.xml b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
index 80fe06c79..3a50acb2c 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
<artifactId>plugins-executor</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-executor-javascript</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
index 43767028d..c3b31d541 100644
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
<artifactId>plugins-executor</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-executor-jruby</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-jython/pom.xml b/plugins/plugins-executor/plugins-executor-jython/pom.xml
index 67fe3eb84..43e5da744 100644
--- a/plugins/plugins-executor/plugins-executor-jython/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jython/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
<artifactId>plugins-executor</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-executor-jython</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-mvel/pom.xml b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
index f236c6912..e7721b093 100644
--- a/plugins/plugins-executor/plugins-executor-mvel/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
<artifactId>plugins-executor</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-executor-mvel</artifactId>
diff --git a/plugins/plugins-executor/pom.xml b/plugins/plugins-executor/pom.xml
index 3f352e156..3921191db 100644
--- a/plugins/plugins-executor/pom.xml
+++ b/plugins/plugins-executor/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
index 3b21e1303..ede13c11c 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
<artifactId>plugins-persistence-jpa</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>plugins-persistence-jpa-eclipselink</artifactId>
<name>${project.artifactId}</name>
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
index 8d1f8b974..b481f5f83 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId>
<artifactId>plugins-persistence</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
diff --git a/plugins/plugins-persistence/pom.xml b/plugins/plugins-persistence/pom.xml
index a515c3986..99fc6161b 100644
--- a/plugins/plugins-persistence/pom.xml
+++ b/plugins/plugins-persistence/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0a7efe83c..a7bfb895f 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 5b21c2134..01ab90bb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,13 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2</version>
<relativePath />
</parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-apex-pdp</name>
@@ -45,8 +45,8 @@
<version.commons-cli>1.4</version.commons-cli>
<version.kafka>2.3.0</version.kafka>
<version.hibernate>5.3.7.Final</version.hibernate>
- <version.policy.common>1.6.3-SNAPSHOT</version.policy.common>
- <version.policy.models>2.2.3-SNAPSHOT</version.policy.models>
+ <version.policy.common>1.6.4</version.policy.common>
+ <version.policy.models>2.2.4</version.policy.models>
<version.jackson>2.10.0.pr3</version.jackson>
<version.jgroups>4.1.5.Final</version.jgroups>
<version.commons-codec>20041127.091804</version.commons-codec>
diff --git a/releases/2.3.1-container.yaml b/releases/2.3.1-container.yaml
new file mode 100644
index 000000000..3c017ebfe
--- /dev/null
+++ b/releases/2.3.1-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.3.1'
+project: 'policy-apex-pdp'
+log_dir: 'policy-apex-pdp-maven-docker-stage-master/302'
+ref: 51bfa062bbe2628d382bbfc8507522e86d53a515
+containers:
+ - name: 'policy-apex-pdp'
+ version: '2.3.1-20200415T0002'
diff --git a/releases/2.3.1.yaml b/releases/2.3.1.yaml
new file mode 100644
index 000000000..94ba27a54
--- /dev/null
+++ b/releases/2.3.1.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.3.1'
+project: 'policy-apex-pdp'
+log_dir: 'policy-apex-pdp-maven-stage-master/303/'
diff --git a/services/pom.xml b/services/pom.xml
index 3f0b09c71..8cedba0da 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.services</groupId>
diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml
index 3748097b2..eb562df8c 100644
--- a/services/services-engine/pom.xml
+++ b/services/services-engine/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.services</groupId>
<artifactId>services</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>services-engine</artifactId>
diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml
index 38ba9ab40..1aa64c47a 100644
--- a/services/services-onappf/pom.xml
+++ b/services/services-onappf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.services</groupId>
<artifactId>services</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>services-onappf</artifactId>
diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml
index f3da0efd0..e4c760e1a 100644
--- a/testsuites/apex-pdp-stability/pom.xml
+++ b/testsuites/apex-pdp-stability/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
<artifactId>apex-testsuites</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites.stability</groupId>
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index a2aaa1905..c596597a8 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
<artifactId>apex-integration</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>integration-common</artifactId>
diff --git a/testsuites/integration/integration-context-test/pom.xml b/testsuites/integration/integration-context-test/pom.xml
index ff98282ae..2b6cff2c2 100644
--- a/testsuites/integration/integration-context-test/pom.xml
+++ b/testsuites/integration/integration-context-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
<artifactId>apex-integration</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>integration-context-test</artifactId>
diff --git a/testsuites/integration/integration-executor-test/pom.xml b/testsuites/integration/integration-executor-test/pom.xml
index fa118b822..104ca8e1d 100644
--- a/testsuites/integration/integration-executor-test/pom.xml
+++ b/testsuites/integration/integration-executor-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
<artifactId>apex-integration</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>integration-executor-test</artifactId>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 323b5806e..319ab9129 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
<artifactId>apex-integration</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>integration-uservice-test</artifactId>
diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml
index ca247fca7..3768f19b5 100644
--- a/testsuites/integration/pom.xml
+++ b/testsuites/integration/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
<artifactId>apex-testsuites</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml
index e1a162b0f..b3134685b 100644
--- a/testsuites/performance/performance-benchmark-test/pom.xml
+++ b/testsuites/performance/performance-benchmark-test/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
<artifactId>apex-performance</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>performance-benchmark-test</artifactId>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 314b40e34..0a04c1be5 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
<artifactId>apex-testsuites</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 6e94bf490..b932a680d 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml
index e52e439d9..1e3a268c3 100644
--- a/tools/model-generator/pom.xml
+++ b/tools/model-generator/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.tools</groupId>
<artifactId>tools</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>model-generator</artifactId>
diff --git a/tools/pom.xml b/tools/pom.xml
index e7fbf4c2b..3c29831ae 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.tools</groupId>
diff --git a/tools/simple-wsclient/pom.xml b/tools/simple-wsclient/pom.xml
index addb9b2f9..a798ee561 100644
--- a/tools/simple-wsclient/pom.xml
+++ b/tools/simple-wsclient/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.tools</groupId>
<artifactId>tools</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>simple-wsclient</artifactId>
diff --git a/tools/tools-common/pom.xml b/tools/tools-common/pom.xml
index 41463d4e1..bcfd2b129 100644
--- a/tools/tools-common/pom.xml
+++ b/tools/tools-common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.tools</groupId>
<artifactId>tools</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
</parent>
<artifactId>tools-common</artifactId>
diff --git a/version.properties b/version.properties
index bc2c506da..16dbea1c3 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=2
minor=3
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}