From dff12c18719ad9c7b92c935a2c8420305d0f14be Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:02:03 +0200 Subject: [PATCH 1/8] [maven-release-plugin] prepare branch master --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3328caa..7c511ae 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,6 @@ scm:git:git@github.com:visze/simdrom.git scm:git:https://github.com/visze/simdrom.git scm:git:https://github.com/visze/simdrom.git - v0.0.2 + master From 5c92c8addddc81c41a294fd9617bc71531438341 Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:09:35 +0200 Subject: [PATCH 2/8] [maven-release-plugin] prepare branch releases/0.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c511ae..85e54ee 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,6 @@ scm:git:git@github.com:visze/simdrom.git scm:git:https://github.com/visze/simdrom.git scm:git:https://github.com/visze/simdrom.git - master + releases/0.0.3 From 330d6b6f782b25f566fab0e63511e6258c77aeac Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:09:46 +0200 Subject: [PATCH 3/8] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- simdrom-cli/pom.xml | 2 +- simdrom-core/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 85e54ee..f407e0d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.charite.compbio simdrom pom - 0.0.3-SNAPSHOT + 0.0.4-SNAPSHOT simdrom UTF-8 @@ -79,6 +79,6 @@ scm:git:git@github.com:visze/simdrom.git scm:git:https://github.com/visze/simdrom.git scm:git:https://github.com/visze/simdrom.git - releases/0.0.3 + master diff --git a/simdrom-cli/pom.xml b/simdrom-cli/pom.xml index 4531434..c4ab680 100644 --- a/simdrom-cli/pom.xml +++ b/simdrom-cli/pom.xml @@ -3,7 +3,7 @@ de.charite.compbio simdrom - 0.0.3-SNAPSHOT + 0.0.4-SNAPSHOT simdrom-cli jar diff --git a/simdrom-core/pom.xml b/simdrom-core/pom.xml index 22e2532..a885b77 100644 --- a/simdrom-core/pom.xml +++ b/simdrom-core/pom.xml @@ -4,7 +4,7 @@ de.charite.compbio simdrom - 0.0.3-SNAPSHOT + 0.0.4-SNAPSHOT simdrom-core simdrom-core From 070b6e3fab3d02f6933bdc7ba2759818c7dd2800 Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:40:41 +0200 Subject: [PATCH 4/8] fasfasd --- pom.xml | 41 +++++++++++++++++++++++++++++++++++------ simdrom-cli/pom.xml | 4 ++-- simdrom-core/pom.xml | 2 +- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index f407e0d..c0548ac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.charite.compbio simdrom pom - 0.0.4-SNAPSHOT + 0.0.3-SNAPSHOT simdrom UTF-8 @@ -68,11 +68,40 @@ true - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - + + external.atlassian.jgitflow + jgitflow-maven-plugin + 1.0-m5.1 + + + true + + true + + true + + true + + true + + master + development + v + + + diff --git a/simdrom-cli/pom.xml b/simdrom-cli/pom.xml index c4ab680..e621737 100644 --- a/simdrom-cli/pom.xml +++ b/simdrom-cli/pom.xml @@ -3,7 +3,7 @@ de.charite.compbio simdrom - 0.0.4-SNAPSHOT + 0.0.3-SNAPSHOT simdrom-cli jar @@ -14,7 +14,7 @@ de.charite.compbio simdrom-core - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT commons-cli diff --git a/simdrom-core/pom.xml b/simdrom-core/pom.xml index a885b77..22e2532 100644 --- a/simdrom-core/pom.xml +++ b/simdrom-core/pom.xml @@ -4,7 +4,7 @@ de.charite.compbio simdrom - 0.0.4-SNAPSHOT + 0.0.3-SNAPSHOT simdrom-core simdrom-core From 63453e8b181d06231ed5afad98b4708090ac89ff Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:40:41 +0200 Subject: [PATCH 5/8] fasfasd From c94c7fa7ea5adea2f6847e70d9a6d451d4f4e12e Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:44:08 +0200 Subject: [PATCH 6/8] bla2 --- pom.xml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index c0548ac..cf4edfa 100644 --- a/pom.xml +++ b/pom.xml @@ -73,28 +73,9 @@ jgitflow-maven-plugin 1.0-m5.1 + https://github.com/visze/simdrom.git true - - true - - true - - true - - true master development From 49d18d4dbcf90f5c78840ee9e9b7cf241e234f6b Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:49:38 +0200 Subject: [PATCH 7/8] sdcfasdf --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cf4edfa..d64c4fa 100644 --- a/pom.xml +++ b/pom.xml @@ -86,9 +86,8 @@ - scm:git:git@github.com:visze/simdrom.git + scm:git:https://github.com/visze/simdrom.git scm:git:https://github.com/visze/simdrom.git scm:git:https://github.com/visze/simdrom.git - master From 0cf15b83d47655678329a60ae343d2927000ec48 Mon Sep 17 00:00:00 2001 From: Max Schubach Date: Wed, 20 Jul 2016 17:56:42 +0200 Subject: [PATCH 8/8] sdafasd --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index d64c4fa..5ccc186 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,17 @@ simdrom-core + + + github-simdrom + https://github.com/visze/simdrom.git + + + github-simdrom + https://github.com/visze/simdrom.git + + +