Do not set JAVA_MAX_MEM in setenv(.bat)

Karaf removed handling of JAVA_MAX_MEM in
https://github.com/apache/karaf/pull/1226/files. Do not bother setting
it to 2GiB.

JIRA: ODLPARENT-294
Change-Id: I589690534da917333b52060a0953e7a8d42a4c65
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 4e9a11707c4de99b9508d4e4002aa79452a2d00c..38f24a86c7dfade9473ee4895434de891d33bfa8 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -115,16 +115,6 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/karaf.bat"
                       tofile="${project.build.directory}/classes/bin/karaf.bat"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-setenv.patch"
-                       originalfile="${project.build.directory}/assembly/bin/setenv"
-                       failonerror="true"/>
-                <copy file="${project.build.directory}/assembly/bin/setenv"
-                      tofile="${project.build.directory}/classes/bin/setenv"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-setenv.bat.patch"
-                       originalfile="${project.build.directory}/assembly/bin/setenv.bat"
-                       failonerror="true"/>
-                <copy file="${project.build.directory}/assembly/bin/setenv.bat"
-                      tofile="${project.build.directory}/classes/bin/setenv.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv.bat.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv.bat.patch
deleted file mode 100644 (file)
index bb19e47..0000000
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv.bat.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/setenv.bat     2016-10-27 16:23:51.966147872 +0200
-+++ bin/setenv.bat     2016-10-03 13:48:22.841563465 +0200
-@@ -62,4 +62,4 @@
- rem SET KARAF_OPTS
- rem Enable debug mode
- rem SET KARAF_DEBUG
--
-+IF "%JAVA_MAX_MEM%"=="" SET JAVA_MAX_MEM=2048m

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv.patch
deleted file mode 100644 (file)
index 8b6361a..0000000
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- bin/setenv 2016-10-27 16:23:51.966147872 +0200
-+++ bin/setenv 2016-10-03 13:48:22.841563465 +0200
-@@ -49,3 +49,6 @@
- # export KARAF_DEBUG # Enable debug mode
- # export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start
- # export KARAF_NOROOT # Prevent execution as root if set to true
-+if [ "x$JAVA_MAX_MEM" = "x" ]; then
-+    export JAVA_MAX_MEM="2048m"
-+fi