From 48d2152c0e6d2c547d1cd5aedd31425e1609e37d Mon Sep 17 00:00:00 2001
From: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
Date: Thu, 11 Oct 2018 15:45:53 +0100
Subject: Update oparent POM version to 1.2.1

Change-Id: I557c32bae98488d57d94976ef1c964176517fb8c
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
Issue-ID: DMAAP-843
---
 .../java/datarouter/provisioning/AllTests.java     | 50 ----------------------
 .../datarouter/provisioning/IntegrationSuite.java  | 50 ++++++++++++++++++++++
 pom.xml                                            | 11 ++++-
 3 files changed, 60 insertions(+), 51 deletions(-)
 delete mode 100644 datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java
 create mode 100644 datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java

diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java b/datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java
deleted file mode 100644
index 33a34c07..00000000
--- a/datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START==================================================
- * * org.onap.dmaap
- * * ===========================================================================
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * ===========================================================================
- * * Licensed under the Apache License, Version 2.0 (the "License");
- * * you may not use this file except in compliance with the License.
- * * You may obtain a copy of the License at
- * *
- *  *      http://www.apache.org/licenses/LICENSE-2.0
- * *
- *  * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- * * ============LICENSE_END====================================================
- * *
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * *
- ******************************************************************************/
-
-package datarouter.provisioning;
-
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({
-    IntegrationTestDrFeedsPost.class,
-    IntegrationTestDrFeedsPut.class,
-    IntegrationTestDrFeedsDelete.class,
-    IntegrationTestFeedPut.class,
-    IntegrationTestDrFeedsGet.class,
-    IntegrationTestInternalGet.class,
-    IntegrationTestInternalMisc.class,
-    IntegrationTestPublish.class,
-    IntegrationTestSubscribePost.class,
-    IntegrationTestLogGet.class,
-    IntegrationTestFeedDelete.class,
-    IntegrationTestCleanup.class,
-    IntegrationTestRleBitSet.class
-})
-
-public class AllTests {
-
-}
diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java
new file mode 100644
index 00000000..4d23857b
--- /dev/null
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * ============LICENSE_START==================================================
+ * * org.onap.dmaap
+ * * ===========================================================================
+ * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * * ===========================================================================
+ * * Licensed under the Apache License, Version 2.0 (the "License");
+ * * you may not use this file except in compliance with the License.
+ * * You may obtain a copy of the License at
+ * *
+ *  *      http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ *  * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License.
+ * * ============LICENSE_END====================================================
+ * *
+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * *
+ ******************************************************************************/
+
+package datarouter.provisioning;
+
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+    IntegrationTestDrFeedsPost.class,
+    IntegrationTestDrFeedsPut.class,
+    IntegrationTestDrFeedsDelete.class,
+    IntegrationTestFeedPut.class,
+    IntegrationTestDrFeedsGet.class,
+    IntegrationTestInternalGet.class,
+    IntegrationTestInternalMisc.class,
+    IntegrationTestPublish.class,
+    IntegrationTestSubscribePost.class,
+    IntegrationTestLogGet.class,
+    IntegrationTestFeedDelete.class,
+    IntegrationTestCleanup.class,
+    IntegrationTestRleBitSet.class
+})
+
+public class IntegrationSuite {
+
+}
diff --git a/pom.xml b/pom.xml
index 6870772c..4fae0fcc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.1</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -148,6 +148,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>IntegrationSuite.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <distributionManagement>
-- 
cgit 1.2.3-korg