summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2022-10-25 14:22:37 +0000
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2022-10-26 10:57:36 +0000
commit9511c963abaf02fa1d6b0aa3ff80b53721c79bfc (patch)
treee1fbda96bdeedd6f17b678f6bda0d6150ea1dfba
parent24cbbc6737f42fa5932febeccae87b07362e34b0 (diff)
Use the 1.9.4 parent pom in resources
- upgrade apache commons-configuration to commons-configuration2 to resolve test failures Issue-ID: AAI-3566 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I26657f326c15de33c65abb9ae7c9bb9608defbaf
-rw-r--r--aai-resources/.classpath10
-rw-r--r--aai-resources/pom.xml16
-rw-r--r--aai-resources/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java12
-rw-r--r--pom.xml2
4 files changed, 19 insertions, 21 deletions
diff --git a/aai-resources/.classpath b/aai-resources/.classpath
index e89215e..bc00f63 100644
--- a/aai-resources/.classpath
+++ b/aai-resources/.classpath
@@ -34,17 +34,17 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path="target/generated-sources/annotations">
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/docker">
<attributes>
- <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
- <attribute name="ignore_optional_problems" value="true"/>
- <attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/docker">
+ <classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
+ <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="ignore_optional_problems" value="true"/>
+ <attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 37e397c..fda6f5b 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -364,14 +364,9 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@@ -408,14 +403,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<!-- eelf dependency -->
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <version>2.0.0-oss</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/aai-resources/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java b/aai-resources/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java
index 0d2ff88..ae77e5a 100644
--- a/aai-resources/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java
+++ b/aai-resources/src/main/java/org/onap/aai/config/PropertyPasswordConfiguration.java
@@ -29,18 +29,22 @@ import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
import org.apache.commons.io.IOUtils;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.*;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
public class PropertyPasswordConfiguration implements ApplicationContextInitializer<ConfigurableApplicationContext> {
private static final Pattern decodePasswordPattern = Pattern.compile("password\\((.*?)\\)");
private PasswordDecoder passwordDecoder = new JettyPasswordDecoder();
- private static final EELFLogger logger = EELFManager.getInstance().getLogger(PropertyPasswordConfiguration.class.getName());
+ private static final EELFLogger logger = EELFManager.getLogger(PropertyPasswordConfiguration.class.getName());
@Override
public void initialize(ConfigurableApplicationContext applicationContext) {
diff --git a/pom.xml b/pom.xml
index 1844536..7219597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.9.3</version>
+ <version>1.9.4</version>
</parent>
<groupId>org.onap.aai.resources</groupId>
<artifactId>resources</artifactId>