diff options
| author |   liamfallon <liam.fallon@est.tech> | 2020-01-22 12:11:11 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2020-01-23 12:15:19 +0000 |
| commit | 755eb9df282d80273043a2e902e2a51bf6eaab24 (patch) | |
| tree | fb603fff3d378bb868dba63e3d766d7723e03839 /model/basic-model | |
| parent | 37da84e2a40f7f39fe73fa2ceb6a7166618e9ddb (diff) | |
Run apex-pdp in Java 11: base changes
This change brings in the minimum changes to get apex-pdp running in
Java 11. Other reviews will bring in changes to remove Java 11 warnings
and to convert apex-pdp Javascript handling from the now deprecated
nashorn engine.
Issue-ID: POLICY-1581
Change-Id: I879bbae08d4e67aca3f1bfeedeca639d8dbbc281
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'model/basic-model')
| -rw-r--r-- | model/basic-model/pom.xml | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml index 20254afb7..1468482be 100644 --- a/model/basic-model/pom.xml +++ b/model/basic-model/pom.xml @@ -1,6 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. + Modifications Copyright (C) 2020 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,7 +19,10 @@ ============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> @@ -32,7 +36,7 @@ <description>Basic Models used and model handling in Apex</description> <dependencies> - <dependency> + <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>utils</artifactId> </dependency> @@ -46,6 +50,31 @@ <artifactId>eclipselink</artifactId> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${version.javax.bind}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${version.javax.bind}</version> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <version>${version.javax.json}</version> + </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>${version.javax.json}</version> + </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>${version.javax.json}</version> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> |