Compare commits
No commits in common. "3140a373a1f1a710e725b5fdcac03461415a8ad4" and "81d34d4e192538e64464367277452d9a2e472215" have entirely different histories.
3140a373a1
...
81d34d4e19
24
cli/pom.xml
24
cli/pom.xml
@ -1,14 +1,14 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
||||
http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>de.hsadmin</groupId>
|
||||
<artifactId>hsadmin-parent</artifactId>
|
||||
<version>1.0.4</version>
|
||||
<version>1.0.3</version>
|
||||
</parent>
|
||||
<artifactId>hsadmin-cli</artifactId>
|
||||
<version>1.3.0</version>
|
||||
<version>1.2.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>HSAdmin-Cli</name>
|
||||
@ -37,17 +37,12 @@
|
||||
<dependency>
|
||||
<groupId>jline</groupId>
|
||||
<artifactId>jline</artifactId>
|
||||
<version>2.14.6</version>
|
||||
<version>2.14.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.6.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjdk.nashorn</groupId>
|
||||
<artifactId>nashorn-core</artifactId>
|
||||
<version>15.4</version>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
@ -78,13 +73,12 @@
|
||||
<plugin>
|
||||
<groupId>org.vafer</groupId>
|
||||
<artifactId>jdeb</artifactId>
|
||||
<version>1.10</version>
|
||||
<version>1.5</version>
|
||||
<configuration>
|
||||
<verbose>true</verbose>
|
||||
<dataSet>
|
||||
<data>
|
||||
<src>
|
||||
${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</src>
|
||||
<src>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</src>
|
||||
<dst>hsscript-full.jar</dst>
|
||||
<type>file</type>
|
||||
<mapper>
|
||||
|
@ -33,10 +33,8 @@ public class ScriptClient {
|
||||
completionStrings.add("where");
|
||||
considerArguments(arguments);
|
||||
try {
|
||||
final ClassLoader classLoader = getClass().getClassLoader();
|
||||
final InputStream inputResource = classLoader.getResourceAsStream("js/functions.js");
|
||||
final InputStreamReader inputStreamReader = new InputStreamReader(inputResource);
|
||||
engine.eval(inputStreamReader);
|
||||
final InputStream inputResource = getClass().getClassLoader().getResourceAsStream("js/functions.js");
|
||||
engine.eval(new InputStreamReader(inputResource));
|
||||
} catch (ScriptException e) {
|
||||
throw new JSCliException(e);
|
||||
}
|
||||
|
@ -42,19 +42,19 @@
|
||||
<dependency>
|
||||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-compatibility-server</artifactId>
|
||||
<version>8.18.0</version>
|
||||
<version>8.9.4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-themes</artifactId>
|
||||
<version>8.18.0</version>
|
||||
<version>8.9.4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.vaadin</groupId>
|
||||
<artifactId>vaadin-compatibility-client-compiled</artifactId>
|
||||
<version>8.18.0</version>
|
||||
<version>8.9.4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@ -72,7 +72,7 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.36</version>
|
||||
<version>1.7.30</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
Loading…
Reference in New Issue
Block a user