diff options
author | BOSLET, CORY <cory.boslet@att.com> | 2021-03-09 22:57:29 -0500 |
---|---|---|
committer | AT&T Open Source <g22940@att.com> | 2021-03-09 22:57:29 -0500 |
commit | 8aca451301378942e4c942be202d0bfd2313af93 (patch) | |
tree | af06b25e1120b1f01c6ec5661efa8c9b4648e930 /adapters | |
parent | 1d316a3c50f978313eca360c1a1636de68afee9d (diff) |
version upgrades plus cleanup
Removed over 125 dependencies and added to dependency management
Added in a few dependencies and removed some
Change the swagger version to so pom
Removed version property reference in the pom
Added in missing dependency for bpmn blocks
Added in missing dependecy for common bpmn
Updated the camunda-bpm-assert to use a version that is compatible with
assertj-core 3.11. The camunda-bpm-assert namespace group also changed.
This fixes the no method found error. Updated unit test to account for
class name change
Updated the unit test to account for lib change
Fixed unit test for software upgrade stuff
Exclude older versions of javassist to fix null pointer caused by
incompatible javassist version with hibernate and bowman
Added in missing dependency for task test
Added missing dependency and fixed formatting
Remove files that got added back in by merge conflict
Use the new namespace for the swagger annotations
Need to exclude swagger annoatations from the old namespace
Updated to fix compilation error due to use of legacy swagger and cxf
swagger
Use the swagger v3 plugin for gen resources
Use the openapi v3 swagger in all bpmn packages
Fix null pointer to create the OpenApiFeature in cxf
Issue-ID: SO-3578
Signed-off-by: AT&T Open Source <g22940@att.com>
Change-Id: I7093376b2d8271e9c5b911b901133e01b957da84
Diffstat (limited to 'adapters')
-rw-r--r-- | adapters/mso-adapter-utils/pom.xml | 4 | ||||
-rw-r--r-- | adapters/mso-adapters-rest-interface/pom.xml | 2 | ||||
-rw-r--r-- | adapters/mso-catalog-db-adapter/pom.xml | 38 | ||||
-rw-r--r-- | adapters/mso-openstack-adapters/pom.xml | 4 | ||||
-rw-r--r-- | adapters/mso-requests-db-adapter/pom.xml | 29 | ||||
-rw-r--r-- | adapters/mso-sdnc-adapter/pom.xml | 2 | ||||
-rw-r--r-- | adapters/so-appc-orchestrator/pom.xml | 4 |
7 files changed, 3 insertions, 80 deletions
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index 3057b47ebd..f7d16b20da 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -10,7 +10,6 @@ <artifactId>mso-adapter-utils</artifactId> <name>mso-adapter-utils</name> <description>Common MSO utilities, including Openstack client wrappers.</description> - <dependencyManagement> <dependencies> <dependency> @@ -27,7 +26,6 @@ <finalName>${project.artifactId}</finalName> <sourceDirectory>src/main/java</sourceDirectory> <plugins> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -75,7 +73,6 @@ </plugin> </plugins> </build> - <dependencies> <dependency> <groupId>org.glassfish.jersey.core</groupId> @@ -84,7 +81,6 @@ <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> <artifactId>mariaDB4j</artifactId> - <version>2.3.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 015efd2c4b..5e589b885f 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -18,8 +18,6 @@ <plugins> <plugin> <artifactId>maven-jar-plugin</artifactId> - <!--<version>2.6</version>--> - <version>3.0.2</version> <configuration> <classesDirectory>target/classes</classesDirectory> </configuration> diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 7ba222a86a..89ef373348 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -6,21 +6,18 @@ <artifactId>adapters</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> - <groupId>org.onap.so.adapters</groupId> <artifactId>mso-catalog-db-adapter</artifactId> <packaging>jar</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <swagger.version>2.0.8</swagger.version> </properties> <build> <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${springboot.version}</version> <configuration> <mainClass>org.onap.so.adapters.catalogdb.CatalogDBApplication</mainClass> </configuration> @@ -120,33 +117,8 @@ </dependencyManagement> <dependencies> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.9.9</version> - </dependency> - - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</artifactId> - <version>${swagger.version}</version> - </dependency> - <dependency> <groupId>io.swagger.core.v3</groupId> <artifactId>swagger-jaxrs2</artifactId> - <version>2.0.6</version> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -173,11 +145,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>uk.co.blackpepper.bowman</groupId> - <artifactId>bowman-client</artifactId> - <version>${bowman.client.version}</version> - </dependency> - <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.25.0-GA</version> @@ -185,7 +152,6 @@ <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> <artifactId>mariaDB4j</artifactId> - <version>2.3.0</version> <scope>test</scope> </dependency> <dependency> @@ -194,10 +160,6 @@ </dependency> <dependency> <groupId>io.micrometer</groupId> - <artifactId>micrometer-core</artifactId> - </dependency> - <dependency> - <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> </dependency> </dependencies> diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index e975425852..32448d31dc 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -160,7 +160,6 @@ <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> - <version>2.5.15</version> </dependency> <dependency> <groupId>org.pacesys.openstack4j.connectors</groupId> @@ -224,13 +223,11 @@ <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> <artifactId>mariaDB4j</artifactId> - <version>2.3.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-contract-wiremock</artifactId> - <version>1.2.4.RELEASE</version> <scope>test</scope> </dependency> <dependency> @@ -246,7 +243,6 @@ <dependency> <groupId>org.camunda.bpm</groupId> <artifactId>camunda-external-task-client</artifactId> - <version>1.4.0</version> </dependency> <dependency> <groupId>com.github.seancfoley</groupId> diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index a488558610..09e2cc26d7 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -6,19 +6,10 @@ <artifactId>adapters</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> - <groupId>org.onap.so.adapters</groupId> <artifactId>mso-requests-db-adapter</artifactId> <dependencies> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> - </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-spring-boot-starter-jaxws</artifactId> </dependency> @@ -41,11 +32,6 @@ </dependency> <dependency> <groupId>org.onap.so</groupId> - <artifactId>mso-requests-db</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.so</groupId> <artifactId>mso-requests-db-repositories</artifactId> <version>${project.version}</version> </dependency> @@ -63,7 +49,6 @@ <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> <artifactId>mariaDB4j</artifactId> - <version>2.3.0</version> <scope>test</scope> </dependency> <dependency> @@ -93,8 +78,6 @@ <artifactId>cxf-logging</artifactId> <version>${project.version}</version> </dependency> - - </dependencies> <pluginRepositories> <pluginRepository> @@ -245,15 +228,9 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId> - org.apache.cxf - </groupId> - <artifactId> - cxf-java2ws-plugin - </artifactId> - <versionRange> - [3.2.5,) - </versionRange> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-java2ws-plugin</artifactId> + <versionRange>[3.2.5,)</versionRange> <goals> <goal>java2ws</goal> </goals> diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index cad9c9fbc0..358b14e37a 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -13,7 +13,6 @@ </properties> <name>mso-sdnc-adapter</name> <description>mso sdnc adapter</description> - <build> <finalName>${project.artifactId}-${project.version}</finalName> <pluginManagement> @@ -135,7 +134,6 @@ <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jersey2-jaxrs</artifactId> - <version>1.5.16</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index f01288f1b4..2e4a4427b3 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -6,7 +6,6 @@ <artifactId>adapters</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> - <groupId>org.onap.so.adapters</groupId> <artifactId>so-appc-orchestrator</artifactId> <packaging>jar</packaging> @@ -21,7 +20,6 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${springboot.version}</version> <configuration> <mainClass>org.onap.so.adapters.appc.orchestrator.AppcOrchestratorApplication</mainClass> </configuration> @@ -153,7 +151,6 @@ <dependency> <groupId>org.camunda.bpm</groupId> <artifactId>camunda-external-task-client</artifactId> - <version>1.4.0</version> </dependency> <dependency> <groupId>org.onap.so</groupId> @@ -199,7 +196,6 @@ <dependency> <groupId>pl.pragmatists</groupId> <artifactId>JUnitParams</artifactId> - <version>1.0.5</version> <scope>test</scope> </dependency> <dependency> |