diff options
| author |   adheli.tavares <adheli.tavares@est.tech> | 2023-08-10 16:58:48 +0100 |
|---|---|---|
| committer | adheli.tavares <adheli.tavares@est.tech> | 2023-09-22 16:01:00 +0100 |
| commit | a3a032d5b902c3e125dccd2bc2b41f22861decc1 (patch) | |
| tree | 481b0faa916f39da096fe5c935c630b1598f0f7d /examples/examples-onap-bbs | |
| parent | 097618956f681eee12a23d7d9dc4f4f22f5347cc (diff) | |
Java 17 Upgrade
Updated dependencies to latest versions
Made Java 17 changes
Moved apex dependencies versions to main apex pom
Issue-ID: POLICY-4675
Change-Id: Ia5cd5670a1f024f5402cbd7371162ce3313930ef
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
Diffstat (limited to 'examples/examples-onap-bbs')
| -rw-r--r-- | examples/examples-onap-bbs/pom.xml | 23 | ||||
| -rw-r--r-- | examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java | 3 |
2 files changed, 14 insertions, 12 deletions
diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml index 058833c02..e0ebfe430 100644 --- a/examples/examples-onap-bbs/pom.xml +++ b/examples/examples-onap-bbs/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. Copyright (C) 2019 Huawei. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019, 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ ============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"> + 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> <artifactId>examples</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>examples-onap-bbs</artifactId> @@ -84,11 +84,6 @@ <artifactId>events</artifactId> <version>${version.policy.models}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -108,9 +103,15 @@ <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass> <classpathScope>compile</classpathScope> <arguments> - <argument>--command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex</argument> - <argument>--output-model-file=${project.build.directory}/classes/${policymodel.name}.json</argument> - <argument>--log-file=${project.build.directory}/${policymodel.name}_policygeneration.log</argument> + <argument> + --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex + </argument> + <argument> + --output-model-file=${project.build.directory}/classes/${policymodel.name}.json + </argument> + <argument> + --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + </argument> <argument>--working-dir=${project.basedir}</argument> </arguments> </configuration> diff --git a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java index 5fb74a307..1f52e1115 100644 --- a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java +++ b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 huawei. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2020, 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +// TODO javax libraries used here too. Ok, to keep? Liam's review ignored these. public class WebClientTest { HttpsURLConnection mockedHttpsUrlConnection; |