Merge tag '1.0.1' into develop

1.0.1 1.0.1
This commit is contained in:
Christian Basler 2016-02-04 10:18:40 +01:00
commit 58e9644ff1
4 changed files with 6 additions and 4 deletions

View File

@ -6,7 +6,7 @@ subprojects {
sourceCompatibility = 1.7 sourceCompatibility = 1.7
group = 'ch.dissem.jabit' group = 'ch.dissem.jabit'
version = '1.0.1-SNAPSHOT' version = '1.0.1'
ext.isReleaseVersion = !version.endsWith("SNAPSHOT") ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
@ -35,7 +35,7 @@ subprojects {
} }
signing { signing {
required { isReleaseVersion } required { isReleaseVersion && project.getProperties().get("signing.keyId")?.length() > 0 }
sign configurations.archives sign configurations.archives
} }

View File

@ -16,6 +16,8 @@ uploadArchives {
sourceCompatibility = 1.8 sourceCompatibility = 1.8
test.enabled = Boolean.valueOf(systemTestsEnabled)
task fatCapsule(type: FatCapsule) { task fatCapsule(type: FatCapsule) {
applicationClass 'ch.dissem.bitmessage.demo.Main' applicationClass 'ch.dissem.bitmessage.demo.Main'
} }

View File

@ -6,7 +6,6 @@ import ch.dissem.bitmessage.entity.Plaintext;
import ch.dissem.bitmessage.networking.DefaultNetworkHandler; import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
import ch.dissem.bitmessage.repository.*; import ch.dissem.bitmessage.repository.*;
import ch.dissem.bitmessage.utils.TTL; import ch.dissem.bitmessage.utils.TTL;
import ch.dissem.bitmessage.utils.UnixTime;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -78,7 +77,7 @@ public class SystemTest {
String originalMessage = UUID.randomUUID().toString(); String originalMessage = UUID.randomUUID().toString();
alice.send(aliceIdentity, new BitmessageAddress(bobIdentity.getAddress()), "Subject", originalMessage); alice.send(aliceIdentity, new BitmessageAddress(bobIdentity.getAddress()), "Subject", originalMessage);
Plaintext plaintext = bobListener.get(5, TimeUnit.MINUTES); Plaintext plaintext = bobListener.get(15, TimeUnit.MINUTES);
assertThat(plaintext.getText(), equalTo(originalMessage)); assertThat(plaintext.getText(), equalTo(originalMessage));
} }

View File

@ -8,3 +8,4 @@ signing.password=
ossrhUsername= ossrhUsername=
ossrhPassword= ossrhPassword=
systemTestsEnabled=false