summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-06-27 12:50:17 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-07-02 23:03:18 +0100
commit4d6fc38eb1ba2f09d53cd8ab2b89ccd68dda22b6 (patch)
tree7f08666ffec2805aa14e5489dc795fdda09eace6
parentbf49cf5d70526ee96ac19c3cd3f0cfc38fb372ae (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>
-rw-r--r--model/basic-model/pom.xml4
-rw-r--r--model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java2
-rw-r--r--model/model-api/src/test/resources/models/PolicyModel.xml8
-rw-r--r--model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java1
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml4
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml23
-rw-r--r--pom.xml6
-rw-r--r--testsuites/integration/integration-uservice-test/pom.xml8
8 files changed, 21 insertions, 35 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<>();
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index f9bc16799..297b3c47d 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>${version.kafka}</version>
</dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
index a200faa49..00f2938e5 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
@@ -36,30 +36,15 @@
<dependencies>
<dependency>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.14.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>${version.eclipselink}</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>1.11.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.10.3</version>
- </dependency>
</dependencies>
<build>
@@ -116,4 +101,4 @@
</plugin>
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index c4eaa5d49..12b0d03be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,10 @@
<file.encoding>UTF-8</file.encoding>
<version.derby>10.13.1.1</version.derby>
<version.commons-cli>1.4</version.commons-cli>
-
- <kafka.version>0.10.2.1</kafka.version>
+ <version.kafka>0.10.2.1</version.kafka>
<version.grizzly2-http>2.27</version.grizzly2-http>
<version.jersey.core>2.27</version.jersey.core>
+ <version.eclipselink>2.6.5</version.eclipselink>
</properties>
<distributionManagement>
@@ -147,4 +147,4 @@
<module>packages</module>
<module>testsuites</module>
</modules>
-</project> \ No newline at end of file
+</project>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 3f3dbcf81..5eeeeffe3 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.11</artifactId>
- <version>${kafka.version}</version>
+ <version>${version.kafka}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.11</artifactId>
- <version>${kafka.version}</version>
+ <version>${version.kafka}</version>
<classifier>test</classifier>
<scope>test</scope>
<exclusions>
@@ -164,7 +164,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>${version.kafka}</version>
<classifier>test</classifier>
<scope>test</scope>
<exclusions>
@@ -223,4 +223,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>