diff options
author | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2019-07-11 14:38:17 +0200 |
---|---|---|
committer | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2019-07-11 14:44:51 +0200 |
commit | 7ac43b18452de244a3e5291f2f08300eaeddafa5 (patch) | |
tree | fbf285cb48e53be57e37b081afbbb6e1fe9c41e0 | |
parent | 786fdeaa0d83aeb012622c1e644a0a9ca0e7c1b0 (diff) |
migrating to oparent 2.0
Issue-ID: SDC-2437
Change-Id: I9789d13b3927e9d0a1b96e123a98f4454cf985aa
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
-rw-r--r-- | .gitreview | 2 | ||||
-rw-r--r-- | checkstyle-suppressions.xml | 39 | ||||
-rw-r--r-- | pom.xml | 38 | ||||
-rw-r--r-- | src/main/java/org/onap/sdc/dcae/FeApp.java | 20 | ||||
-rw-r--r-- | src/main/java/org/onap/sdc/dcae/controller/health/HealthController.java | 20 | ||||
-rw-r--r-- | src/main/java/org/onap/sdc/dcae/controller/proxy/DcaeProxy.java | 20 | ||||
-rw-r--r-- | src/main/webapp/WEB-INF/jetty-web.xml | 20 | ||||
-rw-r--r-- | src/main/webapp/WEB-INF/web.xml | 20 | ||||
-rw-r--r-- | src/test/org/onap/sdc/dcae/controller/proxy/DcaeProxyTest.java | 20 |
9 files changed, 190 insertions, 9 deletions
@@ -1,4 +1,4 @@ [gerrit] host=gerrit.onap.org port=29418 -project=sdc/jtosca.git +project=sdc/dcae-d/fe.git diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml new file mode 100644 index 0000000..cf2859d --- /dev/null +++ b/checkstyle-suppressions.xml @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<!-- + ============LICENSE_START======================================================= + SDC + ================================================================================ + Copyright (C) 2019 Nokia. 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========================================================= + --> + +<!DOCTYPE suppressions PUBLIC + "-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN" + "https://checkstyle.org/dtds/suppressions_1_0.dtd"> + +<suppressions> + <suppress checks=".*" files="\.java" lines="1-20"/> + <suppress checks=".*" files="\.properties"/> + <suppress checks="javadoc" files="\.java"/> + <suppress checks="LineLength" files="\.java"/> + <suppress checks="HiddenField" files="\.java"/> + <suppress checks="FinalClass" files="\.java"/> + <suppress checks="FinalParameters" files="\.java"/> + <suppress checks="AvoidInlineConditionals" files="\.java"/> + <suppress checks="DesignForExtension" files="\.java"/> + <suppress checks="ImportOrder" files="\.java"/> + <suppress checks="LocalVariableName" files="\.java"/> + <suppress checks="AbbreviationAsWordInName" files="\.java"/> +</suppressions> @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.sdc.dcae-d.fe</groupId> <artifactId>dcae_fe</artifactId> @@ -9,11 +9,10 @@ <description>DCAE FE</description> <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>1.5.9.RELEASE</version> - <relativePath /> - <!-- lookup parent from repository --> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> + <relativePath/> </parent> <properties> @@ -24,7 +23,22 @@ <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath> <sonar.branch>${project.version}</sonar.branch> <sonar.coverage.exclusions>**</sonar.coverage.exclusions> + <spring.boot.version>1.5.9.RELEASE</spring.boot.version> + <jetty.version>9.4.7.v20170914</jetty.version> </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring.boot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -92,6 +106,14 @@ <!-- CLEAN --> <plugins> <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <configuration> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> + </configuration> + </plugin> + <plugin> <artifactId>maven-clean-plugin</artifactId> <executions> <execution> @@ -417,4 +439,4 @@ <url>dav:${nexus.proxy}${sitePath}</url> </site> </distributionManagement> -</project> +</project>
\ No newline at end of file diff --git a/src/main/java/org/onap/sdc/dcae/FeApp.java b/src/main/java/org/onap/sdc/dcae/FeApp.java index 01d757c..3502d3c 100644 --- a/src/main/java/org/onap/sdc/dcae/FeApp.java +++ b/src/main/java/org/onap/sdc/dcae/FeApp.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 - 2019 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.sdc.dcae; import org.onap.sdc.dcae.controller.proxy.DcaeProxy; diff --git a/src/main/java/org/onap/sdc/dcae/controller/health/HealthController.java b/src/main/java/org/onap/sdc/dcae/controller/health/HealthController.java index 1ddec2d..812f1d7 100644 --- a/src/main/java/org/onap/sdc/dcae/controller/health/HealthController.java +++ b/src/main/java/org/onap/sdc/dcae/controller/health/HealthController.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 - 2019 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.sdc.dcae.controller.health; import java.util.ArrayList; diff --git a/src/main/java/org/onap/sdc/dcae/controller/proxy/DcaeProxy.java b/src/main/java/org/onap/sdc/dcae/controller/proxy/DcaeProxy.java index bfacd09..c3cad66 100644 --- a/src/main/java/org/onap/sdc/dcae/controller/proxy/DcaeProxy.java +++ b/src/main/java/org/onap/sdc/dcae/controller/proxy/DcaeProxy.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 - 2019 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.sdc.dcae.controller.proxy; import com.google.common.cache.Cache; diff --git a/src/main/webapp/WEB-INF/jetty-web.xml b/src/main/webapp/WEB-INF/jetty-web.xml index cf7e303..3447994 100644 --- a/src/main/webapp/WEB-INF/jetty-web.xml +++ b/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================= + SDC + ================================================================================ + Copyright (C) 2017 - 2019 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========================================================= + --> + <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8ba3dc1..7fcc981 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ============LICENSE_START======================================================= + SDC + ================================================================================ + Copyright (C) 2017 - 2019 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========================================================= + --> + <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" diff --git a/src/test/org/onap/sdc/dcae/controller/proxy/DcaeProxyTest.java b/src/test/org/onap/sdc/dcae/controller/proxy/DcaeProxyTest.java index 13b9c78..cb00481 100644 --- a/src/test/org/onap/sdc/dcae/controller/proxy/DcaeProxyTest.java +++ b/src/test/org/onap/sdc/dcae/controller/proxy/DcaeProxyTest.java @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 - 2019 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.sdc.dcae.controller.proxy; import org.junit.Test; |