Skip to content
This repository has been archived by the owner on Oct 29, 2019. It is now read-only.

Add Junit to v3.1.0 #19

Open
wants to merge 1 commit into
base: wNetty41
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,31 @@ local.properties
#################
## Java
#################
# Compiled class file
*.class
*.jardesc

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

#################
## Visual Studio
#################
Expand Down Expand Up @@ -132,3 +154,43 @@ Thumbs.db
Desktop.ini

runtime.properties

###############
## Intellij
###############
# User-specific stuff
.idea/

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr

# CMake
cmake-build-*/

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

*.log

12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>WaarpExec</artifactId>
<packaging>jar</packaging>
<version>3.0.5</version>
<version>3.1.0</version>
<name>WaarpExec</name>
<description>The Waarp Exec project is about a Daemon for local execution of system commands
(as System.exec) but through client/server model and not within the same JVM.</description>
Expand Down Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>Waarp</groupId>
<artifactId>WaarpCommon</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<exclusions>
<exclusion>
<artifactId>xom</artifactId>
Expand Down Expand Up @@ -83,6 +83,12 @@
<version>1.2.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -110,7 +116,7 @@
<source>1.6</source>
<target>1.6</target>
<optimize>true</optimize>
<showDeprecations>true</showDeprecations>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.waarp.common.crypto.ssl.WaarpSslUtility;
import org.waarp.common.logging.WaarpLogger;
import org.waarp.common.logging.WaarpLoggerFactory;
import org.waarp.common.utility.DetectionUtils;
import org.waarp.common.utility.WaarpStringUtils;

/**
Expand Down Expand Up @@ -87,6 +88,10 @@ public static boolean isShutdown(Channel channel) {
return false;
}

public static void junitSetNotShutdown() {
isShutdown = false;
}

/**
* Print stack trace
*
Expand Down Expand Up @@ -122,7 +127,7 @@ public void run() {
GGLETimerTask ggleTimerTask = new GGLETimerTask();
timer.schedule(ggleTimerTask, delay);
factory.releaseResources();
System.exit(0);
DetectionUtils.SystemExit(0);
}

}
Expand All @@ -148,7 +153,7 @@ public void run() {
for (Thread thread : map.keySet()) {
printStackTrace(thread, map.get(thread));
}
System.exit(0);
DetectionUtils.SystemExit(0);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/waarp/commandexec/utils/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/** Provides the version information of Waarp Exec. */
public final class Version {
/** The version identifier. */
public static final String ID = "3.0.5";
public static final String ID = "3.1.0";
/** Prints out the version identifier to stdout. */
public static void main(String[] args) { System.out.println(ID); }
private Version() { super(); }
Expand Down
Empty file added src/test/java/.gitkeep
Empty file.
Loading