summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGeora Barsky <georab@amdocs.com>2017-09-25 13:15:22 -0400
committerGeora Barsky <georab@amdocs.com>2017-09-25 13:17:52 -0400
commit5055dee7d7197456197af8766f6b007a531af0cf (patch)
tree4de536d0c01bc0ae93cfad91ba7244d283062959 /test
parent10d13035c82097a57517c5eb608b1021e3841b7a (diff)
Sniro Emulator - Adjust project to use oparent
Use oparent as a parent artifact Change-Id: I0f08837fefeff296a37f8ddc5dcb6f85daf13afc JIRA-ID: INT-215 Signed-off-by: Geora Barsky <georab@amdocs.com>
Diffstat (limited to 'test')
-rw-r--r--test/mocks/sniroemulator/pom.xml65
-rw-r--r--test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java20
-rw-r--r--test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java19
-rw-r--r--test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java19
-rw-r--r--test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java23
5 files changed, 141 insertions, 5 deletions
diff --git a/test/mocks/sniroemulator/pom.xml b/test/mocks/sniroemulator/pom.xml
index aa437500d..f7c91bf47 100644
--- a/test/mocks/sniroemulator/pom.xml
+++ b/test/mocks/sniroemulator/pom.xml
@@ -10,12 +10,17 @@
<description>onap sniro emulator project based on Spring Boot</description>
<parent>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>0.1.1</version>
+</parent>
+
+<!-- <parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.7.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
</parent>
-
+-->
<properties>
<dockerLocation>${basedir}/target</dockerLocation>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -23,8 +28,51 @@
<java.version>1.8</java.version>
<versions.jackson>2.8.9</versions.jackson>
<jetty.version>9.2.22.v20170606</jetty.version>
+ <start-class>org.onap.integration.test.mocks.sniroemulator.MockApplication</start-class>
</properties>
+<dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>1.5.7.RELEASE</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+</dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -134,6 +182,16 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>${start-class}</mainClass>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -170,8 +228,9 @@
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.11</version>
<configuration>
- <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+ <imageName>openecomp/${project.artifactId}</imageName>
<dockerDirectory>${dockerLocation}</dockerDirectory>
+ <serverId>docker-hub</serverId>
<imageTags>
<imageTag>latest</imageTag>
</imageTags>
diff --git a/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java
index 5e47c7ca0..714d3a340 100644
--- a/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java
+++ b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.integration
+ * ================================================================================
+ * Copyright (C) 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=========================================================
+ */
+
package org.onap.integration.test.mocks.sniroemulator;
import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;
diff --git a/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java
index cccf06018..60592b3f0 100644
--- a/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java
+++ b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java
@@ -1,3 +1,22 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.integration
+ * ================================================================================
+ * Copyright (C) 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=========================================================
+ */
package org.onap.integration.test.mocks.sniroemulator.extension;
import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java
index 12d52f4d4..e3fc286cb 100644
--- a/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java
+++ b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java
@@ -1,3 +1,22 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.integration
+ * ================================================================================
+ * Copyright (C) 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=========================================================
+ */
package org.onap.integration.test.mocks.sniroemulator.extension;
import com.github.tomakehurst.wiremock.common.Notifier;
diff --git a/test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java b/test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java
index a5911cbdb..dfaf68e4c 100644
--- a/test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java
+++ b/test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.integration
+ * ================================================================================
+ * Copyright (C) 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=========================================================
+ */
+
package org.onap.integration.test.mocks.sniroemulator;
import org.junit.Test;
@@ -10,7 +30,6 @@ import org.springframework.test.context.junit4.SpringRunner;
public class MockApplicationTests {
@Test
- public void contextLoads() {
+ public void contextLoads() {
}
-
}