Java 17 and spring boot updgrade for babel

Issue-ID: AAI-4169
Change-Id: Ia41d74429b16aa902d3381f6f58315006ff4db6a
Signed-off-by: ranjan.kumar@t-systems.com <ranjan.kumar@t-systems.com>

diff --git a/pom.xml b/pom.xml
index c4780e0..5dc94e7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
        <properties>
                <!-- Spring boot version -->
-
+               <spring.boot.version>2.7.18</spring.boot.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -90,7 +90,7 @@
                <aai.common.version>1.9.4</aai.common.version>
                <logback.core.version>1.2.11</logback.core.version>
                <groovy.version>3.0.13</groovy.version>
-               <spring-cloud.version>2020.0.2</spring-cloud.version>
+               <spring-cloud.version>2021.0.9</spring-cloud.version>
 
                <commons.compress.version>1.27.0</commons.compress.version>
                <commons.io.version>2.16.1</commons.io.version>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index d956c76..8d474ea 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,5 +1,6 @@
-FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
+FROM eclipse-temurin:11-jre-alpine
 
+USER 1000
 ARG MICRO_HOME=/opt/app/babel
 
 # Build up the deployment folder structure
@@ -7,17 +8,8 @@ ARG MICRO_HOME=/opt/app/babel
 #RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin
 WORKDIR $MICRO_HOME
 
-USER root
 
-# Create the aai user
-RUN mkdir -p /opt/aaihome $MICRO_HOME /logs && \
-    ln -s /logs $MICRO_HOME/logs && \
-    chown -R aaiadmin:aaiadmin $MICRO_HOME && \
-    chown -R aaiadmin:aaiadmin /logs
-
-COPY --chown=aaiadmin:aaiadmin /maven/babel/ .
+COPY --chown=1000:1000 /maven/babel/ .
 # The start script is executable and can be run directly.
 
-ENTRYPOINT ["/bin/bash", "/opt/app/babel/bin/start.sh"]
-
-USER aaiadmin
+ENTRYPOINT ["/bin/sh", "/opt/app/babel/bin/start.sh"]

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index d0bf65d..d8c7771 100644 (file)
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -15,8 +15,7 @@
 # limitations under the License.
 -->
 <configuration scan="true" scanPeriod="30 seconds" debug="true">
-
-
+  <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
       <providers>
@@ -51,11 +50,9 @@
       </providers>
     </encoder>
   </appender>
-
   <!-- ============================================================================ -->
   <!-- EELF Appenders -->
   <!-- ============================================================================ -->
-
   <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
     <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -64,31 +61,25 @@
     <queueSize>256</queueSize>
     <appender-ref ref="STDOUT" />
   </appender>
-
   <!-- EELF Audit Appender. This appender is used to record audit engine related logging events. The
-  audit logger and appender
-       are specializations of the EELF application root logger and appender. This can be used to segregate
-  Policy engine events
-       from other components, or it can be eliminated to record these events as part of the application
-  root log. -->
-
+      audit logger and appender
+           are specializations of the EELF application root logger and appender. This can be used to segregate
+      Policy engine events
+           from other components, or it can be eliminated to record these events as part of the application
+      root log. -->
   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>256</queueSize>
     <appender-ref ref="STDOUT" />
   </appender>
-
   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>256</queueSize>
     <appender-ref ref="STDOUT" />
   </appender>
-
   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
     <!-- allow only events with a level below INFO, that is TRACE and DEBUG -->
     <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-        <expression>
-          e.level.toInt() &lt; INFO.toInt()
-        </expression>
+        <expression><![CDATA[e.level.toInt() < INFO.toInt()]]></expression>
       </evaluator>
       <OnMismatch>DENY</OnMismatch>
       <OnMatch>NEUTRAL</OnMatch>
@@ -97,51 +88,40 @@
     <appender-ref ref="STDOUT" />
     <includeCallerData>false</includeCallerData>
   </appender>
-
-
   <appender name="AsyncSysOut" class="ch.qos.logback.classic.AsyncAppender">
     <appender-ref ref="STDOUT" />
   </appender>
-
   <logger name="com.att.eelf" level="INFO" additivity="false">
     <appender-ref ref="asyncEELF" />
     <appender-ref ref="AsyncSysOut" />
   </logger>
-
-          <!-- The level of this logger determines the contents of the debug log -->
+  <!-- The level of this logger determines the contents of the debug log -->
   <logger name="com.att.eelf.debug" level="INFO" additivity="false">
     <appender-ref ref="asyncEELFDebug" />
     <appender-ref ref="AsyncSysOut" />
   </logger>
-
   <logger name="com.att.eelf.audit" level="INFO" additivity="false">
     <appender-ref ref="asyncEELFAudit" />
     <appender-ref ref="AsyncSysOut" />
   </logger>
-
   <logger name="com.att.eelf.metrics" level="INFO" additivity="false">
     <appender-ref ref="asyncEELFMetrics" />
     <appender-ref ref="AsyncSysOut" />
   </logger>
-
-        <!-- ============================================================================ -->
-        <!-- Non-EELF loggers -->
-        <!-- ============================================================================ -->
-
-        <!-- ATT packages including DMAAP message routing -->
+  <!-- ============================================================================ -->
+  <!-- Non-EELF loggers -->
+  <!-- ============================================================================ -->
+  <!-- ATT packages including DMAAP message routing -->
   <logger name="com.att" level="INFO" />
-
-          <!-- Spring related loggers -->
+  <!-- Spring related loggers -->
   <logger name="org.springframework" level="WARN" />
   <logger name="org.springframework.beans" level="WARN" />
   <logger name="org.springframework.web" level="WARN" />
-
-          <!-- Other Loggers that may help troubleshoot -->
+  <!-- Other Loggers that may help troubleshoot -->
   <logger name="org.apache" level="WARN" />
   <logger name="org.apache.commons" level="WARN" />
-
-          <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. May aid in
-          troubleshooting) -->
+  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. May aid in
+              troubleshooting) -->
   <logger name="org.apache.camel" level="WARN" />
   <logger name="org.apache.cxf" level="WARN" />
   <logger name="org.apache.camel.processor.interceptor" level="WARN" />
@@ -149,12 +129,10 @@
   <logger name="org.apache.cxf.service" level="WARN" />
   <logger name="org.restlet" level="WARN" />
   <logger name="org.apache.camel.component.restlet" level="WARN" />
-
-          <!-- logback internals logging -->
+  <!-- logback internals logging -->
   <logger name="ch.qos.logback.classic" level="WARN" />
   <logger name="ch.qos.logback.core" level="WARN" />
-
-  <root>
+  <root level="INFO">
     <appender-ref ref="asyncEELF" />
     <appender-ref ref="asyncEELFDebug" />
     <appender-ref ref="AsyncSysOut" />