diff options
author | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2022-10-13 14:26:19 +0000 |
---|---|---|
committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2022-10-14 07:58:01 +0000 |
commit | 67acb223c78e804bdd3a4f0b1d51ed4c87e070a1 (patch) | |
tree | 24da3c4fa791ddad3ce6f3b3f2748e0b478c4f69 | |
parent | 271e8f5f853c7ed8c277f5c12607a4633dd5b136 (diff) |
Update eclipse.persistence and eelf.core in aai-common
- update eclipse persistence to version 2.7.11
- update eelf core to 2.0.0-oss
- pin eelf core version in aai-utils and aai-schema-abstraction to 1.0.1 since there would be IncompatibleClassChange errors
- add the jaxb-api dependency to aai-utils to make it compilable with jdk 11
Issue-ID: AAI-3550
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Change-Id: Ia2aa31a9f3550af853583e65bc1f84583c9fc22f
-rw-r--r-- | aai-parent/pom.xml | 4 | ||||
-rw-r--r-- | aai-rest/pom.xml | 1 | ||||
-rw-r--r-- | aai-schema-abstraction/pom.xml | 41 | ||||
-rw-r--r-- | aai-schema-ingest/pom.xml | 1 | ||||
-rw-r--r-- | aai-utils/pom.xml | 21 |
5 files changed, 32 insertions, 36 deletions
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index 518f23f1..17af71d7 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -60,8 +60,8 @@ limitations under the License. <docker.fabric.version>0.31.0</docker.fabric.version> <dmaap.client.version>1.1.9</dmaap.client.version> <easy.mock.version>4.0.2</easy.mock.version> - <eclipse.persistence.version>2.6.2</eclipse.persistence.version> - <eelf.core.version>1.0.1-oss</eelf.core.version> + <eclipse.persistence.version>2.7.11</eclipse.persistence.version> + <eelf.core.version>2.0.0-oss</eelf.core.version> <freemarker.version>2.3.31</freemarker.version> <google.guava.version>19.0</google.guava.version> <gremlin.version>3.2.3</gremlin.version> diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index 04328bcf..952bd720 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -37,7 +37,6 @@ <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> - <eelf.core.version>1.0.1-oss</eelf.core.version> <spring.boot.starter.web.version>1.5.21.RELEASE</spring.boot.starter.web.version> <spring.boot.starter.parent.version>1.5.21.RELEASE</spring.boot.starter.parent.version> <spring.security.version>1.0.8.RELEASE</spring.security.version> diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index 1448002a..e7c80913 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -21,8 +21,8 @@ ============LICENSE_END========================================================= --> -<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"> +<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> @@ -50,61 +50,58 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.onap.aai.logging-service</groupId> <artifactId>common-logging</artifactId> </dependency> - + <dependency> + <groupId>com.att.eelf</groupId> + <artifactId>eelf-core</artifactId> + <version>1.0.1-oss</version> + </dependency> <dependency> <groupId>org.onap.aai.logging-service</groupId> <artifactId>logging-api</artifactId> </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-access</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-access</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> </dependency> - <dependency> <groupId>org.onap.aai</groupId> <artifactId>rest-client</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> - <build> <plugins> <!-- license plugin --> diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 833091d3..c5ea8b27 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -34,7 +34,6 @@ limitations under the License. <packaging>jar</packaging> <properties> - <eelf.core.version>1.0.1-oss</eelf.core.version> <httpclient.version>4.5.13</httpclient.version> <groovy.version>2.5.15</groovy.version> <springframework.version>4.3.24.RELEASE</springframework.version> diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index e3ada307..d5872b59 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> -<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"> +<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> @@ -41,28 +39,32 @@ </properties> <dependencies> - + <dependency> + <groupId>com.att.eelf</groupId> + <artifactId>eelf-core</artifactId> + <version>1.0.1-oss</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> - <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> - + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> <!-- Common logging framework --> <dependency> <groupId>org.onap.aai.logging-service</groupId> <artifactId>common-logging</artifactId> </dependency> - <!-- https://mvnrepository.com/artifact/org.springframework/spring-core --> <dependency> <groupId>org.springframework</groupId> @@ -76,7 +78,6 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -112,4 +113,4 @@ </plugins> </build> -</project> +</project>
\ No newline at end of file |