diff options
| author |   Benjamin, Max <max.benjamin@att.com> | 2020-05-18 16:37:51 -0400 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2020-06-18 10:53:59 -0400 |
| commit | 9868f1749ac413b5b7df287d35983bf24ce517ea (patch) | |
| tree | d0ccf620547486e4ea032976eccf71646a779023 /adapters/mso-requests-db-adapter | |
| parent | b60a09ddf1e6f42539ca58d0376196b9642d5cff (diff) | |
Prepare for java 11
final changes for java11 groovy compatibility
removed unnecessary dependencies and cleaned up poms
added missing jaxws-api dependency to pom.xml
java8 profile is now active by default in parent pom
update beans to have RemoteResource annotation
always use the compiler plugin from parent pom
Update external task timeout to longer value to hold lock
update remote resource annotation to match catalog db client
add remote resource annotation to bean for bowman
completely remove bowman from requests db client
Issue-ID: SO-2059
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: If6f0df36e8077ccd703abce9f64290daed63955b
Diffstat (limited to 'adapters/mso-requests-db-adapter')
| -rw-r--r-- | adapters/mso-requests-db-adapter/.gitignore | 1 | ||||
| -rw-r--r-- | adapters/mso-requests-db-adapter/pom.xml | 44 |
2 files changed, 41 insertions, 4 deletions
diff --git a/adapters/mso-requests-db-adapter/.gitignore b/adapters/mso-requests-db-adapter/.gitignore index ae3c172604..9920c72893 100644 --- a/adapters/mso-requests-db-adapter/.gitignore +++ b/adapters/mso-requests-db-adapter/.gitignore @@ -1 +1,2 @@ /bin/ +/.apt_generated_tests/ diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 3463642382..ba179b6717 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -108,25 +108,58 @@ <artifactId>cxf-logging</artifactId> <version>${project.version}</version> </dependency> - </dependencies> + + </dependencies> + <pluginRepositories> + <pluginRepository> + <id>apache.snapshots</id> + <name>Maven Plugin Snapshots</name> + <url>http://repository.apache.org/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> <plugin> <groupId>org.apache.cxf</groupId> <artifactId>cxf-java2ws-plugin</artifactId> - <version>${cxf.version}</version> + <version>3.3.3</version> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> + <version>3.3.3</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-simple</artifactId> - <version>${cxf.version}</version> + <version>3.3.3</version> + </dependency> + + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-ri</artifactId> + <version>2.3.0</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.4.0-b180725.0427</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.4.0-b180725.0644</version> </dependency> </dependencies> <executions> @@ -137,6 +170,9 @@ <className>org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter</className> <genWsdl>true</genWsdl> <verbose>true</verbose> + <ignoredDependencies> + <ignoredDependency>com.sun.xml.bind:jaxb-impl</ignoredDependency> + </ignoredDependencies> </configuration> <goals> <goal>java2ws</goal> |