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>
diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index 720ebf7..9f0b08a 100644
--- a/examples/examples-pcvs/pom.xml
+++ b/examples/examples-pcvs/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.
@@ -17,7 +18,10 @@
SPDX-License-Identifier: Apache-2.0
============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>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -30,11 +34,11 @@
<description>Example for Policy-controlled Video Streaming</description>
<properties>
- <apex-domains-pcvs-dir>${project.basedir}/src</apex-domains-pcvs-dir>
+ <policymodel.name>vpnsla</policymodel.name>
</properties>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>utils</artifactId>
</dependency>
@@ -80,19 +84,19 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
- <id>generate-models</id>
- <phase>process-classes</phase>
+ <id>generate-policy</id>
+ <phase>compile</phase>
<goals>
- <goal>exec</goal>
+ <goal>java</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
+ <classpathScope>compile</classpathScope>
<arguments>
- <argument>-classpath</argument>
- <classpath />
- <argument>org.onap.policy.apex.examples.pcvs.model.PcvsDomainModelSaver</argument>
- <argument>${project.basedir}</argument>
- <argument>${project.build.directory}/classes/examples/models/pcvs/</argument>
+ <argument>-command-file=${project.basedir}/src/main/resources/org/onap/policy/apex/examples/pcvs/vpnsla/${policymodel.name}.apex</argument>
+ <argument>-output-model-file=${project.build.directory}/classes/examples/models/pcvs/vpnsla/${policymodel.name}.json</argument>
+ <argument>-log-file=${project.build.directory}/${policymodel.name}_policygeneration.log</argument>
+ <argument>-working-dir=${project.basedir}</argument>
</arguments>
</configuration>
</execution>
@@ -150,4 +154,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>