diff options
4 files changed, 9 insertions, 22 deletions
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index f4933e3f..865a8a7c 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -50,7 +50,7 @@ limitations under the License. <commons.beanutils.version>1.9.4</commons.beanutils.version> <commons.cli.version>1.5.0</commons.cli.version> <commons.compress.version>1.27.0</commons.compress.version> - <commons.configuration.version>1.10</commons.configuration.version> + <commons.configuration2.version>2.10.1</commons.configuration2.version> <commons.io.version>2.16.1</commons.io.version> <commons.lang3.version>3.15.0</commons.lang3.version> <commons.net.version>3.8.0</commons.net.version> @@ -92,7 +92,7 @@ limitations under the License. <junit.version>4.12</junit.version> <httpclient.version>4.5.13</httpclient.version> <io.swagger.version>1.5.24</io.swagger.version> - <logback.version>1.2.12</logback.version> + <logback.version>1.2.13</logback.version> <slf4j.version>1.7.25</slf4j.version> <log4j.version>2.17.1</log4j.version> <mockito.all.version>3.4.0</mockito.all.version> @@ -443,12 +443,6 @@ limitations under the License. </dependency> <dependency> - <groupId>org.onap.aai</groupId> - <artifactId>rest-client</artifactId> - <version>${aai.rest.client.version}</version> - </dependency> - - <dependency> <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> <version>${jopt.simple.version}</version> @@ -515,6 +509,12 @@ limitations under the License. </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>${commons.configuration2.version}</version> + </dependency> + + <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>${reflections.version}</version> diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index 6f497ed4..3eb22dfb 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -67,10 +67,6 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>org.onap.aai</groupId> - <artifactId>rest-client</artifactId> - </dependency> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-junit</artifactId> <scope>test</scope> diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java index b3b32576..575e2f9a 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java @@ -24,14 +24,6 @@ package org.onap.aai.schemaif; -import com.att.eelf.i18n.EELFResourceManager; - -import org.onap.aai.cl.eelf.LogMessageEnum; - -public enum SchemaProviderMsgs implements LogMessageEnum { +public enum SchemaProviderMsgs { SCHEMA_LOAD_ERROR, LOADED_SCHEMA_FILE, LOADED_DB_RULE_FILE; - - static { - EELFResourceManager.loadMessageBundle("logging/SchemaProviderMsgs"); - } } diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java index 71abdbc2..f564a89b 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java @@ -33,7 +33,6 @@ import java.util.regex.Pattern; import org.eclipse.persistence.dynamic.DynamicType; import org.eclipse.persistence.internal.oxm.mappings.Descriptor; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.schemaif.SchemaProviderException; import org.onap.aai.schemaif.SchemaProviderMsgs; |