Skip to content
Permalink
Browse files
Remove log4j dependency.
  • Loading branch information
LadyCailin committed Jan 28, 2020
1 parent cd0ef41 commit bfe75c0b22cf97520eaa891192f1c2c8d0fd82bf
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
17 pom.xml
@@ -206,14 +206,15 @@
<scope>compile</scope>
<type>jar</type>
</dependency>
<!--
<dependency>
<!-- Apache 2.0 -->
Apache 2.0
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>2.13.0</version>
<scope>compile</scope>
</dependency>

-->
<!-- Database -->
<!-- SQLite -->
<dependency>
@@ -507,7 +508,7 @@
<artifactSet>
<includes>
<include>org.perf4j:perf4j:jar:*</include>
<include>log4j:log4j:jar:*</include>
<!--<include>log4j:log4j:jar:*</include>-->
<include>org.yaml:snakeyaml:jar:*</include>
<include>com.googlecode.json-simple:json-simple:jar:*</include>
<include>org.mindrot:jBCrypt:jar:*</include>
@@ -545,10 +546,10 @@
<pattern>org.perf4j</pattern>
<shadedPattern>com.laytonsmith.libs.org.perf4j</shadedPattern>
</relocation>
<relocation>
<!--<relocation>
<pattern>org.apache.log4j</pattern>
<shadedPattern>com.laytonsmith.libs.org.apache.log4j</shadedPattern>
</relocation>
</relocation>-->
<relocation>
<pattern>org.yaml.snakeyaml</pattern>
<shadedPattern>com.laytonsmith.libs.org.yaml.snakeyaml</shadedPattern>
@@ -676,12 +677,12 @@
<include>**</include>
</includes>
</filter>
<filter>
<!--<filter>
<artifact>log4j:log4j:jar:*</artifact>
<includes>
<include>**</include>
</includes>
</filter>
</filter>-->
<filter>
<artifact>net.sourceforge.jchardet:jchardet:jar:*</artifact>
<includes>
@@ -112,9 +112,13 @@ public Map<ArgumentParser, CommandLineTool> getDynamicTools() {
public static CmdlineToolCollection GetCommandLineTools() {
ArgumentSuite suite = new ArgumentSuite()
.addDescription("These are the command line tools for MethodScript. For more information about a"
+ " particular mode, run help <mode name>. To run a command, in general, use the command:\n\n"
+ " particular mode, run the help mode with the mode you need help in as the argument."
+ " To run a command, in general, use the command:\n\n"
+ "\tjava -jar " + MethodScriptFileLocations.getDefault().getJarFile().getName()
+ " <mode name> <[mode specific arguments]>\n");
+ " <mode name> <[mode specific arguments]>\n"
+ "or\n"
+ "\tmscript -- <mode name> <[mode specific arguments]>\n"
+ "if you have previously installed the command line version.");

Map<ArgumentParser, CommandLineTool> dynamicTools = new HashMap<>();
for(Class<? extends CommandLineTool> ctool : ClassDiscovery.getDefaultInstance()
@@ -1,6 +1,7 @@
package com.laytonsmith.persistence.io;

import com.laytonsmith.PureUtilities.Common.FileUtil;
import com.laytonsmith.PureUtilities.Common.StreamUtils;
import com.laytonsmith.PureUtilities.DaemonManager;
import com.laytonsmith.PureUtilities.ZipReader;
import com.laytonsmith.persistence.ReadOnlyException;
@@ -18,7 +19,6 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.log4j.lf5.util.StreamUtils;

/**
*
@@ -107,7 +107,7 @@ public String getData() throws IOException {

@Override
public byte[] call() throws Exception {
return StreamUtils.getBytes(FileUtil.readAsStream(file));
return StreamUtils.GetBytes(FileUtil.readAsStream(file));
}
});
}
@@ -47,7 +47,7 @@ does not include the version number.
==== Linux/MacOS ====
On Unix systems, you'll need to run the command with sudo. The installer will install an mscript bash file in
/usr/local/bin/mscript, which simply wraps the jar. Running ''mscript'' will launch the interpreter, running it with
a file will run that file, and using ''mscript --'' followed by a verb (such as help) will run the cmdline utilities.
a file will run that file, and using ''mscript -- '' followed by a verb (such as help) will run the cmdline utilities.

==== Windows ====
<%NOTE|Windows support is still fairly experimental, and is not recommended
@@ -57,7 +57,7 @@ manual work to uninstall or update, so use it at your own risk.%>
On Windows systems, you'll need to have launched your command prompt as Administrator. (To install on Windows
Subsystem for Linux, follow the same instructions as for Unix.) A program ''mscript'' will be installed on your
path, and a PowerShell Module will also be installed. Running ''mscript'' will launch the interpreter, running
it with a file will run that file, and using ''mscript -Tool'' followed by a verb (such as help) will run the
it with a file will run that file, and using ''mscript -- '' followed by a verb (such as help) will run the
cmdline utilities.

== Usage ==

0 comments on commit bfe75c0

Please sign in to comment.