Code Review / dmaap / dbcapi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update css file name in conf.py
[dmaap/dbcapi.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 0667768..2eb84f5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,9 @@
   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
   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
          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.
   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.
@@ -19,8 +19,7 @@
   ============LICENSE_END============================================
   ECOMP is a trademark and service mark of AT&T Intellectual Property.
 -->
   ============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/maven-v4_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/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.dbcapi</groupId>
        <artifactId>dbcapi</artifactId>
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.dbcapi</groupId>
        <artifactId>dbcapi</artifactId>
@@ -29,8 +28,8 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-               <relativePath />
+               <version>2.1.0</version>
+               <relativePath/>
        </parent>
        <build>
                <finalName>dbcapi</finalName>
        </parent>
        <build>
                <finalName>dbcapi</finalName>
@@ -125,18 +124,15 @@
                        </plugin>
 
                        <!-- for Staging -->
                        </plugin>
 
                        <!-- for Staging -->
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ecomp-staging</serverId>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                </configuration>
-            </plugin>
 
 
+               <plugin>
+                       <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-compiler-plugin</artifactId>
+                       <version>3.8.0</version>
+                       <configuration>
+                               <release>11</release>
+                       </configuration>
+               </plugin>
 
                <!-- for Distribution Managment -->
                <plugin>
 
                <!-- for Distribution Managment -->
                <plugin>
@@ -152,6 +148,70 @@
                  </dependencies>
                </plugin>
 
                  </dependencies>
                </plugin>
 
+               <!-- prevent SNAPSHOT dependencies -->
+               <plugin>
+                       <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-enforcer-plugin</artifactId>
+                       <executions>
+                               <execution>
+                                       <id>enforce-no-snapshots</id>
+                                       <goals>
+                                               <goal>enforce</goal>
+                                       </goals>
+                                       <configuration>
+                                               <rules>
+                                                       <requireReleaseDeps>
+                                                               <message>No Snapshots Allowed!</message>
+                                                               <excludes>
+                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
+                                                               </excludes>
+                                                       </requireReleaseDeps>
+                                               </rules>
+                                               <fail>true</fail>
+                                       </configuration>
+                               </execution>
+                       </executions>
+               </plugin>
+
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.12.4</version>
+                               <configuration>
+                                       <excludes>
+                                               <!-- exclude until junits updated <exclude>**/DME2*.java</exclude> -->
+                                       </excludes>
+                                       <!-- <skipTests>true</skipTests> -->
+                               </configuration>
+                       </plugin> 
+
                </plugins>
                <pluginManagement>
                        <plugins>
                </plugins>
                <pluginManagement>
                        <plugins>
@@ -174,7 +234,7 @@
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore/>
                                                                        </action>
                                                                </pluginExecution>
                                                        </pluginExecutions>
                                                                        </action>
                                                                </pluginExecution>
                                                        </pluginExecutions>
@@ -199,7 +259,7 @@
         <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
         <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>2.1.2-SNAPSHOT</version>
+                       <version>2.1.7</version>
             <classifier>full</classifier>
         </dependency>
                <dependency>
             <classifier>full</classifier>
         </dependency>
                <dependency>
@@ -207,15 +267,6 @@
                        <artifactId>jackson-annotations</artifactId>
                        <version>${jackson.version}</version>
                </dependency>
                        <artifactId>jackson-annotations</artifactId>
                        <version>${jackson.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-<!-- for DMAAP-205, a point release on the common version
-        addresses a security issue.  Note the add notation here
-                       <version>${jackson.version}.1</version>
-  -->
-                       <version>${jackson.version}</version>
-               </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.dataformat</groupId>
                        <artifactId>jackson-dataformat-yaml</artifactId>
                <dependency>
                        <groupId>com.fasterxml.jackson.dataformat</groupId>
                        <artifactId>jackson-dataformat-yaml</artifactId>
@@ -224,12 +275,12 @@
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
-                       <version>1.2.0</version>
+                       <version>1.2.3</version>
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
-                       <version>1.2.0</version>
+                       <version>1.2.3</version>
                </dependency>
 <!-- DMAAP-656:
    - override this dependency because it utilized a third party
                </dependency>
 <!-- DMAAP-656:
    - override this dependency because it utilized a third party
@@ -302,7 +353,7 @@
                <dependency>
                        <groupId>org.postgresql</groupId>
                        <artifactId>postgresql</artifactId>
                <dependency>
                        <groupId>org.postgresql</groupId>
                        <artifactId>postgresql</artifactId>
-                       <version>9.4.1208.jre7</version>
+                       <version>42.2.5</version>
                </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
                </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
@@ -321,13 +372,43 @@
                <version>${jersey.version}</version>
                        -->
                        <artifactId>jersey-test-framework-provider-jdk-http</artifactId>
                <version>${jersey.version}</version>
                        -->
                        <artifactId>jersey-test-framework-provider-jdk-http</artifactId>
-               <version>2.22.1</version>
+               <version>2.29.1</version>
                </dependency>
                <dependency>
                <groupId>org.glassfish.jersey.inject</groupId>
                <artifactId>jersey-hk2</artifactId>
                </dependency>
                <dependency>
                <groupId>org.glassfish.jersey.inject</groupId>
                <artifactId>jersey-hk2</artifactId>
+                       <version>2.29.1</version>
+               </dependency>
+               <dependency>
+                               <!-- use 2.3.1 to avoid this issue: https://github.com/eclipse-ee4j/jaxb-ri/issues/1222 -->
+                               <groupId>javax.xml.bind</groupId>
+                               <artifactId>jaxb-api</artifactId>
+                               <version>2.3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>javax.activation</groupId>
+                       <artifactId>javax.activation-api</artifactId>
+                       <version>1.2.0</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
                </dependency>
                </dependency>
-       </dependencies>
+    <dependency>
+      <groupId>pl.pragmatists</groupId>
+      <artifactId>JUnitParams</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+<dependency>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-enforcer-plugin</artifactId>
+    <version>3.0.0-M3</version>
+</dependency>
+  </dependencies>
        <reporting>
                <plugins>
                        <plugin>
        <reporting>
                <plugins>
                        <plugin>
@@ -357,24 +438,22 @@
        <properties>
                <swagger.version>1.5.19</swagger.version>
            <jackson.version>2.9.5</jackson.version>
        <properties>
                <swagger.version>1.5.19</swagger.version>
            <jackson.version>2.9.5</jackson.version>
-               <jersey.version>2.26</jersey.version>
+               <jersey.version>2.29</jersey.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <jettyVersion>9.3.8.RC0</jettyVersion> 
-               <eelf.version>0.0.1</eelf.version>
-               <artifact.version>1.0.15-SNAPSHOT</artifact.version>
+               <jettyVersion>9.4.24.v20191120</jettyVersion>
+               <eelf.version>1.0.0</eelf.version>
+               <artifact.version>2.0.3-SNAPSHOT</artifact.version>
+               <junit.version>4.12</junit.version>
                <!-- SONAR -->
                <!-- SONAR -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
+               <sonar.language>java</sonar.language>
+               <sonar.skip>false</sonar.skip>
+               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+               <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+               <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
                <!-- for Distribution Management -->
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
                <!-- for Distribution Management -->
-               <sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}</sitePath>
+               <sitePath>/content/sites/site/org/onap/dmaap/dbcapi/${artifact.version}/${project.version}</sitePath>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
        </properties>
        <description>Data Movement as a Platform (DMaaP) Bus Controller provides a REST API for other DCAE infrastructure components to provision DMaaP resources.  A DMaaP resource is a Data Router Feed or a Message Router Topic, and their associated publishers and subscribers.</description>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
        </properties>
        <description>Data Movement as a Platform (DMaaP) Bus Controller provides a REST API for other DCAE infrastructure components to provision DMaaP resources.  A DMaaP resource is a Data Router Feed or a Message Router Topic, and their associated publishers and subscribers.</description>
Provides a northbound REST API to ONAP clients to manage DMaaP resources. This includes DMaaP components such as MR and DR, as well as provisioning of topics and feeds. Southbound, it communicates with the respective component APIs.