diff --git a/build.gradle b/build.gradle
index a59533eb727..925fbd7b5ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ configure(subprojects) {
logbackVersion = '1.1.10'
lombokVersion = '1.18.2'
mockitoVersion = '3.0.0'
- netlayerVersion = '0.6.5.2'
+ netlayerVersion = '0.6.7'
protobufVersion = '3.10.0'
protocVersion = protobufVersion
pushyVersion = '0.13.2'
@@ -73,6 +73,9 @@ configure(subprojects) {
}
repositories {
+ maven {
+ url uri("${rootProject.projectDir}/libs")
+ }
mavenCentral()
maven { url 'https://jitpack.io' }
}
diff --git a/gradle/witness/gradle-witness.gradle b/gradle/witness/gradle-witness.gradle
index 341402db4ef..254e914a9df 100644
--- a/gradle/witness/gradle-witness.gradle
+++ b/gradle/witness/gradle-witness.gradle
@@ -19,15 +19,6 @@ dependencyVerification {
'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
- 'com.github.JesusMcCloud.netlayer:tor.external:10c3acfbcf8f80154a3f10640c4d4d275c4fc9baaf5c476d631da4e2382aaa5b',
- 'com.github.JesusMcCloud.netlayer:tor.native:fba4dca6a139af741c36713bcfe3680a92870009dbb59a3a14f9dae7f6cd116e',
- 'com.github.JesusMcCloud.netlayer:tor:57d16a909ceeb1ba3b5818eaeebfef8cb6c55fbea892dc13c843fe4487ee35d2',
- 'com.github.JesusMcCloud.tor-binary:tor-binary-geoip:1fd8b0af71ab706c7ec36888bc0af41c3d82f6e1455f674076ed6989c3d7fa7c',
- 'com.github.JesusMcCloud.tor-binary:tor-binary-linux32:e73b9fbb9347c6d34434f25795d4eb6bd01fc6bdb40d7b43594aad2286e395c9',
- 'com.github.JesusMcCloud.tor-binary:tor-binary-linux64:5c8a2567debe3c98d5c9e25c8029cbeb7cb917e4a8aab9575389c117477337a4',
- 'com.github.JesusMcCloud.tor-binary:tor-binary-macos:716c967ce7c4a66e2b7d4e64724544851d92a3280addd22cbd43699e70d7bab9',
- 'com.github.JesusMcCloud.tor-binary:tor-binary-windows:d02c9f4614b5d8d6b3c9afb02156ef6f0fe6043b446a3c3e4ec035983daa558d',
- 'com.github.JesusMcCloud:jtorctl:904f7c53332179a3479c64d63fb303afa6a02b6889aabdab5b235f3efc725ca7',
'com.github.bisq-network.bitcoinj:bitcoinj-core:f979c2187e61ee3b08dd4cbfc49a149734cff64c045d29ed112f2e12f34068a3',
'com.github.ravn:jsocks:3c71600af027b2b6d4244e4ad14d98ff2352a379410daebefff5d8cd48d742a4',
'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6',
@@ -54,7 +45,6 @@ dependencyVerification {
'de.jensd:fontawesomefx-commons:5539bb3335ecb822dbf928546f57766eeb9f1516cc1417a064b5709629612149',
'de.jensd:fontawesomefx-materialdesignfont:dbad8dfdd1c85e298d5bbae25b2399aec9e85064db57b2427d10f3815aa98752',
'de.jensd:fontawesomefx:73bacc991a0a6f5cf0f911767c8db161e0949dbca61e8371eb4342e3da96887b',
- 'io.github.microutils:kotlin-logging:4992504fd3c6ecdf9ed10874b9508e758bb908af9e9d7af19a61e9afb6b7e27a',
'io.grpc:grpc-api:a269094009588213ab5386a6fb92426b8056a130b2653d3b4e59e971f2f1ef08',
'io.grpc:grpc-context:f4c8f878c320f6fb56c1c14692618f6df8253314b556176e32727afbc5921a73',
'io.grpc:grpc-core:d67fa113fd9cc45a02710f9c41dda9c15191448c14e9e96fcc21839a41345d4c',
diff --git a/libs/com/github/JesusMcCloud/jtorctl/1.5/_remote.repositories b/libs/com/github/JesusMcCloud/jtorctl/1.5/_remote.repositories
new file mode 100644
index 00000000000..7de3240ae43
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/jtorctl/1.5/_remote.repositories
@@ -0,0 +1,5 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Thu Mar 05 12:52:34 CET 2020
+jtorctl-1.5.jar>=
+jtorctl-1.5.pom>=
+jtorctl-1.5-sources.jar>=
diff --git a/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5-sources.jar b/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5-sources.jar
new file mode 100644
index 00000000000..f8c6b539559
Binary files /dev/null and b/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5-sources.jar differ
diff --git a/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.jar b/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.jar
new file mode 100644
index 00000000000..f2ee410a6c3
Binary files /dev/null and b/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.jar differ
diff --git a/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.pom b/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.pom
new file mode 100644
index 00000000000..82b9d430c25
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.pom
@@ -0,0 +1,34 @@
+
+ 4.0.0
+ com.github.JesusMcCloud
+ jtorctl
+ jar
+ 1.5
+ jtorctl
+ http://maven.apache.org
+
+
+ 1.6
+ 1.6
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+
+
diff --git a/libs/com/github/JesusMcCloud/jtorctl/maven-metadata-local.xml b/libs/com/github/JesusMcCloud/jtorctl/maven-metadata-local.xml
new file mode 100644
index 00000000000..ac43a220f1f
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/jtorctl/maven-metadata-local.xml
@@ -0,0 +1,15 @@
+
+
+ com.github.JesusMcCloud
+ jtorctl
+
+ 1.5
+
+ 1.2
+ 1.3
+ 1.4
+ 1.5
+
+ 20200305115234
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/_remote.repositories b/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/_remote.repositories
new file mode 100644
index 00000000000..6a081e9bf8b
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/_remote.repositories
@@ -0,0 +1,3 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Wed Mar 04 16:26:21 CET 2020
+parent-0.6.7.pom>=
diff --git a/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom b/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom
new file mode 100644
index 00000000000..c06afee1f6b
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom
@@ -0,0 +1,52 @@
+
+
+ 4.0.0
+
+ com.github.JesusMcCloud.netlayer
+ parent
+ 0.6.7
+ pom
+
+ Netlayer
+
+
+
+ 1.8
+ 1.3.41
+ UTF-8
+
+ 3.7.0
+ 0.4.2.6
+
+
+
+ tor
+ tor.native
+ tor.external
+
+
+
+
+ jitpack.io
+ https://jitpack.io
+
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ ${kotlin.version}
+
+
+ com.github.ravn
+ jsocks
+ 567e1cd
+
+
+ io.github.microutils
+ kotlin-logging
+ 1.5.4
+
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom.lastUpdated b/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom.lastUpdated
new file mode 100644
index 00000000000..920432d2701
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom.lastUpdated
@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Wed Mar 04 16:25:06 CET 2020
+https\://repo.maven.apache.org/maven2/.lastUpdated=1583335506580
+https\://repo.maven.apache.org/maven2/.error=
diff --git a/libs/com/github/JesusMcCloud/netlayer/parent/maven-metadata-local.xml b/libs/com/github/JesusMcCloud/netlayer/parent/maven-metadata-local.xml
new file mode 100644
index 00000000000..a014a0bde64
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/parent/maven-metadata-local.xml
@@ -0,0 +1,15 @@
+
+
+ com.github.JesusMcCloud.netlayer
+ parent
+
+ 0.6.7
+
+ 0.6.2
+ 0.6.3-SNAPSHOT
+ 0.6.6
+ 0.6.7
+
+ 20200304152621
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/_remote.repositories b/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/_remote.repositories
new file mode 100644
index 00000000000..116f06c336a
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/_remote.repositories
@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Wed Mar 04 16:26:29 CET 2020
+tor.external-0.6.7.pom>=
+tor.external-0.6.7.jar>=
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.jar b/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.jar
new file mode 100644
index 00000000000..336f86b7472
Binary files /dev/null and b/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.jar differ
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.pom b/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.pom
new file mode 100644
index 00000000000..d729ddea6ef
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.pom
@@ -0,0 +1,139 @@
+
+
+
+ 4.0.0
+
+ com.github.JesusMcCloud.netlayer
+ parent
+ 0.6.7
+
+
+ tor.external
+ jar
+ Tor External Bindings
+
+
+
+ com.github.JesusMcCloud.netlayer
+ tor
+ ${project.version}
+
+
+ com.beust
+ jcommander
+ 1.69
+ test
+
+
+ ch.qos.logback
+ logback-classic
+ 1.1.3
+ test
+
+
+
+
+
+
+ kotlin-maven-plugin
+ org.jetbrains.kotlin
+
+ 1.8
+
+ ${kotlin.version}
+
+
+ compile
+
+ compile
+
+
+
+ ${project.basedir}/src/main/kotlin
+
+
+
+
+ test-compile
+
+ test-compile
+
+
+
+ ${project.basedir}/src/test/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+ default-compile
+ none
+
+
+
+ default-testCompile
+ none
+
+
+ java-compile
+ compile
+
+ compile
+
+
+
+ java-test-compile
+ test-compile
+
+ testCompile
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ generate-sources
+
+ add-source
+
+
+
+ src/main/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 3.0.1
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.external/maven-metadata-local.xml b/libs/com/github/JesusMcCloud/netlayer/tor.external/maven-metadata-local.xml
new file mode 100644
index 00000000000..756318da866
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor.external/maven-metadata-local.xml
@@ -0,0 +1,15 @@
+
+
+ com.github.JesusMcCloud.netlayer
+ tor.external
+
+ 0.6.7
+
+ 0.6.2
+ 0.6.3-SNAPSHOT
+ 0.6.6
+ 0.6.7
+
+ 20200304152629
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/_remote.repositories b/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/_remote.repositories
new file mode 100644
index 00000000000..cb16df241ce
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/_remote.repositories
@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Wed Mar 04 16:26:28 CET 2020
+tor.native-0.6.7.pom>=
+tor.native-0.6.7.jar>=
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.jar b/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.jar
new file mode 100644
index 00000000000..03c214dcdc7
Binary files /dev/null and b/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.jar differ
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.pom b/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.pom
new file mode 100644
index 00000000000..3408f0de281
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.pom
@@ -0,0 +1,178 @@
+
+
+
+ 4.0.0
+
+ com.github.JesusMcCloud.netlayer
+ parent
+ 0.6.7
+
+
+ tor.native
+ jar
+ Tor Native Files
+
+
+
+ com.github.JesusMcCloud.netlayer
+ tor
+ ${project.version}
+
+
+ com.github.JesusMcCloud.tor-binary
+ tor-binary-macos
+ ${tor-binary.version}
+
+
+ com.github.JesusMcCloud.tor-binary
+ tor-binary-linux32
+ ${tor-binary.version}
+
+
+ com.github.JesusMcCloud.tor-binary
+ tor-binary-linux64
+ ${tor-binary.version}
+
+
+ com.github.JesusMcCloud.tor-binary
+ tor-binary-windows
+ ${tor-binary.version}
+
+
+ com.beust
+ jcommander
+ 1.69
+ test
+
+
+ ch.qos.logback
+ logback-classic
+ 1.1.3
+ test
+
+
+ org.jetbrains.kotlin
+ kotlin-test
+ ${kotlin.version}
+ test
+
+
+
+
+ src/main/kotlin
+
+
+ kotlin-maven-plugin
+
+ 1.8
+
+ org.jetbrains.kotlin
+ ${kotlin.version}
+
+
+ compile
+ compile
+
+ compile
+
+
+
+ test-compile
+ test-compile
+
+ test-compile
+
+
+
+ src/test/java
+ src/test/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+ default-compile
+ none
+
+
+
+ default-testCompile
+ none
+
+
+ java-compile
+ compile
+
+ compile
+
+
+
+ java-test-compile
+ test-compile
+
+ testCompile
+
+
+
+ compile
+ compile
+
+ compile
+
+
+
+ testCompile
+ test-compile
+
+ testCompile
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ generate-sources
+
+ add-source
+
+
+
+ src/main/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 3.0.1
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor.native/maven-metadata-local.xml b/libs/com/github/JesusMcCloud/netlayer/tor.native/maven-metadata-local.xml
new file mode 100644
index 00000000000..d85b143c098
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor.native/maven-metadata-local.xml
@@ -0,0 +1,15 @@
+
+
+ com.github.JesusMcCloud.netlayer
+ tor.native
+
+ 0.6.7
+
+ 0.6.2
+ 0.6.3-SNAPSHOT
+ 0.6.6
+ 0.6.7
+
+ 20200304152628
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/_remote.repositories b/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/_remote.repositories
new file mode 100644
index 00000000000..bfd2f78b996
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/_remote.repositories
@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Wed Mar 04 16:26:26 CET 2020
+tor-0.6.7.jar>=
+tor-0.6.7.pom>=
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/tor-0.6.7.jar b/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/tor-0.6.7.jar
new file mode 100644
index 00000000000..cb84a3c549e
Binary files /dev/null and b/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/tor-0.6.7.jar differ
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/tor-0.6.7.pom b/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/tor-0.6.7.pom
new file mode 100644
index 00000000000..abd6615088c
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor/0.6.7/tor-0.6.7.pom
@@ -0,0 +1,152 @@
+
+
+
+ 4.0.0
+
+ com.github.JesusMcCloud.netlayer
+ parent
+ 0.6.7
+
+
+ tor
+ jar
+
+ Tor API
+
+
+
+ com.github.JesusMcCloud.tor-binary
+ tor-binary-geoip
+ ${tor-binary.version}
+
+
+ com.github.JesusMcCloud
+ jtorctl
+ 1.4
+
+
+ org.apache.commons
+ commons-compress
+ 1.18
+
+
+ org.tukaani
+ xz
+ 1.6
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ ${kotlin.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-test
+ ${kotlin.version}
+ test
+
+
+
+
+ src/test/kotlin
+
+
+ kotlin-maven-plugin
+
+ 1.8
+
+ org.jetbrains.kotlin
+ ${kotlin.version}
+
+
+ compile
+ compile
+
+ compile
+
+
+
+ src/main/kotlin
+
+
+
+
+ test-compile
+ test-compile
+
+ test-compile
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+ default-compile
+ none
+
+
+
+ default-testCompile
+ none
+
+
+ java-compile
+ compile
+
+ compile
+
+
+
+ java-test-compile
+ test-compile
+
+ testCompile
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ generate-sources
+
+ add-source
+
+
+
+ src/main/kotlin
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.10.4
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+
+
diff --git a/libs/com/github/JesusMcCloud/netlayer/tor/maven-metadata-local.xml b/libs/com/github/JesusMcCloud/netlayer/tor/maven-metadata-local.xml
new file mode 100644
index 00000000000..54e6f60efc6
--- /dev/null
+++ b/libs/com/github/JesusMcCloud/netlayer/tor/maven-metadata-local.xml
@@ -0,0 +1,15 @@
+
+
+ com.github.JesusMcCloud.netlayer
+ tor
+
+ 0.6.7
+
+ 0.6.2
+ 0.6.3-SNAPSHOT
+ 0.6.6
+ 0.6.7
+
+ 20200304152626
+
+