diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java index 26673040..4c67e71b 100644 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java +++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java @@ -191,7 +191,6 @@ public class AcceptanceTests { } @Test - @Ignore("Add a camden branch to the spring cloud release from sources") public void should_perform_a_meta_release_of_sc_release_and_consul() throws Exception { // simulates an org Map versions = new HashMap<>(); diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD index cb089cd8..d178fa1c 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD @@ -1 +1 @@ -ref: refs/heads/master +ref: refs/heads/Camden diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD index 56d1bb27..056f1ba9 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD @@ -1 +1 @@ -320597b84bb0312c15228c4d42f46c189b86ed90 +0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index index d976dd9f..bd47c447 100644 Binary files a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index and b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index differ diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD index 8fd77239..a5adcf4a 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD @@ -29,3 +29,6 @@ b566ab3bea0506bccaa10f83784a41673606d6ee 320597b84bb0312c15228c4d42f46c189b86ed9 0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 29dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 Marcin Grzejszczak 1489664824 +0100 checkout: moving from master to Dalston.RC1 29dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 e4d44f5a1a67429e37edbb57d3da96bb6717266c Marcin Grzejszczak 1489668889 +0100 checkout: moving from Dalston.RC1 to vCamden.M1 e4d44f5a1a67429e37edbb57d3da96bb6717266c 0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 Marcin Grzejszczak 1489668895 +0100 checkout: moving from e4d44f5a1a67429e37edbb57d3da96bb6717266c to master +0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 Marcin Grzejszczak 1530201218 +0200 reset: moving to HEAD +0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 320597b84bb0312c15228c4d42f46c189b86ed90 Marcin Grzejszczak 1530201221 +0200 checkout: moving from master to Camden.x +320597b84bb0312c15228c4d42f46c189b86ed90 320597b84bb0312c15228c4d42f46c189b86ed90 Marcin Grzejszczak 1530201227 +0200 checkout: moving from Camden.x to Camden diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden new file mode 100644 index 00000000..4d0583a3 --- /dev/null +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 320597b84bb0312c15228c4d42f46c189b86ed90 Marcin Grzejszczak 1530201227 +0200 branch: Created from HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash index 231713ad..fb6b8fc8 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 9d396e0bebeba62d284c8539c952f17d764647d1 Marcin Grzejszczak 1481128706 +0100 WIP on Camden.x: c8bb589 Bump versions for next release +9d396e0bebeba62d284c8539c952f17d764647d1 ae4c7b35356cd1bd371c78ad0ba7d86fdea7653a Marcin Grzejszczak 1530201217 +0200 WIP on master: 0ccd283 Updating Boot to 1.5.3.BS diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 new file mode 100644 index 00000000..8d290cea Binary files /dev/null and b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 differ diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/93/61257d96daa4f989536719da2bf594cbb64690 b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/93/61257d96daa4f989536719da2bf594cbb64690 new file mode 100644 index 00000000..14116e59 Binary files /dev/null and b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/93/61257d96daa4f989536719da2bf594cbb64690 differ diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a new file mode 100644 index 00000000..11780891 Binary files /dev/null and b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a differ diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Camden b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Camden new file mode 100644 index 00000000..56d1bb27 --- /dev/null +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Camden @@ -0,0 +1 @@ +320597b84bb0312c15228c4d42f46c189b86ed90 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/stash b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/stash index 95ab3e08..92d2d00e 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/stash +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/stash @@ -1 +1 @@ -9d396e0bebeba62d284c8539c952f17d764647d1 +ae4c7b35356cd1bd371c78ad0ba7d86fdea7653a