From f1f6c7931ce83f79a4f643e6dc6baab7f67b8342 Mon Sep 17 00:00:00 2001
From: shuang <shuang@tesobe.com>
Date: Fri, 15 Nov 2019 20:19:00 +0800
Subject: [PATCH] bugfix/OutOfMemoryError: fix scala-maven-plugin seeings

---
 .gitignore          |  1 +
 README.md           |  2 +-
 mvn.sh              |  7 ----
 obp-api/pom.xml     | 44 ------------------------
 obp-commons/pom.xml | 32 ------------------
 pom.xml             | 82 ++++++++++++++++++++-------------------------
 6 files changed, 38 insertions(+), 130 deletions(-)
 delete mode 100755 mvn.sh

diff --git a/.gitignore b/.gitignore
index c20e5484a..da150d3c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ obp-api/src/main/scripts/kafka/kafka_*
 obp-api/src/main/scripts/kafka/logs/
 obp-api/src/main/scripts/kafka/tmp/
 /obp-commons/src/main/resources/git.properties
+/obp-api2/
diff --git a/README.md b/README.md
index 9253f893a..977b88ec1 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ The project uses Maven 3 as its build tool.
 
 To compile and run jetty, install Maven 3, create your configuration in obp-api/src/main/resources/props/default.props and execute:
 
-     ./mvn.sh install -pl .,obp-commons && ./mvn.sh jetty:run -pl obp-api
+     mvn install -pl .,obp-commons && mvn jetty:run -pl obp-api
 
 ## To run with IntelliJ IDEA
 
diff --git a/mvn.sh b/mvn.sh
deleted file mode 100755
index 43d8864e7..000000000
--- a/mvn.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Deprecated option -XX:MaxPermSize=256m is kept
-# just in case someone still uses java 1.7
-export MAVEN_OPTS="-Xmx1024m -Xms1024m -Xss2048k -XX:MaxPermSize=1024m"
-
-mvn $1 $2 $3 $4
diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index 45a16cea0..f9606ede3 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -470,39 +470,6 @@
         <plugin>
           <groupId>net.alchim31.maven</groupId>
           <artifactId>scala-maven-plugin</artifactId>
-          <configuration>
-            <charset>${project.build.sourceEncoding}</charset>
-            <jvmArgs>
-              <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
-            </jvmArgs>
-            <scalaVersion>${scala.compiler}</scalaVersion>
-            <scalaCompatVersion>${scala.version}</scalaCompatVersion>
-            <recompileMode>incremental</recompileMode>
-            <useZincServer>true</useZincServer>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>compile</goal>
-                <goal>testCompile</goal>
-              </goals>
-              <configuration>
-                <args>
-                  <arg>-dependencyfile</arg>
-                  <arg>${project.build.directory}/.scala_dependencies</arg>
-                  <arg>-Xmax-classfile-name</arg>
-                  <arg>78</arg>
-                </args>
-              </configuration>
-            </execution>
-            <execution>
-              <id>scala-test-compile</id>
-              <phase>process-test-resources</phase>
-              <goals>
-                <goal>testCompile</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -559,7 +526,6 @@
           <configuration>
             <contextPath>/</contextPath>
             <scanIntervalSeconds>5</scanIntervalSeconds>
-            <jvmArgs>-Xmx512m -Xms512m</jvmArgs>
           </configuration>
         </plugin>
         <plugin>
@@ -642,16 +608,6 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <configuration>
-          <charset>${project.build.sourceEncoding}</charset>
-          <jvmArgs>
-            <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
-          </jvmArgs>
-          <scalaCompatVersion>${scala.version}</scalaCompatVersion>
-          <scalaVersion>${scala.compiler}</scalaVersion>
-          <recompileMode>incremental</recompileMode>
-          <useZincServer>true</useZincServer>
-        </configuration>
       </plugin>
     </plugins>
   </reporting>
