[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [collector/master] Prepare for 1.0.0 release.
commit 06bcf327bb7741f3b972e932c80c7cfcb090e1fa
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Thu Aug 11 11:05:21 2016 +0200
Prepare for 1.0.0 release.
---
.gitignore | 1 +
CERT | 18 ++++++++++++++++++
CHANGELOG.md | 6 ++++++
build.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++---
4 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0ca0b1c..e4e7512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
/lib
cobertura.ser
*~
+build.properties
diff --git a/CERT b/CERT
new file mode 100644
index 0000000..eaeef50
--- /dev/null
+++ b/CERT
@@ -0,0 +1,18 @@
+-----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=
+-----END CERTIFICATE-----
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..9f9b2b2
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+# Changes in version 1.0.0 - 2016-08-11
+
+ * Major changes
+ - This is the initial release after over six and a half years of
+ development.
+
diff --git a/build.xml b/build.xml
index 75e00f8..4e3e1fb 100644
--- a/build.xml
+++ b/build.xml
@@ -1,10 +1,11 @@
<project default="compile" name="CollecTor" basedir=".">
- <property name="release.version" value="0.9.0-dev" />
+ <property name="release.version" value="1.0.0" />
<property name="name" value="CollecTor"/>
- <property name="descriptorversion" value="1.3.0" />
+ <property name="descriptorversion" value="1.3.1" />
<property name="source-and-target-java-version" value="1.7" />
<property name="sources" value="src/main/java"/>
<property name="resources" value="src/main/resources/"/>
+ <property name="webappsources" value="src/main/webapp"/>
<property name="generated" value="generated/"/>
<property name="testresult" value="${generated}/test-results"/>
<property name="testsources" value="src/test/java"/>
@@ -19,6 +20,9 @@
<property name="jarfile" value="collector-${release.version}.jar" />
<property name="jarsourcesfile" value="collector-${release.version}-sources.jar" />
<property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" />
+ <property name="release.tarball"
+ value="collector-${release.version}.tar.gz" />
+ <property file="build.properties" />
<patternset id="runtime" >
<include name="commons-codec-1.9.jar"/>
<include name="commons-compress-1.9.jar"/>
@@ -89,6 +93,7 @@
<delete file="${jarfile}" quiet="true"/>
<delete file="${jarsourcesfile}" quiet="true"/>
<delete file="${jarjavadocfile}" quiet="true"/>
+ <delete file="${release.tarball}"/>
</target>
<target name="compile" depends="init">
<javac srcdir="${sources}"
@@ -136,7 +141,6 @@
</exec>
<jar destfile="${jarfile}"
basedir="${classes}">
- <fileset dir="${classes}"/>
<fileset dir="${resources}" >
<include name="collector.properties"/>
<include name="logback.xml"/>
@@ -182,6 +186,44 @@
</manifest>
</jar>
</target>
+ <target name="signjar" depends="jar">
+ <signjar alias="${jarsigner.alias}"
+ storepass="${jarsigner.storepass}"
+ sigalg="SHA256withRSA"
+ digestalg="SHA-256"
+ tsaurl="http://timestamp.digicert.com";>
+ <path>
+ <pathelement path="${jarfile}"/>
+ <pathelement path="${jarsourcesfile}"/>
+ <pathelement path="${jarjavadocfile}"/>
+ </path>
+ </signjar>
+ </target>
+ <target name="tar" depends="signjar">
+ <tar destfile="${release.tarball}" compression="gzip">
+ <tarfileset dir="." prefix="collector-${release.version}">
+ <include name="${jarfile}" />
+ <include name="${jarsourcesfile}" />
+ <include name="${jarjavadocfile}" />
+ <include name="build.xml" />
+ <include name="LICENSE" />
+ <include name="CERT" />
+ <include name="*.md" />
+ </tarfileset>
+ <tarfileset dir="${sources}"
+ prefix="collector-${release.version}/${sources}" />
+ <tarfileset dir="${resources}"
+ prefix="collector-${release.version}/${resources}" />
+ <tarfileset dir="${webappsources}"
+ prefix="collector-${release.version}/${webappsources}" />
+ <tarfileset dir="${testsources}"
+ prefix="collector-${release.version}/${testsources}" />
+ <tarfileset dir="${testresources}"
+ prefix="collector-${release.version}/${testresources}" />
+ <tarfileset dir="${libs}"
+ prefix="collector-${release.version}/${libs}" />
+ </tar>
+ </target>
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties">
<classpath refid="checkstyle.classpath" />
</taskdef>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits