diff options
Diffstat (limited to 'aai-traversal')
4 files changed, 8 insertions, 7 deletions
diff --git a/aai-traversal/ajsc-shared-config/etc/localhost-access-logback.xml b/aai-traversal/ajsc-shared-config/etc/localhost-access-logback.xml index 1ca6caf..fbcfd25 100644 --- a/aai-traversal/ajsc-shared-config/etc/localhost-access-logback.xml +++ b/aai-traversal/ajsc-shared-config/etc/localhost-access-logback.xml @@ -30,7 +30,7 @@ </fileNamePattern> </rollingPolicy> <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder"> - <Pattern>%a %u %z [%t] "%m %U" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern> + <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern> </encoder> </appender> <appender-ref ref="ACCESS" /> diff --git a/aai-traversal/ajsc-shared-config/etc/logback.xml b/aai-traversal/ajsc-shared-config/etc/logback.xml index b855c37..3b8a257 100644 --- a/aai-traversal/ajsc-shared-config/etc/logback.xml +++ b/aai-traversal/ajsc-shared-config/etc/logback.xml @@ -218,6 +218,7 @@ <logger name="org.springframework.beans" level="WARN" /> <logger name="org.springframework.web" level="WARN" /> <logger name="com.blog.spring.jms" level="WARN" /> + <logger name="com.jayway.jsonpath" level="WARN" /> <!-- AJSC Services (bootstrap services) --> <logger name="ajsc" level="WARN" /> diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 724b2db..d79e1e7 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -19,8 +19,6 @@ <dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> <docker.image.version>1.0.0</docker.image.version> - <aai-core.version>1.1.0-SNAPSHOT</aai-core.version> - <aai-schema.version>1.1.0-SNAPSHOT</aai-schema.version> <hbase.version>1.0.2</hbase.version> <sonar.language>java</sonar.language> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> @@ -33,12 +31,12 @@ <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-schema</artifactId> - <version>${aai-schema.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-core</artifactId> - <version>${aai-core.version}</version> + <version>${project.version}</version> </dependency> <!-- Scamper related dependencies --> <dependency> @@ -458,7 +456,7 @@ <artifactItem> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-schema</artifactId> - <version>${aai-schema.version}</version> + <version>${project.version}</version> <outputDirectory>bundleconfig-local/etc</outputDirectory> <includes>oxm/*.xml</includes> </artifactItem> diff --git a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh index 64b7277..d1231f2 100644 --- a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh +++ b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh @@ -51,6 +51,8 @@ gosu aaiadmin ./init-chef.sh || { httpPort=8086; httpsPort=8446; +AAI_CORE_JAR=$(ls ${APP_HOME}/extJars/aai-core*.jar); + cd ${APP_HOME}; # If the variable DISABLE_UPDATE_QUERY is empty @@ -84,7 +86,7 @@ CP="$CP":${APP_HOME}/etc; CP="$CP":${APP_HOME}/lib/*; CP="$CP":${APP_HOME}/extJars/logback-access-1.1.7.jar; CP="$CP":${APP_HOME}/extJars/logback-core-1.1.7.jar; -CP="$CP":${APP_HOME}/extJars/aai-core-${AAI_CORE_VERSION}.jar; +CP="$CP":${AAI_CORE_JAR}; # You can add additional jvm options by adding environment variable JVM_PRE_OPTS # If you need to add more jvm options at the end then you can use JVM_POST_OPTS |