From 30670accb070b20c1c770d1ebbd6d72e24fee2db Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 4 Aug 2020 14:16:00 +0200
Subject: Upgrade to java 11

MOve SDC to Java 11, this is one of the PR to move to Jdk 11, jenkins will have to be changed as well

Issue-ID: SDC-2725
Change-Id: I85f13f14ba8004f6e9656093a837465a2e4af3e1
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Signed-off-by: xuegao <xg353y@intl.att.com>
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../openecomp-tosca-converter-core/pom.xml           | 20 +++++++++++++++++++-
 .../core/impl/ToscaSolConverterVnfTest.java          |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core')

diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml
index a63fc9bfdd..eeca992bc8 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml
@@ -58,5 +58,23 @@
   </parent>
 
   <artifactId>openecomp-tosca-converter-core</artifactId>
-
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <excludes>
+        <exclude>**/*.csar</exclude>
+        </excludes>
+		<filtering>true</filtering>
+      </testResource>
+      <testResource>
+        <directory>src/test/resources/csar</directory>
+        <includes>
+          <include>**.csar</include>
+        </includes>
+        <filtering>false</filtering>
+        <targetPath>csar</targetPath>
+      </testResource>
+    </testResources>
+  </build>
 </project>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java
index f130f262a7..a9ee1a7518 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterVnfTest.java
@@ -135,7 +135,7 @@ public class ToscaSolConverterVnfTest {
     }
 
     private byte[] getFileResource(final String filePath) {
-        try (final InputStream inputStream = ClassLoader.class.getResourceAsStream(filePath)) {
+        try (final InputStream inputStream = this.getClass().getResourceAsStream(filePath)) {
             return IOUtils.toByteArray(inputStream);
         } catch (final IOException ex) {
             fail(String.format("Could not load file: %s", filePath));
-- 
cgit 1.2.3-korg