[metrics-lib/master] Prepare for 1.4.0 release. - tor-commits

31 Aug 2016

commit adf4a677028724e2430de69d67d8a52224fc4de6
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Wed Aug 31 10:29:08 2016 +0200
Prepare for 1.4.0 release.
---
 CERT         | 35 +++++++++++++++++++----------------
 CHANGELOG.md |  2 +-
 CONTRIB.md   |  2 +-
 build.xml    |  9 ++++-----
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/CERT b/CERT
index eaeef50..ebe19a7 100644
--- a/CERT
+++ b/CERT
@@ -1,18 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIEca8MxDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTUExEjAQBgNVBAcTCUNhbWJyaWRnZTEdMBsGA1UEChMUVGhlIFRvciBQcm9qZWN0LCBJbmMx
-GDAWBgNVBAMTD0thcnN0ZW4gTG9lc2luZzAeFw0xNjA1MzExODIwMjlaFw0xNjA4MjkxODIwMjla
-MGcxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNQTESMBAGA1UEBxMJQ2FtYnJpZGdlMR0wGwYDVQQK
-ExRUaGUgVG9yIFByb2plY3QsIEluYzEYMBYGA1UEAxMPS2Fyc3RlbiBMb2VzaW5nMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJCqHFgEhyj8AI4w93YcyZEkKwn2Jw5t7bYcaLieP0wa
-Ai2xrRFROo0eofjIllPlYTFtj9jLAZf+MQ1/Sdv7SLdlpasBCS0deTGlxuMzyMP9ztkkkAeibc+F
-IXYPJArwGJiycnd+obW8b8KNrJQsnb0Se5Fdgo/PSu1rqMh/Mylv9vLqUzB4hbN4bg5+7THlTAOK
-egYyR0NEPDzi327MAvzzle27kXV9yOCQr01zXW9NeWYed6JMXCZwaMN6nTVEFiwTfAyATfPncarf
-gZ1kyAkQ6/Sw2bGMv8jHqB63Ka0/6GXHRbFgCeWU+c/1sfEMBD3ZurEjwSjWGl73E4GBswIDAQAB
-oyEwHzAdBgNVHQ4EFgQUJbu6UT97IU4utjyc4zYUrLIgzvQwDQYJKoZIhvcNAQELBQADggEBAHOF
-jMP0rNa+cKy8beEpU0VRZ1RNLb70BoFjXZvzgv92MGnojg509fYO3PgzXUZv5v50VenexZjeZ9to
-iiqw5zDelg1maVSZwKrQVgFIwXnP4+okIcPMtFjSNiF9VyhRd8OE3U/kpIBdecMVIEhCIKOaF/nq
-uBwilXAK7VwYN7hQgKbIODoX9Y3dr9QDvrILkFDEmOudmDRo+RePAKJum+/E0RuUYjOeXpFmzXOf
-5LJ/Y4hMKuLfuxoWasHOV0IRx///CNgF1L287TCyjrYUbEjWwMtFQc0NRjedhcWUzwXLpbk2unxM
-j6ElkADaczDG20ZGSgrFfU4MYb1RFeQu6yk=
+MIIDaTCCAlGgAwIBAgIEc2oU6DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU
+b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTYw
+ODMxMDgzMTIyWhcNMTYxMTI5MDgzMTIyWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE
+CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj
+dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU
+6aTpAjDMeaT4ctUwxH4+56Sbcf/wB0vEFBbX8MyRd1eY02PKwMVJ6VBhjOQcIlrd
+Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE
+MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD
+oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX
+lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud
+DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAUFNO
+VyxE1ej/+5Q91tm8wCcFZYJRSVhQ6lqVs7kfNd6ggCUno8e8xnV3+nhNpT6vjc6g
+gGlOQKRPR2sNw2aDoXWtPa7h1DUtD4GeWU16kg9YTBNw9+Yay9jWQUKOs3hd86T5
+8xsndvmWuYf/jyW/B+k5f9u7ZQ3LWM2fwXYFiZmd+i7rDJJV8YEECkHRJMaZKB+B
+0CJ3Jfv57qsgqmvskqP+FmwmQz91mNn0iAUtpZoojqhzRhjr0/5VoqmbxeVeBhdI
+3YRZW/FkC/1hbu1CgrtRXoDu+fChyrvpLjqgTuCaBYmfjVOajq0F9GmhNkuMtZgw
+nLPNRMoyiTx/z4VFpg==
 -----END CERTIFICATE-----
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98f1781..232049e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 1.4.0 - 2016-08-24
+# Changes in version 1.4.0 - 2016-08-31
* Major changes
    - Add the Simple Logging Facade for Java (slf4j) for logging
diff --git a/CONTRIB.md b/CONTRIB.md
index 3120193..39f59a1 100644
--- a/CONTRIB.md
+++ b/CONTRIB.md
@@ -171,7 +171,7 @@ parameters:
 ```
 keytool -genkeypair -alias karsten -keyalg RSA -keysize 2048 \
     -sigalg SHA256withRSA -validity 90 \
-    -dname "CN=Karsten Loesing, O=The Tor Project, Inc, L=Cambridge, ST=MA, C=US"
+    -dname "CN=Karsten Loesing, O=The Tor Project, Inc, L=Seattle, ST=WA, C=US"
 ```
Extend the certificate for the existing key pair when it expires:
diff --git a/build.xml b/build.xml
index cee61ed..52f88c3 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <project default="jar" name="descriptor" basedir=".">
-  <property name="release.version" value="1.3.1-dev" />
+  <property name="release.version" value="1.4.0" />
   <property name="allsources" value="src"/>
   <property name="sources" value="src/main/java"/>
   <property name="resources" value="src/main/resources"/>
@@ -227,11 +227,10 @@
              storepass="${jarsigner.storepass}"
              sigalg="SHA256withRSA"
              digestalg="SHA-256"
-             tsaurl="http://timestamp.digicert.com%22%3E
+             tsaurl="http://timestamp.digicert.com"
+             lazy="true">
       <path>
-        <pathelement path="${jarfile}"/>
-        <pathelement path="${jarsourcesfile}"/>
-        <pathelement path="${jardocsfile}"/>
+        <fileset dir="${dist}" includes="descriptor-${release.version}*.jar" />
       </path>
     </signjar>
   </target>

    