diff --git a/obp-commons/pom.xml b/obp-commons/pom.xml
index d629bbfe3..ab268820e 100644
--- a/obp-commons/pom.xml
+++ b/obp-commons/pom.xml
@@ -60,38 +60,6 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <configuration>
-                    <charset>${project.build.sourceEncoding}</charset>
-                    <jvmArgs>
-                        <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
-                    </jvmArgs>
-                    <scalaVersion>${scala.compiler}</scalaVersion>
-                    <scalaCompatVersion>${scala.version}</scalaCompatVersion>
-                    <recompileMode>incremental</recompileMode>
-                    <useZincServer>true</useZincServer>
-                    <compilerPlugins>
-                        <compilerPlugin>
-                            <groupId>com.artima.supersafe</groupId>
-                            <artifactId>supersafe_${scala.compiler}</artifactId>
-                            <version>1.1.8</version>
-                        </compilerPlugin>
-                    </compilerPlugins>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <args>
-                                <arg>-dependencyfile</arg>
-                                <arg>${project.build.directory}/.scala_dependencies</arg>
-                                <arg>-Xmax-classfile-name</arg>
-                                <arg>78</arg>
-                            </args>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <!-- enable the scalatest plugin -->
diff --git a/pom.xml b/pom.xml
index c78f93e88..56a2bde98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,8 @@
     <akka.version>2.5.19</akka.version>
     <akka-streams-kafka.version>0.22</akka-streams-kafka.version>
     <kafka.version>1.1.0</kafka.version>
-    <avro.version>1.8.3</avro.version>
-    <lift.version>3.3.0</lift.version>
+    <avro.version>1.8.2</avro.version>
+    <lift.version>3.4.0</lift.version>
     <jetty.version>9.4.12.v20180830</jetty.version>
     <log4j.version>2.6.2</log4j.version>
     <obp-ri.version>2016.11-RC6-SNAPSHOT</obp-ri.version>
@@ -107,7 +107,40 @@
         <plugin>
           <groupId>net.alchim31.maven</groupId>
           <artifactId>scala-maven-plugin</artifactId>
-          <version>4.2.4</version>
+          <version>4.3.0</version>
+          <configuration>
+            <scalaVersion>${scala.compiler}</scalaVersion>
+            <charset>${project.build.sourceEncoding}</charset>
+            <displayCmd>true</displayCmd>
+            <jvmArgs>
+              <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
+              <jvmArg>-Xms64m</jvmArg>
+              <jvmArg>-Xmx1024m</jvmArg>
+            </jvmArgs>
+            <args>
+              <arg>-unchecked</arg>
+              <arg>-explaintypes</arg>
+              <!--
+              <arg>-verbose</arg>
+              <arg>-deprecation</arg>
+              -->
+            </args>
+          </configuration>
+          <executions>
+            <execution>
+              <goals>
+                <goal>compile</goal>
+                <goal>testCompile</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>scala-test-compile</id>
+              <phase>process-test-resources</phase>
+              <goals>
+                <goal>testCompile</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.scalatest</groupId>
@@ -128,39 +161,6 @@
         <plugin>
           <groupId>net.alchim31.maven</groupId>
           <artifactId>scala-maven-plugin</artifactId>
-          <configuration>
-            <charset>${project.build.sourceEncoding}</charset>
-            <jvmArgs>
-              <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
-            </jvmArgs>
-            <scalaVersion>${scala.compiler}</scalaVersion>
-            <scalaCompatVersion>${scala.version}</scalaCompatVersion>
-            <recompileMode>incremental</recompileMode>
-            <useZincServer>true</useZincServer>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>compile</goal>
-                <goal>testCompile</goal>
-              </goals>
-              <configuration>
-                <args>
-                  <arg>-dependencyfile</arg>
-                  <arg>${project.build.directory}/.scala_dependencies</arg>
-                  <arg>-Xmax-classfile-name</arg>
-                  <arg>78</arg>
-                </args>
-              </configuration>
-            </execution>
-            <execution>
-              <id>scala-test-compile</id>
-              <phase>process-test-resources</phase>
-              <goals>
-                <goal>testCompile</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -245,16 +245,6 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <configuration>
-          <charset>${project.build.sourceEncoding}</charset>
-          <jvmArgs>
-            <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
-          </jvmArgs>
-          <scalaCompatVersion>${scala.version}</scalaCompatVersion>
-          <scalaVersion>${scala.compiler}</scalaVersion>
-          <recompileMode>incremental</recompileMode>
-          <useZincServer>true</useZincServer>
-        </configuration>
       </plugin>
     </plugins>
   </reporting>