Merge "Fix for Sonar blocker issues"

diff --git a/LICENSE b/LICENSE
deleted file mode 100644 (file)
index 2ce945c..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,22 +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.
- * *
- ******************************************************************************/
\ No newline at end of file

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644 (file)
index 0000000..bb235ff
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,39 @@
+/*
+* ============LICENSE_START==========================================
+* ===================================================================
+* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+* ===================================================================
+*
+* Unless otherwise specified, all software contained herein is licensed
+* under the Apache License, Version 2.0 (the “License”);
+* you may not use this software 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.
+*
+*
+*
+* Unless otherwise specified, all documentation contained herein is licensed
+* under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+* you may not use this documentation except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*             https://creativecommons.org/licenses/by/4.0/
+*
+* Unless required by applicable law or agreed to in writing, documentation
+* 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.
+*
+*/

diff --git a/bundleconfig-local/etc/appprops/MsgRtrApi.properties b/bundleconfig-local/etc/appprops/MsgRtrApi.properties
index 45532de..18a538b 100644 (file)
--- a/bundleconfig-local/etc/appprops/MsgRtrApi.properties
+++ b/bundleconfig-local/etc/appprops/MsgRtrApi.properties
@@ -37,7 +37,7 @@
 ##     Both Cambria and Kafka make use of Zookeeper.
 ##
 #config.zk.servers=172.18.1.1
-config.zk.servers=localhost
+config.zk.servers=<zookeeper_host>
 #config.zk.root=/fe3c/cambria/config
 
 

diff --git a/pom.xml b/pom.xml
index fa50fae..f2df084 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,12 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>0.1.1</version>
        </parent>
        
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.0.1-SNAPSHOT</version>
+       <version>1.0.2-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
         <licenses>
@@ -55,9 +55,20 @@
           </developer>
         </developers>
        
-
        <build>
                <plugins>
+               <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <version>3.6</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.apache.maven.wagon</groupId>
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                                               <version>2.10</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
                        <plugin>
                                                <groupId>org.apache.maven.plugins</groupId>
                                                <artifactId>maven-antrun-plugin</artifactId>
@@ -442,12 +453,18 @@
        
                <testRouteOffer>workstation</testRouteOffer>
                <testEnv>DEV</testEnv>
-               <dmaapImg>1.0.1-SNAPSHOT</dmaapImg>
+               <dmaapImg>1.0.2-SNAPSHOT</dmaapImg>
                <camel.version>2.15.5</camel.version>
+               <sitePath>/content/sites/site/org/onap/dmaap/${project.artifactId}/${project.version}</sitePath>
        </properties>
 
        <!-- Distribution management -->
-
+       <distributionManagement>
+               <site>
+                       <id>ecomp-site</id>
+                       <url>dav:${nexusproxy}${sitePath}</url>
+               </site>
+       </distributionManagement>
 
        <!-- End Distribution management -->
 
@@ -495,9 +512,9 @@
                        <version>1.3.2</version>
                </dependency>
                <dependency>
-                         <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
+                         <groupId>com.att.nsa</groupId>
                          <artifactId>msgrtr</artifactId>
-                         <version>1.0.0</version>
+                         <version>0.0.5</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>

diff --git a/src/main/resources/docker-compose/Dockerfile b/src/main/resources/docker-compose/Dockerfile
index 0649fcc..71943d6 100644 (file)
--- a/src/main/resources/docker-compose/Dockerfile
+++ b/src/main/resources/docker-compose/Dockerfile
@@ -6,7 +6,8 @@ RUN apk add --update unzip wget curl docker jq coreutils
 
 ENV KAFKA_VERSION="0.8.1.1" SCALA_VERSION="2.9.2"
 ADD download-kafka.sh /tmp/download-kafka.sh
-RUN chmod a+x /tmp/download-kafka.sh && /tmp/download-kafka.sh && tar xfz /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt && rm /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz
+RUN chmod a+x /tmp/download-kafka.sh; sync;
+RUN /tmp/download-kafka.sh && tar xfz /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt && rm /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz
 
 VOLUME ["/kafka"]