Fixes the jar build so we can use it within docker

researchstudio-sat · Sep 27, 2019 · f3fc7a0 · f3fc7a0
1 parent 3e3861f
commit f3fc7a0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 32 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN mvn -f pom.xml clean package
 # fix java version here until the following issue is resolved: https://github.com/researchstudio-sat/webofneeds/issues/1229
 FROM openjdk:8u121-jdk as botrun
 # TODO: FIGURE OUT HOW TO USE CORRECT BUILD JAR
-COPY --from=mvnbuild /build/target/debugbot-*.jar /usr/src/bots/bot.jar
+COPY --from=mvnbuild /build/target/bot.jar /usr/src/bots/bot.jar
 # add certificates directory
 RUN mkdir -p /usr/src/bots/client-certs
 # start echo bot

diff --git a/pom.xml b/pom.xml
@@ -99,7 +99,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>bots</finalName>
+                            <finalName>bot</finalName>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <artifactSet>
                                 <includes>
@@ -138,22 +138,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.7.RELEASE</version>
-                <configuration>
-                    <mainClass>won.bot.debugbot.DebugBotApp</mainClass>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/won/bot/debugbot/DebugBotApp.java b/src/main/java/won/bot/debugbot/DebugBotApp.java
@@ -2,7 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.annotation.PropertySource;
 import won.bot.framework.bot.utils.BotUtils;

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -25,28 +25,26 @@
     </appender>
 
     <logger name="won.bot" level="INFO"/>
-    <logger name="won.bot.debugbot" level="DEBUG"/>
-    <logger name="won.bot.framework.bot" level="DEBUG"/>
-    <logger name="won.bot.framework.manager.impl" level="DEBUG"/>
-    <logger name="won.bot.framework.component.atomconsumer" level="DEBUG"/>
+    <logger name="won.bot.debugbot" level="INFO"/>
+    <logger name="won.bot.framework.bot" level="INFO"/>
+    <logger name="won.bot.framework.manager.impl" level="INFO"/>
+    <logger name="won.bot.framework.component.atomconsumer" level="INFO"/>
     <logger name="org.springframework.aop" level="INFO"/>
     <logger name="won.bot.framework.eventbot.listener" level="INFO"/>
     <logger name="won.bot.framework.eventbot.action.impl.mail" level="INFO"/>
     <!-- set to DEBUG to get monitoring stats in the log file -->
     <logger name="won.monitoring" level="INFO"/>
 
     <!-- START MSGTRACE: set the following to DEBUG to trace messages through the system (high level) -->
-    <logger name="won.owner.service.impl" level="DEBUG"/>
-    <logger name="won.owner.camel.routes" level="DEBUG"/>
-    <logger name="won.owner.messaging" level="DEBUG"/>
+    <logger name="won.owner.service.impl" level="INFO"/>
+    <logger name="won.owner.camel.routes" level="INFO"/>
+    <logger name="won.owner.messaging" level="INFO"/>
     <!-- END MSGTRACE -->
 
     <!-- SET to DEBUG to see bot events -->
-    <logger name="won.bot.framework.eventbot.bus.impl.AsyncEventBusImpl" level="DEBUG"/>
+    <logger name="won.bot.framework.eventbot.bus.impl.AsyncEventBusImpl" level="INFO"/>
     <!-- SET to DEBUG to see bot event listeners -->
-    <logger name="won.bot.framework.eventbot.listener" level="DEBUG"/>
-
-    <logger name="org.apache.camel" level="DEBUG"/>
+    <logger name="won.bot.framework.eventbot.listener" level="INFO"/>
 
     <!-- Temporal -->
     <logger name="won.bot.impl.BAAtomicCCAdditionalParticipants" level="INFO" />

diff --git a/src/main/resources/spring/app/botApp.xml b/src/main/resources/spring/app/botApp.xml
@@ -19,9 +19,7 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-    <context:property-placeholder location="classpath:**/application.properties" ignore-unresolvable="true"/>
     <context:property-placeholder location="classpath:application.properties" ignore-unresolvable="true"/>
-    <context:property-placeholder location="classpath:/application.properties" ignore-unresolvable="true"/>
     <!--
        context that combines bot definitions with runner context
     -->