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 /examples/examples-myfirstpolicy | |
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 'examples/examples-myfirstpolicy')
-rw-r--r-- | examples/examples-myfirstpolicy/pom.xml | 63 |
1 files changed, 52 insertions, 11 deletions
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml index 0e3424120..ec61748f0 100644 --- a/examples/examples-myfirstpolicy/pom.xml +++ b/examples/examples-myfirstpolicy/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,7 +34,8 @@ <description>Specific code for the Apex MyFirstPolicy Example</description> <properties> - <apex-domains-myfirstpolicy-dir>${project.basedir}/src</apex-domains-myfirstpolicy-dir> + <policymodel1.name>MyFirstPolicyModel_0.0.1</policymodel1.name> + <policymodel2.name>MyFirstPolicyModel_0.0.1</policymodel2.name> </properties> <dependencies> @@ -55,7 +60,6 @@ <groupId>org.onap.policy.apex-pdp.auth</groupId> <artifactId>cli-editor</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> @@ -79,24 +83,61 @@ <executions> <execution> <id>generate-models</id> - <phase>process-classes</phase> + <phase>compile</phase> <goals> - <goal>exec</goal> + <goal>java</goal> </goals> <configuration> - <executable>java</executable> + <mainClass>org.onap.policy.apex.examples.myfirstpolicy.model.MfpDomainModelSaver</mainClass> + <classpathScope>compile</classpathScope> <arguments> - <argument>-classpath</argument> - <!-- automatically creates the classpath using all project dependencies, - also adding the project build directory --> - <classpath /> - <argument>org.onap.policy.apex.examples.myfirstpolicy.model.MfpDomainModelSaver</argument> <argument>${project.build.directory}/classes/examples/models/MyFirstPolicy</argument> </arguments> </configuration> </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <!-- Generate the APEX Policy JSON files from the APEX CLI command --> + <execution> + <id>generate-policy1</id> + <phase>compile</phase> + <goals> + <goal>java</goal> + </goals> + <configuration> + <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass> + <classpathScope>compile</classpathScope> + <arguments> + <argument>--command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/1/${policymodel1.name}.apex</argument> + <argument>--output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/1/${policymodel1.name}.json</argument> + <argument>--log-file=${project.build.directory}/${policymodel1.name}_policygeneration.log</argument> + <argument>--working-dir=${project.basedir}</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>generate-policy2</id> + <phase>compile</phase> + <goals> + <goal>java</goal> + </goals> + <configuration> + <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass> + <classpathScope>compile</classpathScope> + <arguments> + <argument>--command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/2/${policymodel2.name}.apex</argument> + <argument>--output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/2/${policymodel2.name}.json</argument> + <argument>--log-file=${project.build.directory}/${policymodel2.name}_policygeneration.log</argument> + <argument>--working-dir=${project.basedir}</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> |