From: Eby, Robert (re2429) <re2429@att.com>
Date: Thu, 24 Jan 2019 18:49:44 +0000 (-0500)
Subject: Update pom.xml to fix maven warnings
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=1583bec3e94771c0ccb539fd5fca86eda2807805;p=camunda_workflow.git

Update pom.xml to fix maven warnings

Change-Id: I1bb337a011cee33c3f61b0eaeb8726031dc87ba4
Signed-off-by: Eby, Robert (re2429) <re2429@att.com>
---

diff --git a/akraino/pom.xml b/akraino/pom.xml
index 99776f0..515f0bd 100644
--- a/akraino/pom.xml
+++ b/akraino/pom.xml
@@ -4,7 +4,11 @@
   <artifactId>camunda_workflow</artifactId>
   <version>0.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
-  
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -16,7 +20,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>
@@ -27,52 +31,48 @@
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
     </dependency>
-    
     <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.21</version>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch</artifactId>
+      <version>0.1.54</version>
     </dependency>
-    
     <dependency>
-    <groupId>commons-net</groupId>
-    <artifactId>commons-net</artifactId>
-    <version>3.3</version>
-	</dependency>
-	
-	<dependency>
-    <groupId>com.jcraft</groupId>
-    <artifactId>jsch</artifactId>
-    <version>0.1.54</version>
-	</dependency>
-	<dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger2</artifactId>
       <version>2.7.0</version>
     </dependency>
-
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger-ui</artifactId>
       <version>2.7.0</version>
     </dependency>
-	
-	<dependency>
-    	<groupId>org.springframework.boot</groupId>
-    	<artifactId>spring-boot-starter-test</artifactId>
-    	<scope>test</scope>
-    	<version>1.5.3.RELEASE</version>
-	</dependency>
-
-    
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.21</version>
+    </dependency>
+<!--
+    These conflict with dependencies in spring-boot-dependencies above.
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tertifartifactId>
+      <scope>test</scope>
+      <version>1.5.8.RE</ver</version>
+    </dependency>
+-->
   </dependencies>
-  
-   
-    <build>
-  <plugins>
+
+  <build>
+    <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>2.1.2.RELEASE</version>
         <executions>
           <execution>
             <goals>
@@ -82,7 +82,5 @@
         </executions>
       </plugin>
      </plugins>
-</build>
-  
-  
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index bbcb105..515f0bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,10 @@
   <version>0.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -27,11 +31,6 @@
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.21</version>
-    </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
@@ -42,6 +41,30 @@
       <artifactId>jsch</artifactId>
       <version>0.1.54</version>
     </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.21</version>
+    </dependency>
+<!--
+    These conflict with dependencies in spring-boot-dependencies above.
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tertifartifactId>
+      <scope>test</scope>
+      <version>1.5.8.RE</ver</version>
+    </dependency>
+-->
   </dependencies>
 
   <build>
@@ -49,6 +72,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>2.1.2.RELEASE</version>
         <executions>
           <execution>
             <goals>
@@ -57,6 +81,6 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
+     </plugins>
   </build>
 </project>