hostsharing/hs.hsadmin.jee
8
0
Fork 0
Code Pull Requests Activity

Compare commits

base: hostsharing:3140a373a1f1a710e725b5fdcac03461415a8ad4
Branches Tags
hostsharing:master
hostsharing:ticket/2
..
compare: hostsharing:81d34d4e192538e64464367277452d9a2e472215
Branches Tags
hostsharing:master
hostsharing:ticket/2

No commits in common. "3140a373a1f1a710e725b5fdcac03461415a8ad4" and "81d34d4e192538e64464367277452d9a2e472215" have entirely different histories.
3140a373a1 ... 81d34d4e19

3 changed files with 15 additions and 23 deletions
Show Stats Expand all files Collapse all files

24
cli/pom.xml
View File

@ -1,14 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<version>1.0.4</version> <version>1.0.3</version>
</parent> </parent>
<artifactId>hsadmin-cli</artifactId> <artifactId>hsadmin-cli</artifactId>
<version>1.3.0</version> <version>1.2.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HSAdmin-Cli</name> <name>HSAdmin-Cli</name>
@ -37,17 +37,12 @@
<dependency> <dependency>
<groupId>jline</groupId> <groupId>jline</groupId>
<artifactId>jline</artifactId> <artifactId>jline</artifactId>
<version>2.14.6</version> <version>2.14.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
<version>1.6.0</version> <version>1.4</version>
</dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -78,13 +73,12 @@
<plugin> <plugin>
<groupId>org.vafer</groupId> <groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId> <artifactId>jdeb</artifactId>
<version>1.10</version> <version>1.5</version>
<configuration> <configuration>
<verbose>true</verbose> <verbose>true</verbose>
<dataSet> <dataSet>
<data> <data>
<src> <src>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</src>
${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</src>
<dst>hsscript-full.jar</dst> <dst>hsscript-full.jar</dst>
<type>file</type> <type>file</type>
<mapper> <mapper>

6
cli/src/main/java/de/hsadmin/jscli/ScriptClient.java
View File

@ -33,10 +33,8 @@ public class ScriptClient {
completionStrings.add("where"); completionStrings.add("where");
considerArguments(arguments); considerArguments(arguments);
try { try {
final ClassLoader classLoader = getClass().getClassLoader(); final InputStream inputResource = getClass().getClassLoader().getResourceAsStream("js/functions.js");
final InputStream inputResource = classLoader.getResourceAsStream("js/functions.js"); engine.eval(new InputStreamReader(inputResource));
final InputStreamReader inputStreamReader = new InputStreamReader(inputResource);
engine.eval(inputStreamReader);
} catch (ScriptException e) { } catch (ScriptException e) {
throw new JSCliException(e); throw new JSCliException(e);
} }

8
web/pom.xml
View File

@ -42,19 +42,19 @@
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-compatibility-server</artifactId> <artifactId>vaadin-compatibility-server</artifactId>
<version>8.18.0</version> <version>8.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-themes</artifactId> <artifactId>vaadin-themes</artifactId>
<version>8.18.0</version> <version>8.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-compatibility-client-compiled</artifactId> <artifactId>vaadin-compatibility-client-compiled</artifactId>
<version>8.18.0</version> <version>8.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
@ -72,7 +72,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.7.36</version> <version>1.7.30</version>
</dependency> </dependency>
<dependency> <dependency>