Merge pull request #72 from aaronwalker/camel-fix

upgrade camel and activemq
jentrata · Oct 3, 2019 · ea6ffda · ea6ffda
2 parents 2b587b8 + 78966ea
commit ea6ffda
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ target-eclipse/
 .idea/
 *.iml
 git.properties
-Dist/src/main/deploy/*-ebms.xml
+Dist/src/main/deploy/*-ebms.xml
+.vscode
diff --git a/Core/Corvus.Web/pom.xml b/Core/Corvus.Web/pom.xml
@@ -106,6 +106,11 @@
 			<artifactId>activemq-all</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-core</artifactId>

diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,6 @@
-FROM jentrata/jenrata-msh:tomcat9
+FROM jentrata/jentrata-msh:3
 MAINTAINER Arran Ubels [email protected]
 
-#install jdk to allow remote debugging
-RUN apt-get update --fix-missing && \
-    apt-get install -y openjdk-${JDK_VERSION}-jdk && \
-    rm -rf /var/lib/apt/lists/*
-
 ENV JENTRATA_VERSION 3.x-SNAPSHOT
 
 COPY ./Dist/target/jentrata-msh-$JENTRATA_VERSION-tomcat.tar.gz /opt
@@ -18,6 +13,4 @@ RUN rm -rfv /opt/jentrata && \
     ln -s $JENTRATA_HOME/webapps/corvus $TOMCAT_HOME/webapps/jentrata
 
 
-ENV JAVA_HOME /usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64
-
 CMD ["/bin/sh", "/opt/run.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
   posters:
     image: "postgres:9.5"
     environment:
-      POSTGRES_USER: jentrata
       POSTGRES_PASSWORD: jentrata
       POSTGRES_DB: jentrata
       DB_USER_NAME: corvus

diff --git a/pom.xml b/pom.xml
@@ -29,9 +29,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version>${project.version}</version>
         <version.check>false</version.check>
-        <camel.version>2.21.3</camel.version>
+        <camel.version>2.24.2</camel.version>
         <spring.version>4.3.20.RELEASE</spring.version>
-        <activemq.version>5.15.7</activemq.version>
+        <activemq.version>5.15.10</activemq.version>
 		<slfj4.version>1.7.25</slfj4.version>
 	</properties>
 
@@ -75,7 +75,7 @@
 	</dependencies>
 
 	<dependencyManagement>
-        <dependencies>
+		<dependencies>
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
@@ -93,18 +93,18 @@
 				<artifactId>mockito-all</artifactId>
 				<version>1.8.5</version>
 			</dependency>
-        
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.1</version>
-            </dependency>
+
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>servlet-api</artifactId>
+				<version>2.5</version>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.mail</groupId>
+				<artifactId>mail</artifactId>
+				<version>1.4.1</version>
+			</dependency>
 
 			<dependency>
 				<groupId>jboss</groupId>
@@ -124,6 +124,12 @@
 				<version>1.4</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-pool2</artifactId>
+				<version>2.6.2</version>
+			</dependency>
+
 			<dependency>
 				<groupId>commons-fileupload</groupId>
 				<artifactId>commons-fileupload</artifactId>
@@ -208,7 +214,7 @@
 				<version>42.2.5</version>
 			</dependency>
 
-            <dependency>
+			<dependency>
 				<groupId>mysql</groupId>
 				<artifactId>mysql-connector-java</artifactId>
 				<version>8.0.13</version>
@@ -220,35 +226,35 @@
 				<version>1.1</version>
 			</dependency>
 
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-all</artifactId>
-                <version>${activemq.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-core</artifactId>
-                <version>${camel.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-jms</artifactId>
-                <version>${camel.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-aws</artifactId>
-                <version>${camel.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-all</artifactId>
+				<version>${activemq.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-core</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-jms</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-aws</artifactId>
+				<version>${camel.version}</version>
+			</dependency>
 
 		</dependencies>
 	</dependencyManagement>