diff options
author | liamfallon <liam.fallon@ericsson.com> | 2018-06-27 12:50:17 +0100 |
---|---|---|
committer | liamfallon <liam.fallon@ericsson.com> | 2018-07-02 23:03:18 +0100 |
commit | 4d6fc38eb1ba2f09d53cd8ab2b89ccd68dda22b6 (patch) | |
tree | 7f08666ffec2805aa14e5489dc795fdda09eace6 /model | |
parent | bf49cf5d70526ee96ac19c3cd3f0cfc38fb372ae (diff) |
Resolve JAXB license issue, use Eclipselink
Replaced Glassfish-based JAXB processing with eclipselink based JAXB
processing to resolve license issues.
Updated version of eclipselink from 2.6.2 to 2.6.5
Supporessed warning about use of Java APIs.
Issue-ID: POLICY-905
Change-Id: I68094230b710e971d096decfffdb53b003c5872f
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'model')
4 files changed, 8 insertions, 7 deletions
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml index 8d11fe5e3..a13bab5a9 100644 --- a/model/basic-model/pom.xml +++ b/model/basic-model/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> - <version>2.6.2</version> + <version>${version.eclipselink}</version> </dependency> </dependencies> @@ -70,4 +70,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java index 2ddbe5def..6590ff456 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java @@ -457,4 +457,4 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).getAll(conceptKeyName, conceptKeyVersion); } -} +}
\ No newline at end of file diff --git a/model/model-api/src/test/resources/models/PolicyModel.xml b/model/model-api/src/test/resources/models/PolicyModel.xml index a89f73db2..684ce32c9 100644 --- a/model/model-api/src/test/resources/models/PolicyModel.xml +++ b/model/model-api/src/test/resources/models/PolicyModel.xml @@ -649,11 +649,11 @@ </eventMap> </events> <albums> - <key xmlns=""> + <key xmlns="http://www.onap.org/policy/apex-pdp"> <name xmlns="http://www.onap.org/policy/apex-pdp">context</name> <version xmlns="http://www.onap.org/policy/apex-pdp">0.0.1</version> </key> - <albums xmlns=""> + <albums xmlns="http://www.onap.org/policy/apex-pdp"> <entry> <key> <name xmlns="http://www.onap.org/policy/apex-pdp">contextAlbum0</name> @@ -693,11 +693,11 @@ </albums> </albums> <schemas> - <key xmlns=""> + <key xmlns="http://www.onap.org/policy/apex-pdp"> <name xmlns="http://www.onap.org/policy/apex-pdp">ContextSchemas</name> <version xmlns="http://www.onap.org/policy/apex-pdp">0.0.1</version> </key> - <schemas xmlns=""> + <schemas xmlns="http://www.onap.org/policy/apex-pdp"> <entry> <key> <name xmlns="http://www.onap.org/policy/apex-pdp">MapType</name> diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java index b4f9d2f75..e806bd7a0 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java +++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java @@ -36,6 +36,7 @@ import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; * <a href="https://github.com/KetothXupack/stackoverflow-answers/tree/master/q39401083"> * https://github.com/KetothXupack/stackoverflow-answers/tree/master/q39401083</a><br> */ +@SuppressWarnings("restriction") public class ClassBuilder { private final Class<?> clazz; private final List<ClassBuilder> parameters = new ArrayList<>(); |