From da2fd730ddb9a21965ac77829fd2bbd50c36c43c Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 10 Jul 2019 17:21:20 -0400 Subject: Adjust sparky parent pom Issue-ID: AAI-2498 Change-Id: I559e577844d2ca87d3295c8def59aa5c4da1eb17 Signed-off-by: Jimmy Forsyth --- sparkybe-onap-application/pom.xml | 59 ++++++++++++---------- .../onap/aai/sparky/config/CamelConfiguration.java | 22 +++++++- .../config/PropertyPasswordConfiguration.java | 20 ++++++++ .../org/onap/aai/sparky/portal/PortalBean.java | 22 +++++++- 4 files changed, 94 insertions(+), 29 deletions(-) (limited to 'sparkybe-onap-application') diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index 7b9063e..f86e2a1 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 1.5.20.RELEASE + + org.onap.aai + sparky-be + 1.5.0-SNAPSHOT org.onap.aai.sparky-be @@ -27,33 +27,38 @@ ${basedir}/target sparky-be 1.5.0 - /content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version} https://nexus.onap.org - onap + 1.5.20.RELEASE + onap - - - - - org.apache.camel - camel-spring-boot-dependencies - ${camel-spring-boot.version} - pom - import - - - - ch.qos.logback - logback-classic - 1.2.3 - - - - - - + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + org.apache.camel + camel-spring-boot-dependencies + ${camel-spring-boot.version} + pom + import + + + + ch.qos.logback + logback-classic + 1.2.3 + + + + diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/CamelConfiguration.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/CamelConfiguration.java index 8f433db..702ab84 100644 --- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/CamelConfiguration.java +++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/CamelConfiguration.java @@ -1,3 +1,23 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs + * ================================================================================ + * 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.aai.sparky.config; import org.apache.camel.component.servlet.CamelHttpTransportServlet; @@ -16,4 +36,4 @@ public class CamelConfiguration { return servlet; } -} \ No newline at end of file +} diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/PropertyPasswordConfiguration.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/PropertyPasswordConfiguration.java index 3424454..3ba9f1d 100644 --- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/PropertyPasswordConfiguration.java +++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/config/PropertyPasswordConfiguration.java @@ -1,3 +1,23 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs + * ================================================================================ + * 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.aai.sparky.config; import java.util.LinkedHashMap; diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java index af8b38d..ffa2786 100644 --- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java +++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java @@ -1,3 +1,23 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs + * ================================================================================ + * 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.aai.sparky.portal; import javax.servlet.Filter; @@ -61,4 +81,4 @@ public class PortalBean { return servlet; } -} \ No newline at end of file +} -- cgit 1.2.3-korg