Rework AAF classes

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6c37666..712cadf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,8 @@
                                <java.version>1.8</java.version>
 
                                <eelf.core.version>1.0.0</eelf.core.version>
-                               <logging.analytics.version>1.2.2-SNAPSHOT</logging.analytics.version>
                                <camel.version>2.22.0</camel.version>
-                               <springboot.version>2.0.2.RELEASE</springboot.version>
+                               <springboot.version>2.0.3.RELEASE</springboot.version>
 
                                <sonar.language>java</sonar.language>
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -225,11 +224,6 @@
                                                <artifactId>eelf-core</artifactId>
                                                <version>${eelf.core.version}</version>
                                </dependency>
-                               <dependency>
-                                               <groupId>org.onap.logging-analytics</groupId>
-                                               <artifactId>logging-library</artifactId>
-                                               <version>${logging.analytics.version}</version>
-                               </dependency>
                                <dependency>
                                                <groupId>org.codehaus.janino</groupId>
                                                <artifactId>janino</artifactId>
@@ -633,9 +627,22 @@
                                                </testResource>
                                </testResources>
                                <resources>
+                                               <!--  For AAF folder maven should not try to filter Keystores/Truststores ... 
+                                                         Otherwise they will be broken and unreadable
+                                               -->
                                                <resource>
                                                                <directory>src/main/resources</directory>
                                                                <filtering>true</filtering>
+                                                               <excludes>
+                                                                       <exclude>clds/aaf/**</exclude>
+                                                               </excludes>
+                                               </resource>
+                                               <resource>
+                                                               <directory>src/main/resources</directory>
+                                                               <filtering>false</filtering>
+                                                               <includes>
+                                                                       <include>clds/aaf/**</include>
+                                                               </includes>
                                                </resource>
                                                <resource>
                                                                <directory>src/main/docker</directory>