summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BuildAll/nbproject/project.properties4
-rw-r--r--Essentials/nbproject/project.properties3
-rw-r--r--Essentials/src/config.yml4
-rw-r--r--EssentialsChat/nbproject/project.properties3
-rw-r--r--EssentialsGeoIP/nbproject/project.properties3
-rw-r--r--EssentialsProtect/nbproject/project.properties3
-rw-r--r--EssentialsSpawn/nbproject/project.properties3
-rw-r--r--EssentialsUpdate/nbproject/project.properties6
-rw-r--r--EssentialsXMPP/nbproject/project.properties3
-rw-r--r--lib/EssentialsiConomyBridge.jarbin7469 -> 0 bytes
-rw-r--r--lib/gson.jarbin164986 -> 0 bytes
-rw-r--r--lib/junit/junit-3.8.2-api.zipbin72555 -> 0 bytes
-rw-r--r--lib/junit/junit-3.8.2.jarbin118932 -> 0 bytes
-rw-r--r--lib/junit_4.10/junit-4.10-src.jarbin0 -> 141185 bytes
-rw-r--r--lib/junit_4.10/junit-4.10.jarbin0 -> 253160 bytes
-rw-r--r--lib/junit_4/junit-4.5-api.zipbin184067 -> 0 bytes
-rw-r--r--lib/junit_4/junit-4.5-src.jarbin109014 -> 0 bytes
-rw-r--r--lib/junit_4/junit-4.5.jarbin196787 -> 0 bytes
-rw-r--r--lib/mysql.jarbin703265 -> 0 bytes
-rw-r--r--lib/nblibraries.properties14
-rw-r--r--lib/sqlite.jarbin1304214 -> 0 bytes
21 files changed, 15 insertions, 31 deletions
diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties
index dd9ceab91..246ea1240 100644
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@@ -81,9 +81,7 @@ javac.source=1.6
javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${build.classes.dir}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties
index 0d7673bbd..59540b809 100644
--- a/Essentials/nbproject/project.properties
+++ b/Essentials/nbproject/project.properties
@@ -70,7 +70,6 @@ file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=../lib/craftbukkit-1.0.0-SNAPSHOT.
file.reference.iCo4.jar=../lib/iCo4.jar
file.reference.iCo5.jar=../lib/iCo5.jar
file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.junit-4.5.jar=../lib/junit_4/junit-4.5.jar
file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.1.jar
file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
file.reference.Permissions3.jar=../lib/Permissions3.jar
@@ -103,7 +102,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${file.reference.junit-4.5.jar}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index f9584f89a..e1a7e9d5a 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -332,10 +332,8 @@ chat:
protect:
# Database settings for sign/rail protection
- # get mysql.jar and sqlite and place it in your serverroot/lib directory from here:
- # https://github.com/essentials/Essentials/blob/master/lib/mysql.jar
- # mysql, sqlite or none
+ # mysql or sqlite
datatype: 'sqlite'
# If you specified MySQL above, you MUST enter the appropriate details here.
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties
index 0ce40b48b..e59815e40 100644
--- a/EssentialsChat/nbproject/project.properties
+++ b/EssentialsChat/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index 1b6ef450d..d20b3418f 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties
index 5e8639402..5224b3af6 100644
--- a/EssentialsProtect/nbproject/project.properties
+++ b/EssentialsProtect/nbproject/project.properties
@@ -83,8 +83,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties
index 16c272f09..96f4448ec 100644
--- a/EssentialsSpawn/nbproject/project.properties
+++ b/EssentialsSpawn/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsUpdate/nbproject/project.properties b/EssentialsUpdate/nbproject/project.properties
index 14a032421..b73c58ae9 100644
--- a/EssentialsUpdate/nbproject/project.properties
+++ b/EssentialsUpdate/nbproject/project.properties
@@ -67,8 +67,7 @@ file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
includes=**
jar.compress=true
javac.classpath=\
- ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
- ${libs.junit_4.classpath}
+ ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -78,7 +77,8 @@ javac.source=1.6
javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
- ${build.classes.dir}
+ ${build.classes.dir}:\
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties
index 802c76227..b32391add 100644
--- a/EssentialsXMPP/nbproject/project.properties
+++ b/EssentialsXMPP/nbproject/project.properties
@@ -83,8 +83,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/lib/EssentialsiConomyBridge.jar b/lib/EssentialsiConomyBridge.jar
deleted file mode 100644
index e847bdf81..000000000
--- a/lib/EssentialsiConomyBridge.jar
+++ /dev/null
Binary files differ
diff --git a/lib/gson.jar b/lib/gson.jar
deleted file mode 100644
index 4f7970541..000000000
--- a/lib/gson.jar
+++ /dev/null
Binary files differ
diff --git a/lib/junit/junit-3.8.2-api.zip b/lib/junit/junit-3.8.2-api.zip
deleted file mode 100644
index 6d792fdaa..000000000
--- a/lib/junit/junit-3.8.2-api.zip
+++ /dev/null
Binary files differ
diff --git a/lib/junit/junit-3.8.2.jar b/lib/junit/junit-3.8.2.jar
deleted file mode 100644
index d83587261..000000000
--- a/lib/junit/junit-3.8.2.jar
+++ /dev/null
Binary files differ
diff --git a/lib/junit_4.10/junit-4.10-src.jar b/lib/junit_4.10/junit-4.10-src.jar
new file mode 100644
index 000000000..458b63c7e
--- /dev/null
+++ b/lib/junit_4.10/junit-4.10-src.jar
Binary files differ
diff --git a/lib/junit_4.10/junit-4.10.jar b/lib/junit_4.10/junit-4.10.jar
new file mode 100644
index 000000000..bf5c0b9c6
--- /dev/null
+++ b/lib/junit_4.10/junit-4.10.jar
Binary files differ
diff --git a/lib/junit_4/junit-4.5-api.zip b/lib/junit_4/junit-4.5-api.zip
deleted file mode 100644
index 5748c444d..000000000
--- a/lib/junit_4/junit-4.5-api.zip
+++ /dev/null
Binary files differ
diff --git a/lib/junit_4/junit-4.5-src.jar b/lib/junit_4/junit-4.5-src.jar
deleted file mode 100644
index 18774a573..000000000
--- a/lib/junit_4/junit-4.5-src.jar
+++ /dev/null
Binary files differ
diff --git a/lib/junit_4/junit-4.5.jar b/lib/junit_4/junit-4.5.jar
deleted file mode 100644
index 83f8bc793..000000000
--- a/lib/junit_4/junit-4.5.jar
+++ /dev/null
Binary files differ
diff --git a/lib/mysql.jar b/lib/mysql.jar
deleted file mode 100644
index 0539039f7..000000000
--- a/lib/mysql.jar
+++ /dev/null
Binary files differ
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 6c4ff50b3..0380a6c75 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,13 +1,7 @@
libs.CopyLibs.classpath=\
${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.junit.classpath=\
- ${base}/junit/junit-3.8.2.jar
-libs.junit.javadoc=\
- ${base}/junit/junit-3.8.2-api.zip
-libs.junit_4.classpath=\
- ${base}/junit_4/junit-4.5.jar
-libs.junit_4.javadoc=\
- ${base}/junit_4/junit-4.5-api.zip
-libs.junit_4.src=\
- ${base}/junit_4/junit-4.5-src.jar
+libs.junit_4.10.classpath=\
+ ${base}/junit_4.10/junit-4.10.jar
+libs.junit_4.10.src=\
+ ${base}/junit_4.10/junit-4.10-src.jar
project.EssentialsGroupManager=../EssentialsGroupManager
diff --git a/lib/sqlite.jar b/lib/sqlite.jar
deleted file mode 100644
index 0b47e2cf9..000000000
--- a/lib/sqlite.jar
+++ /dev/null
Binary files differ