# HG changeset patch # User Jie Kang # Date 1502372484 14400 # Node ID 90361ef466fb5b3b3e376023c4759ccdb28e78ab # Parent 4a55900090e4811abb1afc7271f395d140dd533f Remove jline dependency This patch removes instances of jline in the project, except for the rpm build related files (.spec, .patch, etc.). Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-August/024495.html diff -r 4a55900090e4 -r 90361ef466fb common/core/pom.xml --- a/common/core/pom.xml Wed Aug 09 13:26:10 2017 -0400 +++ b/common/core/pom.xml Thu Aug 10 09:41:24 2017 -0400 @@ -175,11 +175,6 @@ - jline - jline - - - commons-cli commons-cli diff -r 4a55900090e4 -r 90361ef466fb distribution/scripts/thermostat --- a/distribution/scripts/thermostat Wed Aug 09 13:26:10 2017 -0400 +++ b/distribution/scripts/thermostat Thu Aug 10 09:41:24 2017 -0400 @@ -110,8 +110,6 @@ export USER_THERMOSTAT_HOME="`cygpath -w $USER_THERMOSTAT_HOME`" BOOT_CLASSPATH=$(cygpath -w -p "$BOOT_CLASSPATH") ##env - # in a VM, jline can cause 100% CPU usage on Windows without this - THERMOSTAT_EXT_JAVA_OPTS="$THERMOSTAT_EXT_JAVA_OPTS -Djline.terminal=jline.UnsupportedTerminal" # in cygwin, the openJDK uses c:\home\user as java.home. which is unhelpful. # pass the cygwin home directory instead THERMOSTAT_EXT_JAVA_OPTS="$THERMOSTAT_EXT_JAVA_OPTS -Duser.home=`cygpath -w $HOME`" diff -r 4a55900090e4 -r 90361ef466fb distribution/scripts/thermostat-common --- a/distribution/scripts/thermostat-common Wed Aug 09 13:26:10 2017 -0400 +++ b/distribution/scripts/thermostat-common Thu Aug 10 09:41:24 2017 -0400 @@ -144,6 +144,3 @@ LOGGING_ARGS=( "-Djava.util.logging.config.file=${USER_LOG_CONFIG_FILE}" ) fi fi - -LOGGING_ARGS=( "${LOGGING_ARGS[@]}" "-Djline.log.jul=true" ) - diff -r 4a55900090e4 -r 90361ef466fb distribution/windows/scripts/thermostat-common.cmd --- a/distribution/windows/scripts/thermostat-common.cmd Wed Aug 09 13:26:10 2017 -0400 +++ b/distribution/windows/scripts/thermostat-common.cmd Thu Aug 10 09:41:24 2017 -0400 @@ -75,6 +75,4 @@ set LOGGING_ARGS=-Djava.util.logging.config.file=%USER_LOG_CONFIG_FILE% ) -set LOGGING_ARGS=%LOGGING_ARGS% -Djline.log.jul=true - exit /b 0 \ No newline at end of file diff -r 4a55900090e4 -r 90361ef466fb distribution/windows/scripts/thermostat.cmd --- a/distribution/windows/scripts/thermostat.cmd Wed Aug 09 13:26:10 2017 -0400 +++ b/distribution/windows/scripts/thermostat.cmd Thu Aug 10 09:41:24 2017 -0400 @@ -94,9 +94,6 @@ goto cmdloop ) -:: in a VM, jline can cause 100 CPU usage on Windows without this -set THERMOSTAT_EXT_JAVA_OPTS=%THERMOSTAT_EXT_JAVA_OPTS% -Djline.terminal=jline.UnsupportedTerminal - :: Finally run thermostat (optionally in the background if "%RUN_IN_BG%"=="1" ( :: The thermostat-agent-sysd script uses this. diff -r 4a55900090e4 -r 90361ef466fb launcher/pom.xml --- a/launcher/pom.xml Wed Aug 09 13:26:10 2017 -0400 +++ b/launcher/pom.xml Thu Aug 10 09:41:24 2017 -0400 @@ -120,10 +120,6 @@ org.apache.felix.scr.annotations - jline - jline - - com.redhat.thermostat thermostat-common-core ${project.version} diff -r 4a55900090e4 -r 90361ef466fb launcher/src/test/java/com/redhat/thermostat/launcher/internal/TestTerminal.java --- a/launcher/src/test/java/com/redhat/thermostat/launcher/internal/TestTerminal.java Wed Aug 09 13:26:10 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * . - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.launcher.internal; - -import jline.UnixTerminal; - -public class TestTerminal extends UnixTerminal { - - public TestTerminal() throws Exception { - super(); - } - - @Override - public void restore() throws Exception { - super.restore(); - throw new Exception(); - } - -} - diff -r 4a55900090e4 -r 90361ef466fb main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties --- a/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties Wed Aug 09 13:26:10 2017 -0400 +++ b/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties Thu Aug 10 09:41:24 2017 -0400 @@ -3,7 +3,6 @@ thermostat-common-core-@project.version@.jar, \ thermostat-plugin-validator-@project.version@.jar, \ thermostat-launcher-@project.version@.jar, \ - jline-@jline.version@.jar, \ commons-cli-@commons-cli.version@.jar, \ org.apache.felix.scr-@felix.scr.version@.jar, \ gson-@gson.version@.jar, \ diff -r 4a55900090e4 -r 90361ef466fb pom.xml --- a/pom.xml Wed Aug 09 13:26:10 2017 -0400 +++ b/pom.xml Thu Aug 10 09:41:24 2017 -0400 @@ -280,7 +280,6 @@ com.github.jnr.jffi.native 1.2.12 - 2.13 5.1.0_1

5.1.0.1

3.0.5 @@ -654,11 +653,6 @@ ${commons-cli.version} - jline - jline - ${jline.version} - - org.apache.servicemix.bundles org.apache.servicemix.bundles.lucene ${lucene.version}