address clm-security issues 25/33625/1
authorVijay VK <vv770d@att.com>
Thu, 1 Mar 2018 15:16:47 +0000 (15:16 +0000)
committerVENKATESH KUMAR <vv770d@att.com>
Thu, 1 Mar 2018 15:25:40 +0000 (10:25 -0500)
Change-Id: I7bfd3583b16c5f2b914a9b5f3cca2d3a07614895
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-360

pom.xml
src/main/java/org/onap/dcae/commonFunction/EventPublisherHash.java

diff --git a/pom.xml b/pom.xml
index 7d5746b..af798f7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
-<!--
-================================================================================
-Copyright (c) 2017-2018 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.
--->
-<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>
-       <parent>
-               <groupId>org.onap.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>0.1.1</version>
-               <relativePath />
-       </parent>
-       <groupId>org.onap.dcaegen2.collectors.ves</groupId>
-       <artifactId>VESCollector</artifactId>
-       <version>1.2.0-SNAPSHOT</version>
-       <name>dcaegen2-collectors-ves</name>
-       <description>VESCollector</description>
-
-       <properties>
-               <compiler.source.version>1.7</compiler.source.version>
-               <compiler.target.version>1.7</compiler.target.version>
-               <main.basedir>${project.basedir}</main.basedir>
-               <compiler.plugin.version>3.3</compiler.plugin.version>
-               <jar.plugin.version>2.4</jar.plugin.version>
-               <deploy.plugin.version>2.8</deploy.plugin.version>
-               <source.plugin.version>2.4</source.plugin.version>
-               <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
-
-               <!--TEST SETTINGS -->
-               <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
-
-               <!--PLUGIN SETTINGS -->
-
-               <dependency.locations.enabled>false</dependency.locations.enabled>
-               <!-- <maven.test.skip>true</maven.test.skip> -->
-
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <snapshots.path>content/repositories/snapshots/</snapshots.path>
-               <releases.path>content/repositories/releases/</releases.path>
-               <site.path>content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}</site.path>
-       </properties>
-
-       <pluginRepositories>
-               <!-- Black Duck plugin dependencies -->
-               <pluginRepository>
-                       <id>JCenter</id>
-                       <name>JCenter Repository</name>
-                       <url>http://jcenter.bintray.com</url>
-               </pluginRepository>
-
-               <pluginRepository>
-                       <id>Restlet</id>
-                       <name>Restlet Repository</name>
-                       <url>http://maven.restlet.com</url>
-               </pluginRepository>
-       </pluginRepositories>
-
-       <dependencies>
-
-               <!-- JSON libraries -->
-               <dependency>
-                       <groupId>com.googlecode.json-simple</groupId>
-                       <artifactId>json-simple</artifactId>
-                       <version>1.1.1</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>18.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.github.fge</groupId>
-                       <artifactId>json-schema-validator</artifactId>
-                       <version>2.2.6</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.3.1</version>
-               </dependency>
-
-               <!-- NSA server library -->
-               <dependency>
-                       <groupId>com.att.nsa</groupId>
-                       <artifactId>nsaServerLibrary</artifactId>
-                       <version>1.0.10</version>
-               </dependency>
-
-               <!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>saToolkit</artifactId> 
-                       <version>1.1.3</version> </dependency> -->
-
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-                       <version>1.7.21</version>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>apache-log4j-extras</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
-
-
-               <!-- https://mvnrepository.com/artifact/org.json/json -->
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20160810</version>
-               </dependency>
-
-       <!-- https://mvnrepository.com/artifact/com.github.fge/jackson-coreutils -->
-
-
-               <dependency>
-                       <groupId>commons-configuration</groupId>
-                       <artifactId>commons-configuration</artifactId>
-                       <version>1.10</version>
-               </dependency>
-
-       </dependencies>
-
-
-       <repositories>
-               <repository>
-                       <id>external-repository</id>
-                       <url>https://oss.sonatype.org/content/repositories</url>
-               </repository>
-       </repositories>
-
-
-       <build>
-               <pluginManagement>
-                       <plugins>
-
-                               <!-- COMPILER PLUGIN -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>${compiler.plugin.version}</version>
-                                       <configuration>
-                                               <source>${compiler.target.version}</source>
-                                               <target>${compiler.source.version}</target>
-                                       </configuration>
-                               </plugin>
-
-                               <!-- MAVEN SOURCE PLUGIN -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>${source.plugin.version}</version>
-                                       <configuration>
-                                               <excludeResources>true</excludeResources>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>attach-sources</id>
-                                                       <phase>verify</phase>
-                                                       <goals>
-                                                               <goal>jar-no-fork</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
-                               <!-- JAR PLUGIN -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <version>${jar.plugin.version}</version>
-                                       <configuration>
-                                               <archive>
-                                                       <manifest>
-                                                               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                                       </manifest>
-                                                       <manifestEntries>
-                                                               <Implementation-Build-Version>${project.version}</Implementation-Build-Version>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
-
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.4.1</version>
-                                       <configuration>
-                                               <descriptors>
-                                                       <descriptor>src/assembly/dep.xml</descriptor>
-                                               </descriptors>
-                                       </configuration>
-
-                                       <executions>
-                                               <execution>
-                                                       <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                                                       <phase>package</phase> <!-- bind to the packaging phase -->
-                                                       <goals>
-                                                               <goal>single</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
-                               <!-- MAVEN JAVADOC PLUGIN -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>${javadoc.plugin.version}</version>
-                                       <configuration>
-                                               <!-- minimize console output messages -->
-                                               <quiet>true</quiet>
-                                               <verbose>false</verbose>
-                                               <useStandardDocletOptions>false</useStandardDocletOptions>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>aggregate</id>
-                                                       <phase>site</phase>
-                                                       <goals>
-                                                               <goal>aggregate</goal>
-                                                       </goals>
-                                               </execution>
-                                               <execution>
-                                                       <id>attach-javadoc</id>
-                                                       <goals>
-                                                               <goal>jar</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-
-                               <plugin>
-                                       <groupId>org.codehaus.mojo</groupId>
-                                       <artifactId>exec-maven-plugin</artifactId>
-                                       <version>1.2.1</version>
-                                       <configuration>
-                                               <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
-                                               <environmentVariables>
-                                                       <!-- make mvn properties as env for our script -->
-                                                       <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
-                                                       <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
-                                                       <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
-                                                       <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
-                                                       <MVN_RAWREPO_BASEURL_UPLOAD>${onap.nexus.rawrepo.baseurl.upload}</MVN_RAWREPO_BASEURL_UPLOAD>
-                                                       <MVN_RAWREPO_BASEURL_DOWNLOAD>${onap.nexus.rawrepo.baseurl.download}</MVN_RAWREPO_BASEURL_DOWNLOAD>
-                                                       <MVN_RAWREPO_SERVERID>${onap.nexus.rawrepo.serverid}</MVN_RAWREPO_SERVERID>
-                                                       <MVN_DOCKERREGISTRY_DAILY>${onap.nexus.dockerregistry.daily}</MVN_DOCKERREGISTRY_DAILY>
-                                                       <MVN_DOCKERREGISTRY_RELEASE>${onap.nexus.dockerregistry.release}</MVN_DOCKERREGISTRY_RELEASE>
-                                               </environmentVariables>
-                                       </configuration>
-                               </plugin>
-
-                       </plugins>
-               </pluginManagement>
-               <plugins>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                       </plugin>
-
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                       </plugin>
-
-
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>exec-maven-plugin</artifactId>
-                               <version>1.2.1</version>
-                               <executions>
-                                       <execution>
-                                               <id>deploy script</id>
-                                               <phase>deploy</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <arguments>
-                                                               <argument>__</argument>
-                                                               <argument>deploy</argument>
-                                                       </arguments>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>install script</id>
-                                               <phase>install</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <arguments>
-                                                               <argument>__</argument>
-                                                               <argument>install</argument>
-                                                       </arguments>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-               </plugins>
-
-       </build>
-
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                               <version>2.6</version>
-                               <reportSets>
-                                       <reportSet>
-                                               <reports>
-                                                       <report>dependencies</report>
-                                                       <report>license</report>
-                                               </reports>
-                                       </reportSet>
-                               </reportSets>
-
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.10.4</version>
-                               <configuration>
-                                       <failOnError>false</failOnError>
-                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-                                       <docletArtifact>
-                                               <groupId>org.umlgraph</groupId>
-                                               <artifactId>umlgraph</artifactId>
-                                               <version>5.6</version>
-                                       </docletArtifact>
-                                       <additionalparam>-views</additionalparam>
-                                       <useStandardDocletOptions>true</useStandardDocletOptions>
-                               </configuration>
-                       </plugin>
-
-               </plugins>
-       </reporting>
-
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>com.github.fge</groupId>
-                               <artifactId>json-schema-core</artifactId>
-                               <version>1.2.5</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>javax.mail</groupId>
-                               <artifactId>mail</artifactId>
-                               <version>1.4.7</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-</project>
-
+<!--\r
+================================================================================\r
+Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+================================================================================\r
+Licensed under the Apache License, Version 2.0 (the "License");\r
+you may not use this file except in compliance with the License.\r
+You may obtain a copy of the License at\r
+\r
+    http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+Unless required by applicable law or agreed to in writing, software\r
+distributed under the License is distributed on an "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+See the License for the specific language governing permissions and\r
+limitations under the License.\r
+============LICENSE_END=========================================================\r
+\r
+ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+-->\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <parent>\r
+               <groupId>org.onap.oparent</groupId>\r
+               <artifactId>oparent</artifactId>\r
+               <version>0.1.1</version>\r
+               <relativePath />\r
+       </parent>\r
+       <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
+       <artifactId>VESCollector</artifactId>\r
+       <version>1.2.0-SNAPSHOT</version>\r
+       <name>dcaegen2-collectors-ves</name>\r
+       <description>VESCollector</description>\r
+\r
+       <properties>\r
+               <compiler.source.version>1.7</compiler.source.version>\r
+               <compiler.target.version>1.7</compiler.target.version>\r
+               <main.basedir>${project.basedir}</main.basedir>\r
+               <compiler.plugin.version>3.3</compiler.plugin.version>\r
+               <jar.plugin.version>2.4</jar.plugin.version>\r
+               <deploy.plugin.version>2.8</deploy.plugin.version>\r
+               <source.plugin.version>2.4</source.plugin.version>\r
+               <javadoc.plugin.version>2.10.4</javadoc.plugin.version>\r
+\r
+               <!--TEST SETTINGS -->\r
+               <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>\r
+\r
+               <!--PLUGIN SETTINGS -->\r
+\r
+               <dependency.locations.enabled>false</dependency.locations.enabled>\r
+               <!-- <maven.test.skip>true</maven.test.skip> -->\r
+\r
+               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <snapshots.path>content/repositories/snapshots/</snapshots.path>\r
+               <releases.path>content/repositories/releases/</releases.path>\r
+               <site.path>content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}</site.path>\r
+       </properties>\r
+\r
+       <pluginRepositories>\r
+               <!-- Black Duck plugin dependencies -->\r
+               <pluginRepository>\r
+                       <id>JCenter</id>\r
+                       <name>JCenter Repository</name>\r
+                       <url>http://jcenter.bintray.com</url>\r
+               </pluginRepository>\r
+\r
+               <pluginRepository>\r
+                       <id>Restlet</id>\r
+                       <name>Restlet Repository</name>\r
+                       <url>http://maven.restlet.com</url>\r
+               </pluginRepository>\r
+       </pluginRepositories>\r
+\r
+       <dependencies>\r
+\r
+               <!-- JSON libraries -->\r
+               <dependency>\r
+                       <groupId>com.googlecode.json-simple</groupId>\r
+                       <artifactId>json-simple</artifactId>\r
+                       <version>1.1.1</version>\r
+               </dependency>\r
+\r
+               <dependency>\r
+                       <groupId>com.google.guava</groupId>\r
+                       <artifactId>guava</artifactId>\r
+                       <version>18.0</version>\r
+               </dependency>\r
+\r
+               <dependency>\r
+                       <groupId>com.github.fge</groupId>\r
+                       <artifactId>json-schema-validator</artifactId>\r
+                       <version>2.2.6</version>\r
+\r
+               </dependency>\r
+\r
+               <dependency>\r
+                       <groupId>com.google.code.gson</groupId>\r
+                       <artifactId>gson</artifactId>\r
+                       <version>2.3.1</version>\r
+               </dependency>\r
+\r
+               <!-- NSA server library -->\r
+               <dependency>\r
+                       <groupId>com.att.nsa</groupId>\r
+                       <artifactId>nsaServerLibrary</artifactId>\r
+                       <version>1.0.10</version>\r
+               </dependency>\r
+\r
+               <!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>saToolkit</artifactId> \r
+                       <version>1.1.3</version> </dependency> -->\r
+\r
+               <dependency>\r
+                       <groupId>org.slf4j</groupId>\r
+                       <artifactId>slf4j-log4j12</artifactId>\r
+                       <version>1.7.21</version>\r
+               </dependency>\r
+               <dependency>\r
+                       <groupId>log4j</groupId>\r
+                       <artifactId>apache-log4j-extras</artifactId>\r
+                       <version>1.2.17</version>\r
+               </dependency>\r
+\r
+\r
+               <!-- https://mvnrepository.com/artifact/org.json/json -->\r
+               <dependency>\r
+                       <groupId>org.json</groupId>\r
+                       <artifactId>json</artifactId>\r
+                       <version>20160810</version>\r
+               </dependency>\r
+\r
+       <!-- https://mvnrepository.com/artifact/com.github.fge/jackson-coreutils -->\r
+\r
+\r
+               <dependency>\r
+                       <groupId>commons-configuration</groupId>\r
+                       <artifactId>commons-configuration</artifactId>\r
+                       <version>1.10</version>\r
+               </dependency>\r
+\r
+       </dependencies>\r
+\r
+\r
+       <repositories>\r
+               <repository>\r
+                       <id>external-repository</id>\r
+                       <url>https://oss.sonatype.org/content/repositories</url>\r
+               </repository>\r
+       </repositories>\r
+\r
+\r
+       <build>\r
+               <pluginManagement>\r
+                       <plugins>\r
+\r
+                               <!-- COMPILER PLUGIN -->\r
+                               <plugin>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-compiler-plugin</artifactId>\r
+                                       <version>${compiler.plugin.version}</version>\r
+                                       <configuration>\r
+                                               <source>${compiler.target.version}</source>\r
+                                               <target>${compiler.source.version}</target>\r
+                                       </configuration>\r
+                               </plugin>\r
+\r
+                               <!-- MAVEN SOURCE PLUGIN -->\r
+                               <plugin>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-source-plugin</artifactId>\r
+                                       <version>${source.plugin.version}</version>\r
+                                       <configuration>\r
+                                               <excludeResources>true</excludeResources>\r
+                                       </configuration>\r
+                                       <executions>\r
+                                               <execution>\r
+                                                       <id>attach-sources</id>\r
+                                                       <phase>verify</phase>\r
+                                                       <goals>\r
+                                                               <goal>jar-no-fork</goal>\r
+                                                       </goals>\r
+                                               </execution>\r
+                                       </executions>\r
+                               </plugin>\r
+\r
+                               <!-- JAR PLUGIN -->\r
+                               <plugin>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-jar-plugin</artifactId>\r
+                                       <version>${jar.plugin.version}</version>\r
+                                       <configuration>\r
+                                               <archive>\r
+                                                       <manifest>\r
+                                                               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>\r
+                                                       </manifest>\r
+                                                       <manifestEntries>\r
+                                                               <Implementation-Build-Version>${project.version}</Implementation-Build-Version>\r
+                                                       </manifestEntries>\r
+                                               </archive>\r
+                                       </configuration>\r
+                               </plugin>\r
+\r
+                               <plugin>\r
+                                       <artifactId>maven-assembly-plugin</artifactId>\r
+                                       <version>2.4.1</version>\r
+                                       <configuration>\r
+                                               <descriptors>\r
+                                                       <descriptor>src/assembly/dep.xml</descriptor>\r
+                                               </descriptors>\r
+                                       </configuration>\r
+\r
+                                       <executions>\r
+                                               <execution>\r
+                                                       <id>make-assembly</id> <!-- this is used for inheritance merges -->\r
+                                                       <phase>package</phase> <!-- bind to the packaging phase -->\r
+                                                       <goals>\r
+                                                               <goal>single</goal>\r
+                                                       </goals>\r
+                                               </execution>\r
+                                       </executions>\r
+                               </plugin>\r
+\r
+                               <!-- MAVEN JAVADOC PLUGIN -->\r
+                               <plugin>\r
+                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                       <artifactId>maven-javadoc-plugin</artifactId>\r
+                                       <version>${javadoc.plugin.version}</version>\r
+                                       <configuration>\r
+                                               <!-- minimize console output messages -->\r
+                                               <quiet>true</quiet>\r
+                                               <verbose>false</verbose>\r
+                                               <useStandardDocletOptions>false</useStandardDocletOptions>\r
+                                       </configuration>\r
+                                       <executions>\r
+                                               <execution>\r
+                                                       <id>aggregate</id>\r
+                                                       <phase>site</phase>\r
+                                                       <goals>\r
+                                                               <goal>aggregate</goal>\r
+                                                       </goals>\r
+                                               </execution>\r
+                                               <execution>\r
+                                                       <id>attach-javadoc</id>\r
+                                                       <goals>\r
+                                                               <goal>jar</goal>\r
+                                                       </goals>\r
+                                               </execution>\r
+                                       </executions>\r
+                               </plugin>\r
+\r
+                               <plugin>\r
+                                       <groupId>org.codehaus.mojo</groupId>\r
+                                       <artifactId>exec-maven-plugin</artifactId>\r
+                                       <version>1.2.1</version>\r
+                                       <configuration>\r
+                                               <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>\r
+                                               <environmentVariables>\r
+                                                       <!-- make mvn properties as env for our script -->\r
+                                                       <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>\r
+                                                       <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>\r
+                                                       <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>\r
+                                                       <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>\r
+                                                       <MVN_RAWREPO_BASEURL_UPLOAD>${onap.nexus.rawrepo.baseurl.upload}</MVN_RAWREPO_BASEURL_UPLOAD>\r
+                                                       <MVN_RAWREPO_BASEURL_DOWNLOAD>${onap.nexus.rawrepo.baseurl.download}</MVN_RAWREPO_BASEURL_DOWNLOAD>\r
+                                                       <MVN_RAWREPO_SERVERID>${onap.nexus.rawrepo.serverid}</MVN_RAWREPO_SERVERID>\r
+                                                       <MVN_DOCKERREGISTRY_DAILY>${onap.nexus.dockerregistry.daily}</MVN_DOCKERREGISTRY_DAILY>\r
+                                                       <MVN_DOCKERREGISTRY_RELEASE>${onap.nexus.dockerregistry.release}</MVN_DOCKERREGISTRY_RELEASE>\r
+                                               </environmentVariables>\r
+                                       </configuration>\r
+                               </plugin>\r
+\r
+                       </plugins>\r
+               </pluginManagement>\r
+               <plugins>\r
+\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-compiler-plugin</artifactId>\r
+                       </plugin>\r
+\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-jar-plugin</artifactId>\r
+                       </plugin>\r
+\r
+\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-source-plugin</artifactId>\r
+                       </plugin>\r
+\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-javadoc-plugin</artifactId>\r
+                       </plugin>\r
+\r
+                       <plugin>\r
+                               <artifactId>maven-assembly-plugin</artifactId>\r
+                       </plugin>\r
+\r
+\r
+                       <plugin>\r
+                               <groupId>org.codehaus.mojo</groupId>\r
+                               <artifactId>exec-maven-plugin</artifactId>\r
+                               <version>1.2.1</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>deploy script</id>\r
+                                               <phase>deploy</phase>\r
+                                               <goals>\r
+                                                       <goal>exec</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <arguments>\r
+                                                               <argument>__</argument>\r
+                                                               <argument>deploy</argument>\r
+                                                       </arguments>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>install script</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>exec</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <arguments>\r
+                                                               <argument>__</argument>\r
+                                                               <argument>install</argument>\r
+                                                       </arguments>\r
+                                               </configuration>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+\r
+               </plugins>\r
+\r
+       </build>\r
+\r
+       <reporting>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-project-info-reports-plugin</artifactId>\r
+                               <version>2.6</version>\r
+                               <reportSets>\r
+                                       <reportSet>\r
+                                               <reports>\r
+                                                       <report>dependencies</report>\r
+                                                       <report>license</report>\r
+                                               </reports>\r
+                                       </reportSet>\r
+                               </reportSets>\r
+\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-javadoc-plugin</artifactId>\r
+                               <version>2.10.4</version>\r
+                               <configuration>\r
+                                       <failOnError>false</failOnError>\r
+                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>\r
+                                       <docletArtifact>\r
+                                               <groupId>org.umlgraph</groupId>\r
+                                               <artifactId>umlgraph</artifactId>\r
+                                               <version>5.6</version>\r
+                                       </docletArtifact>\r
+                                       <additionalparam>-views</additionalparam>\r
+                                       <useStandardDocletOptions>true</useStandardDocletOptions>\r
+                               </configuration>\r
+                       </plugin>\r
+\r
+               </plugins>\r
+       </reporting>\r
+\r
+\r
+       <dependencyManagement>\r
+               <dependencies>\r
+                       <dependency>\r
+                               <groupId>com.github.fge</groupId>\r
+                               <artifactId>json-schema-core</artifactId>\r
+                               <version>1.2.5</version>\r
+                       </dependency>\r
+                       <dependency>\r
+                               <groupId>javax.mail</groupId>\r
+                               <artifactId>mail</artifactId>\r
+                               <version>1.4.7</version>\r
+                       </dependency>\r
+                       <dependency>\r
+                               <groupId>commons-collections</groupId>\r
+                               <artifactId>commons-collections</artifactId>\r
+                               <version>3.2.2</version>\r
+                       </dependency>\r
+                       <dependency>\r
+                               <groupId>org.apache.httpcomponents</groupId>\r
+                               <artifactId>httpclient</artifactId>\r
+                               <version>4.5.3</version>\r
+                       </dependency>\r
+                       <dependency>\r
+                               <groupId>com.fasterxml.jackson.core</groupId>\r
+                               <artifactId>jackson-core</artifactId>\r
+                               <version>2.8.10</version>\r
+                       </dependency>\r
+               </dependencies>\r
+       </dependencyManagement>\r
+</project>\r
+\r
index f8bdcaa..4922141 100644 (file)
@@ -84,7 +84,7 @@ public class EventPublisherHash {
                        }
                        
                        
-                       if (authuser != null) {
+                       if ((authuser != null)  &&  (authpwd != null)) {
                                log.debug(String.format("URL:%sTOPIC:%sAuthUser:%sAuthpwd:%s", ueburl, topic, authuser, authpwd));
                                pub = new CambriaClientBuilders.PublisherBuilder().usingHosts(ueburl).onTopic(topic).usingHttps()
                                                .authenticatedByHttp(authuser, authpwd).logSendFailuresAfter(5)