From 21d1a9542dd1044ded94ea453a592d4b76dc60fb Mon Sep 17 00:00:00 2001 From: Twan Goosen Date: Wed, 6 Jul 2016 10:32:27 +0200 Subject: [PATCH 1/4] development branch: 1.2-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82afb4b..ab01eb8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 clarin.cmdi cmd-toolkit - 1.2.0 + 1.2-SNAPSHOT CMDToolkit From 6031339e8f4af1583aec4d68431056b3cd38e337 Mon Sep 17 00:00:00 2001 From: Twan Goosen Date: Mon, 11 Jul 2016 17:08:43 +0200 Subject: [PATCH 2/4] updated readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0912ab2..41b2361 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Please be aware of the following: * Please develop the CMDI toolkit on branch `development`. * Changes ready for production should be merged into `master`. * The legacy CMDI 1.1 toolkit can be found in the branch `cmdi-1.1`. -* [`src/main/resources/toolkit/`](toolkit/) on `master` is being mirrored every 25 minutes at https://infra.clarin.eu/CMDI/1.x for use in production environments. -* [`toolkit/`](toolkit/) on `cmdi-1.1` is being mirrored every 25 minutes at https://infra.clarin.eu/cmd/ for use in production environments. +* The [toolkit](tree/master/src/main/resources/toolkit) section of tagged releases are also distributed via https://infra.clarin.eu/CMDI/ +* The current release (compatible with 1.2.0 onwards) is made available at https://infra.clarin.eu/CMDI/1.x/ [More information](https://www.clarin.eu/cmdi) From ede0d0a909a7227c33a72753016b502f297e15a9 Mon Sep 17 00:00:00 2001 From: Twan Goosen Date: Mon, 11 Jul 2016 17:09:38 +0200 Subject: [PATCH 3/4] fixed toolkit link in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41b2361..d633d99 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Please be aware of the following: * Please develop the CMDI toolkit on branch `development`. * Changes ready for production should be merged into `master`. * The legacy CMDI 1.1 toolkit can be found in the branch `cmdi-1.1`. -* The [toolkit](tree/master/src/main/resources/toolkit) section of tagged releases are also distributed via https://infra.clarin.eu/CMDI/ +* The [toolkit](src/main/resources/toolkit) section of tagged releases are also distributed via https://infra.clarin.eu/CMDI/ * The current release (compatible with 1.2.0 onwards) is made available at https://infra.clarin.eu/CMDI/1.x/ [More information](https://www.clarin.eu/cmdi) From 471b57e18f2f57d5ec827e60dc9ef50f4a716db4 Mon Sep 17 00:00:00 2001 From: Twan Goosen Date: Mon, 11 Jul 2016 17:11:37 +0200 Subject: [PATCH 4/4] version number --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab01eb8..82afb4b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 clarin.cmdi cmd-toolkit - 1.2-SNAPSHOT + 1.2.0 CMDToolkit