Skip to content

Commit

Permalink
Draft: Tor 0.4.2.6
Browse files Browse the repository at this point in the history 
Upgrade Tor to a version that defaults to HSv3.
Upgrade jtorctl to handle HSv3 properly.
Upgrade netlayer os it uses the new jtorctl and tor.
  • Loading branch information
@freimair
freimair committed Mar 5, 2020
1 parent dbecc0a commit e9bb86b
Show file tree
Hide file tree
Showing 23 changed files with 658 additions and 11 deletions.
5 changes: 4 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -73,6 +73,9 @@ configure(subprojects) {
}

repositories {
maven {
url uri("${rootProject.projectDir}/libs")
}
mavenCentral()
maven { url 'https://jitpack.io' }
}
Expand Down
10 changes: 0 additions & 10 deletions gradle/witness/gradle-witness.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions libs/com/github/JesusMcCloud/jtorctl/1.5/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -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>=
Binary file added libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5-sources.jar
View file
Binary file not shown.
Binary file added libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.jar
View file
Binary file not shown.
34 changes: 34 additions & 0 deletions libs/com/github/JesusMcCloud/jtorctl/1.5/jtorctl-1.5.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.JesusMcCloud</groupId>
<artifactId>jtorctl</artifactId>
<packaging>jar</packaging>
<version>1.5</version>
<name>jtorctl</name>
<url>http://maven.apache.org</url>

<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>

<dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
15 changes: 15 additions & 0 deletions libs/com/github/JesusMcCloud/jtorctl/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.github.JesusMcCloud</groupId>
<artifactId>jtorctl</artifactId>
<versioning>
<release>1.5</release>
<versions>
<version>1.2</version>
<version>1.3</version>
<version>1.4</version>
<version>1.5</version>
</versions>
<lastUpdated>20200305115234</lastUpdated>
</versioning>
</metadata>
3 changes: 3 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -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>=
52 changes: 52 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.JesusMcCloud.netlayer</groupId>
<artifactId>parent</artifactId>
<version>0.6.7</version>
<packaging>pom</packaging>

<name>Netlayer</name>

<properties>
<!-- General -->
<java.version>1.8</java.version>
<kotlin.version>1.3.41</kotlin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<tor-binary.version>0.4.2.6</tor-binary.version>
</properties>

<modules>
<module>tor</module>
<module>tor.native</module>
<module>tor.external</module>
</modules>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>com.github.ravn</groupId>
<artifactId>jsocks</artifactId>
<version>567e1cd</version>
</dependency>
<dependency>
<groupId>io.github.microutils</groupId>
<artifactId>kotlin-logging</artifactId>
<version>1.5.4</version>
</dependency>
</dependencies>
</project>
4 changes: 4 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/parent/0.6.7/parent-0.6.7.pom.lastUpdated
View file
Original file line number Diff line number Diff line change
@@ -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=
15 changes: 15 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/parent/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.github.JesusMcCloud.netlayer</groupId>
<artifactId>parent</artifactId>
<versioning>
<release>0.6.7</release>
<versions>
<version>0.6.2</version>
<version>0.6.3-SNAPSHOT</version>
<version>0.6.6</version>
<version>0.6.7</version>
</versions>
<lastUpdated>20200304152621</lastUpdated>
</versioning>
</metadata>
4 changes: 4 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -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>=
Binary file added libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.jar
View file
Binary file not shown.
139 changes: 139 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/tor.external/0.6.7/tor.external-0.6.7.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.JesusMcCloud.netlayer</groupId>
<artifactId>parent</artifactId>
<version>0.6.7</version>
</parent>

<artifactId>tor.external</artifactId>
<packaging>jar</packaging>
<name>Tor External Bindings</name>

<dependencies>
<dependency>
<groupId>com.github.JesusMcCloud.netlayer</groupId>
<artifactId>tor</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.69</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.3</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
<executions>
<!-- Replacing default-compile as it is treated specially by maven -->
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<!-- Replacing default-testCompile as it is treated specially by maven -->
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>java-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>java-test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/kotlin</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
15 changes: 15 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/tor.external/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.github.JesusMcCloud.netlayer</groupId>
<artifactId>tor.external</artifactId>
<versioning>
<release>0.6.7</release>
<versions>
<version>0.6.2</version>
<version>0.6.3-SNAPSHOT</version>
<version>0.6.6</version>
<version>0.6.7</version>
</versions>
<lastUpdated>20200304152629</lastUpdated>
</versioning>
</metadata>
4 changes: 4 additions & 0 deletions libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -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>=
Binary file added libs/com/github/JesusMcCloud/netlayer/tor.native/0.6.7/tor.native-0.6.7.jar
View file
Binary file not shown.
Loading

0 comments on commit e9bb86b

Please sign in to comment.