diff options
| author |   liamfallon <liam.fallon@est.tech> | 2022-02-07 17:56:44 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2022-02-08 18:39:03 +0000 |
| commit | 59b90519eda3b95b0cfc49b6349a591c7d0c78e2 (patch) | |
| tree | 810e07f7d5cf270582264c40245372f597c713a2 /model/basic-model/pom.xml | |
| parent | def44b294fa00bb5470e977eef9a05e5087035f0 (diff) | |
Remove JAXB and XML, use GSON for JSON
This review converst apex-pdp to use GSON for JSON handling. In order to
preserve backward compatibility with the JAXB format of JSON, custom
handling of maps was required. Therefore, the policy-common
StandardCoder could not be used.
There are a lot of small changes, removing annotations from concepts and
tweaking of test data. However, this cleans up the code base so it is
worth doing.
Issue-ID: POLICY-1820
Change-Id: I213fa64f6d7f3f1df8d10f111d9fbedbe80f9fe0
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'model/basic-model/pom.xml')
| -rw-r--r-- | model/basic-model/pom.xml | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml index 4d7930298..45d9978cf 100644 --- a/model/basic-model/pom.xml +++ b/model/basic-model/pom.xml @@ -18,10 +18,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> @@ -45,6 +42,12 @@ <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>utils</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> @@ -77,30 +80,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-xml-schema</id> - <phase>process-classes</phase> - <goals> - <goal>java</goal> - </goals> - <configuration> - <mainClass>org.onap.policy.apex.model.basicmodel.handling.ApexSchemaGenerator</mainClass> - <classpathScope>compile</classpathScope> - <arguments> - <argument>org.onap.policy.apex.model.basicmodel.concepts.AxModel</argument> - <argument>${project.build.directory}/model/xml/apex-basic-model.xsd</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> +</project>
\ No newline at end of file |