SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2024-06-18 10:19:59 -04:00
parent 4511bc6ead bb6f5a6353
commit fce14f666f
616 changed files with 6029 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
docs/src/main/asciidoc/spring-cloud-release-process.adoc
View File

@@ -23,18 +23,18 @@ git pull origin jenkins-releaser-config
[start=2]
. Find the most recent release in the desired release train. In this document we will use: 2020_0_x.properties
. Create a copy of that file and set the name of the copy to <name-of-the-release>.properties (for example: 2020_0_2.properties)
. Edit this file and update all project versions to their latest release.
.. The latest release for each project can be determined by navigating to the individual Github project and checking for commits since the last release, where the last release is marked by a commit from spring-cloud-issues. If there are commits since the last release, change the value in the properties file. If there are no commits since the last release (i.e. the last commit is from spring-cloud-issues) then do not increment the value.
. Edit this file and update all project versions to their latest release.
.. The latest release for each project can be determined by navigating to the individual Github project and checking for commits since the last release, where the last release is marked by a commit from spring-cloud-issues. If there are commits since the last release, change the value in the properties file. If there are no commits since the last release (i.e. the last commit is from spring-cloud-issues) then do not increment the value.
. Make a note of the projects that did not increment their version number, as those projects will need to be specified later in the “RELEASER_PROJECTS_TO_SKIP” field in the Jenkins project spring-cloud-<release train>-meta-releaser
NOTE: Sometimes the release value for a project will need to be incremented by more than one,
NOTE: Sometimes the release value for a project will need to be incremented by more than one,
for example if there was a release for an individual project due to a CVE and there were commits made after that release. To determine the new version number, look for the latest version in the commit history from spring-cloud-issues.
[start=6]
. Commit the change
. Push the changes back to github. For example:
```bash
git push origin jenkins-releaser-config
git push origin jenkins-releaser-config
```
[start=8]
. Request that project owners verify versions in the Spring Cloud Slack room by sharing a github link to the 2020_0_x.properties you just pushed.
@@ -43,12 +43,12 @@ git push origin jenkins-releaser-config
NOTE: The builder project is required to run first because it is required for spring-cloud-function and spring-cloud-stream. All other spring-cloud builds will run after spring-cloud-function and spring-cloud-stream have performed a successful release
[start=10]
. Click `Build With Parameters` on the left side of page
. Click `Build With Parameters` on the left side of page
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/build-releaser-buildwithparams.png[Build With Params]
[start=11]
. In the RELEASE_VERSION column enter the name of the file you created without the properties extension
. In the RELEASE_VERSION column enter the name of the file you created without the properties extension
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/build-releaser-setreleaseversion.png[Set The Version]
@@ -57,12 +57,12 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/build-releaser-selectdryrun.png[Set Dry Run]
[start=13]
. Once the dry run is successfully complete we need to remove all of the artifacts from the dry run.
To do this select the `spring-cloud-purge-worker-artifacts-releaser` job from the list of jobs.
. Once the purge work has completed successfully,
. Once the dry run is successfully complete we need to remove all of the artifacts from the dry run.
To do this select the `spring-cloud-purge-worker-artifacts-releaser` job from the list of jobs.
. Once the purge work has completed successfully,
. Select Rebuild Last option on the left side of the page.
. Now go to the `spring-cloud-build-<release train>-version-releaser` job on Jenkins
, Select the last build
, Select the last build
. When build page appears click the `Rebuild` option.
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/build-releaser-selectlastrun.png[Select Last Run]
@@ -74,12 +74,12 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools
. Once Spring Cloud Stream and Function projects are released verify that all other builds are succeeding
. Now go to the `Spring-cloud-<release train>-meta-releaser` job on Jenkins. For example: `spring-cloud-Kilburn-meta-releaser`
. Click `Build With Parameters` on the left side of page
. Click `Build With Parameters` on the left side of page
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/meta-releaser-buildwithparameters.png[Build With Params]
[start=4]
. Update RELEASE_VERSION with the current release and corresponds to the release file.
. Update RELEASE_VERSION with the current release and corresponds to the release file.
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/meta-releaser-setreleaseversion.png[Set The Version]
@@ -100,7 +100,7 @@ NOTE: Spring Cloud K8’s Integration tests may time out. Restart the build.
Select Rebuild Last option on the left side of the page.
[start=8]
. Upon a successful "DRY_RUN".
. Upon a successful "DRY_RUN".
. Click "Rebuild Last" option on the left side of the page.
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/meta-releaser-rebuildlast.png[Rebuild Last]
@@ -110,3 +110,69 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools
. Deselect “DRY_RUN” then click the build button.
. Clear the Start_From field
. Click Rebuild
=== Commercial Releases
See https://docs.google.com/document/d/10pk6b2Cy0OW9fzFKEHSRIys-2Z_rseqnu7CIYFXnJoM/edit#heading=h.slor8nyo3f1n[this document] from Trevor for more information on the requirement to create release bundles
and distribute the release artifacts to the edge repository.
==== Creating and Distributing Release Bundles
The releaser will create release bundles for individual project releases as well as when doing a release for the entire release train.
Release bundles and distribution of those bundles are disabled by default.
To enable the creation of project release bundles set `releaser.bundles.create-project-release-bundle=true`.
The task which creates individual project release bundles, `CreateProjectReleaseBundlePostReleaseTask`, is run when doing a
release of an individual project AND when doing a release train release.
To enable the creation of release train release bundles set `releaser.bundles.distribute-release-train-source-bundle`.
The task which creates a release train source bundle, `CreateReleaseTrainReleaseBundlePostReleaseTask`, is run as a release train
`PostReleaseTask`.
To distribute a project release bundle to the edge repo you must set `releaser.bundles.distribute-project-release-bundle=true`.
The task which distributes the release bundle to the edge repo, `DistributeProjectReleaseBundleTask`, runs as a project post release
task and runs after `CreateProjectReleaseBundlePostReleaseTask`. Unlike `CreateProjectReleaseBundlePostReleaseTask`, `DistributeProjectReleaseBundleTask`
*should not* be run during a release train release. This is because distributing the release train source release bundle will take care of
distributing all the individual project release bundles.
To distribute a release train source bundle to the edge repo you must set `releaser.bundles.distribute-release-train-source-bundle=true`.
The task which distributes release train release source bundles, `DistributeReleaseTrainSourceBundleTask`, runs as a release train post
release task.
*Release bundles and distribution of those bundles only occurs `releaser.commercial=true`, it is not a snapshot release, and is not a dry run.*
NOTE: Distribution of release bundles to the edge repo can only be done on a CI system like Jenkins.
==== Creating and Distributing Release Bundles On Jenkins
Our Jenkins jobs have been updated to allow the creation and distribution of release bundles for commercial releases.
When releasing individual projects you will see 2 new post release tasks in the job options
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/project_release_bundles.png[Project Release Bundles]
When these options are checked the correct properties will be passed to the releaser when run to create and distribute release bundles for an individual project release.
If you just want to create and distribute the release bundles for an individual project without doing an entire release make sure the two check boxes are checked and then
add `createReleaseBundle,distributeProjectReleaseBundleTask` in the `TASK_NAMES` field and specify the `RELEASE_VERSION` you want to create and distribute the release bundles for.
Similar options exist for the Jenkins jobs for the meta-release.
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-release-tools/main/docs/src/main/asciidoc/images/meta_release_release_bundles.png[Release Train Source Release Bundles]
If you just want to create the release train source release bundles and distribute them without doing an entire release you can select `RELEASER_POST_RELEASE_ONLY`, uncheck the other post
release tasks in the job configuration, but leaving `RELEASER_PUBLISH_RELEASE_BUNDLES` and `DISTRIBUTE_RELEASE_BUNDLES` checked.
==== Verify Distribution Of Artifacts
Packages will be distributed to the edge repo at https://packages.broadcom.com/artifactory/spring-enterprise/org/springframework/cloud/[https://packages.broadcom.com/artifactory/spring-enterprise/org/springframework/cloud/].
To authenticate to that repo and verify the artifacts are present follow the instructions here[https://docs.vmware.com/en/Tanzu-Spring-Runtime/Commercial/Tanzu-Spring-Runtime/guide-artifact-repository-administrators.html#access-commercial-subscription].
NOTE: For Broadcom employees access to the Broadcom Customer Support Portal can be found under Okta.

2
projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudStreamMavenBomParser.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

4
projects/spring-cloud/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2013-2019 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,

5
projects/spring-cloud/src/test/java/releaser/cloud/SpringCloudReleaserProperties.java
View File

@@ -28,7 +28,10 @@ import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
import org.springframework.core.io.FileSystemResource;
public class SpringCloudReleaserProperties {
public final class SpringCloudReleaserProperties {
private SpringCloudReleaserProperties() {
}
public static ReleaserProperties get() {
try {

1
projects/spring-cloud/src/test/java/releaser/cloud/docs/TestUtils.java
View File

@@ -33,6 +33,7 @@ public final class TestUtils {
prepareLocalRepo("target/test-classes/projects/", "spring-cloud-core-tests");
prepareLocalRepo("target/test-classes/projects/", "spring-cloud-release");
prepareLocalRepo("target/test-classes/projects/", "spring-cloud-consul");
prepareLocalRepo("target/test-classes/projects/", "spring-cloud-consul-commercial");
prepareLocalRepo("target/test-classes/projects/", "spring-cloud-static");
}

5
projects/spring-cloud/src/test/java/releaser/cloud/github/SpringCloudGithubIssuesAccessor.java
View File

@@ -20,7 +20,10 @@ import org.kohsuke.github.GitHub;
import releaser.internal.ReleaserProperties;
import releaser.internal.github.CustomGithubIssues;
public class SpringCloudGithubIssuesAccessor {
public final class SpringCloudGithubIssuesAccessor {
private SpringCloudGithubIssuesAccessor() {
}
public static CustomGithubIssues springCloud(GitHub github, ReleaserProperties releaserProperties) {
return new SpringCloudGithubIssues(github, releaserProperties);

4
projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/AbstractSpringCloudMetaAcceptanceTests.java
View File

@@ -28,6 +28,8 @@ public class AbstractSpringCloudMetaAcceptanceTests extends AbstractSpringMetaRe
public File springCloudConsulProject;
public File springCloudConsulCommercialProject;
public File springCloudBuildProject;
@BeforeEach
@@ -36,6 +38,8 @@ public class AbstractSpringCloudMetaAcceptanceTests extends AbstractSpringMetaRe
AbstractSpringCloudMetaAcceptanceTests.class.getResource("/projects/spring-cloud-consul").toURI());
this.springCloudBuildProject = new File(
AbstractSpringCloudMetaAcceptanceTests.class.getResource("/projects/spring-cloud-build").toURI());
this.springCloudConsulCommercialProject = new File(AbstractSpringCloudMetaAcceptanceTests.class
.getResource("/projects/spring-cloud-consul-commercial").toURI());
}
public void consulPomParentVersionIsEqualTo(File project, String expected) {

58
projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java
View File

@@ -17,8 +17,10 @@
package releaser.cloud.spring.meta;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -26,10 +28,12 @@ import org.junit.jupiter.api.io.TempDir;
import org.mockito.BDDMockito;
import releaser.internal.Releaser;
import releaser.internal.ReleaserProperties;
import releaser.internal.commercial.ReleaseBundleCreator;
import releaser.internal.docs.DocumentationUpdater;
import releaser.internal.git.GitTestUtils;
import releaser.internal.options.OptionsBuilder;
import releaser.internal.postrelease.PostReleaseActions;
import releaser.internal.project.ProjectVersion;
import releaser.internal.project.Projects;
import releaser.internal.sagan.SaganClient;
import releaser.internal.sagan.SaganUpdater;
@@ -58,6 +62,9 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
/**
* @author Marcin Grzejszczak
@@ -83,17 +90,19 @@ public class SpringMetaReleaseAcceptanceTests extends AbstractSpringCloudMetaAcc
public void should_perform_a_meta_release_of_sc_release_and_consul(@TempDir File tempDirSpringCloudConsulOrigin,
@TempDir File tempDirSpringCloudConsulProject) throws Exception {
checkoutReleaseTrainBranch("/projects/spring-cloud-release/", "2022.0.x");
File origin = cloneToTemporaryDirectory(tempDirSpringCloudConsulOrigin, this.springCloudConsulProject);
File origin = cloneToTemporaryDirectory(tempDirSpringCloudConsulOrigin,
this.springCloudConsulCommercialProject);
assertThatClonedConsulProjectIsInSnapshots(origin);
File project = cloneToTemporaryDirectory(tempDirSpringCloudConsulProject, tmpFile("spring-cloud-consul"));
GitTestUtils.setOriginOnProjectToTmp(origin, project);
run(defaultRunner(),
properties("debugx=true")
.properties("test.metarelease=true", "releaser.git.create-release-notes-for-milestone=false")
.properties(metaReleaseArgs(project, tempDirTestSamplesProject, tempDirReleaseTrainDocs,
tempDirSpringCloud, tempDirReleaseTrainWiki, tempDirAllTestSample)
.bomBranch("v2022.0.2").addFixedVersions(v2022_0_4()).build()),
run(defaultRunner(), properties("debugx=true")
.properties("test.metarelease=true", "releaser.git.create-release-notes-for-milestone=false")
.properties(metaReleaseArgs(project, tempDirTestSamplesProject, tempDirReleaseTrainDocs,
tempDirSpringCloud, tempDirReleaseTrainWiki, tempDirAllTestSample).bomBranch("v2022.0.2")
.addFixedVersions(v2022_0_4()).distributeReleaseTrainSourceReleaseBundle(true)
.releaseTrainSourceReleaseBundle(true).projectReleaseBundle(true).commercial(true)
.build()),
context -> {
SpringReleaser releaser = context.getBean(SpringReleaser.class);
NonAssertingTestProjectGitHandler nonAssertingTestProjectGitHandler = context
@@ -102,6 +111,7 @@ public class SpringMetaReleaseAcceptanceTests extends AbstractSpringCloudMetaAcc
PostReleaseActions postReleaseActions = context.getBean(PostReleaseActions.class);
TestExecutionResultHandler testExecutionResultHandler = context
.getBean(TestExecutionResultHandler.class);
ReleaseBundleCreator creator = context.getBean(ReleaseBundleCreator.class);
ExecutionResult result = releaser.release(new OptionsBuilder().metaRelease(true).options());
@@ -115,10 +125,22 @@ public class SpringMetaReleaseAcceptanceTests extends AbstractSpringCloudMetaAcc
// don't want to verify the docs
thenAllStepsWereExecutedForEachProject(nonAssertingTestProjectGitHandler);
thenSaganWasCalled(saganUpdater);
then(clonedProject(nonAssertingTestProjectGitHandler, "spring-cloud-consul").tagList().call())
.extracting("name").contains("refs/tags/v4.0.2");
then(clonedProject(nonAssertingTestProjectGitHandler, "spring-cloud-consul-commercial").tagList()
.call()).extracting("name").contains("refs/tags/v4.0.2");
thenRunUpdatedTestsWereCalled(postReleaseActions);
thenUpdateReleaseTrainDocsWasCalled(postReleaseActions);
BDDMockito.then(creator).should(times(1))
.createReleaseTrainSourceBundle(List.of(new ProjectVersion("spring-cloud-consul", "4.0.2"),
new ProjectVersion("spring-cloud-starter-build", "2022.0.4")), "2022.0.4");
BDDMockito.then(creator).should(times(1)).createReleaseBundle(
List.of("org/springframework/cloud/spring-cloud-consul*",
"org/springframework/cloud/spring-cloud-starter-consul*"),
"4.0.2", "TNZ-spring-cloud-consul-commercial");
BDDMockito.then(creator).should(times(1)).distributeReleaseTrainSourceBundle("2022.0.4");
// This should never be called when releasing a release train since
// distributing a release train source bundle
// will distribute individual project release bundles
verify(creator, never()).distributeReleaseBundle(anyString(), anyString(), anyString());
});
}
@@ -375,11 +397,10 @@ public class SpringMetaReleaseAcceptanceTests extends AbstractSpringCloudMetaAcc
then(nonAssertingTestProjectGitHandler.clonedProjects).hasSize(1);
BDDMockito.then(firstTask).should()
.runTask(BDDMockito.argThat(arg -> arg.project.getName().equals("spring-cloud-consul")));
BDDMockito.then(firstTask).should(BDDMockito.never())
BDDMockito.then(firstTask).should(never())
.runTask(BDDMockito.argThat(arg -> arg.project.getName().equals("spring-cloud-release")));
BDDMockito.then(secondTask).should(BDDMockito.never()).runTask(BDDMockito.any(Arguments.class));
BDDMockito.then(postReleaseTask).should(BDDMockito.never())
.runTask(BDDMockito.any(Arguments.class));
BDDMockito.then(secondTask).should(never()).runTask(BDDMockito.any(Arguments.class));
BDDMockito.then(postReleaseTask).should(never()).runTask(BDDMockito.any(Arguments.class));
});
}
@@ -405,7 +426,7 @@ public class SpringMetaReleaseAcceptanceTests extends AbstractSpringCloudMetaAcc
}
private void thenBuildWasNeverCalledFor(BuildProjectReleaseTask build, String projectName) {
BDDMockito.then(build).should(BDDMockito.never())
BDDMockito.then(build).should(never())
.apply(argThat(argument -> argument.originalVersion.projectName.equals(projectName)
|| argument.project.getAbsolutePath().endsWith(projectName)));
}
@@ -439,6 +460,15 @@ public class SpringMetaReleaseAcceptanceTests extends AbstractSpringCloudMetaAcc
return saganClient;
}
@Bean
ReleaseBundleCreator testReleaseBundleCreator() throws IOException {
ReleaseBundleCreator creator = BDDMockito.mock(ReleaseBundleCreator.class);
given(creator.createReleaseBundle(any(), anyString(), anyString())).willReturn(true);
given(creator.createReleaseTrainSourceBundle(any(), anyString())).willReturn(true);
given(creator.distributeReleaseTrainSourceBundle(anyString())).willReturn(true);
return creator;
}
@Bean
@ConditionalOnProperty(value = "test.mockBuild", havingValue = "true")
BuildProjectReleaseTask mockedBuildProjectReleaseTask(Releaser releaser) {

29
projects/spring-cloud/src/test/java/releaser/cloud/spring/single/SpringSingleProjectAcceptanceTests.java
View File

@@ -17,8 +17,10 @@
package releaser.cloud.spring.single;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.assertj.core.api.BDDAssertions;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -27,6 +29,7 @@ import org.junit.jupiter.api.io.TempDir;
import org.mockito.BDDMockito;
import releaser.cloud.spring.AbstractSpringCloudAcceptanceTests;
import releaser.internal.ReleaserProperties;
import releaser.internal.commercial.ReleaseBundleCreator;
import releaser.internal.docs.DocumentationUpdater;
import releaser.internal.git.GitTestUtils;
import releaser.internal.github.ProjectGitHubHandler;
@@ -53,6 +56,7 @@ import static org.assertj.core.api.BDDAssertions.then;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
/**
@@ -116,7 +120,8 @@ public class SpringSingleProjectAcceptanceTests extends AbstractSpringCloudAccep
properties("debugx=true").properties(new ArgsBuilder(project, tempDirTestSamplesProject,
tempDirReleaseTrainDocs, tempDirSpringCloud, tempDirReleaseTrainWiki, tempDirAllTestSample)
.releaseTrainUrl("/projects/spring-cloud-release/").bomBranch("v2022.0.3")
.expectedVersion("4.0.2").build()),
.expectedVersion("4.0.2").commercial(true).projectReleaseBundle(true)
.distributeProjectReleaseBundle(true).build()),
context -> {
SpringReleaser releaser = context.getBean(SpringReleaser.class);
TestProjectGitHubHandler gitHubHandler = context.getBean(TestProjectGitHubHandler.class);
@@ -124,6 +129,7 @@ public class SpringSingleProjectAcceptanceTests extends AbstractSpringCloudAccep
PostReleaseActions postReleaseActions = context.getBean(PostReleaseActions.class);
TestExecutionResultHandler testExecutionResultHandler = context
.getBean(TestExecutionResultHandler.class);
ReleaseBundleCreator releaseBundleCreator = context.getBean(ReleaseBundleCreator.class);
ExecutionResult result = releaser.release(new OptionsBuilder().interactive(true).options());
@@ -153,6 +159,13 @@ public class SpringSingleProjectAcceptanceTests extends AbstractSpringCloudAccep
// print results
testExecutionResultHandler.accept(result);
then(testExecutionResultHandler.exitedSuccessOrUnstable).isTrue();
BDDMockito.then(releaseBundleCreator).should(times(1)).createReleaseBundle(
List.of("org/springframework/cloud/spring-cloud-consul*",
"org/springframework/cloud/spring-cloud-starter-consul*"),
"4.0.2", "TNZ-spring-cloud-consul-commercial");
BDDMockito.then(releaseBundleCreator).should(times(1))
.distributeProjectReleaseBundle("TNZ-spring-cloud-consul-commercial", "4.0.2");
});
}
@@ -346,16 +359,24 @@ public class SpringSingleProjectAcceptanceTests extends AbstractSpringCloudAccep
@Bean
SaganClient testSaganClient() {
SaganClient saganClient = BDDMockito.mock(SaganClient.class);
SaganClient saganClient = mock(SaganClient.class);
given(saganClient.getProject(anyString())).willReturn(newProject());
given(saganClient.addRelease(anyString(), any())).willReturn(true);
given(saganClient.deleteRelease(anyString(), anyString())).willReturn(true);
return saganClient;
}
@Bean
ReleaseBundleCreator testReleaseBundleCreator() throws IOException {
ReleaseBundleCreator releaseBundleCreator = mock(ReleaseBundleCreator.class);
given(releaseBundleCreator.createReleaseBundle(any(), anyString(), anyString())).willReturn(true);
given(releaseBundleCreator.distributeProjectReleaseBundle(anyString(), anyString())).willReturn(true);
return releaseBundleCreator;
}
@Bean
PostReleaseActions myPostReleaseActions() {
return BDDMockito.mock(PostReleaseActions.class);
return mock(PostReleaseActions.class);
}
@Bean
@@ -374,7 +395,7 @@ public class SpringSingleProjectAcceptanceTests extends AbstractSpringCloudAccep
@Bean
DocumentationUpdater testDocumentationUpdater() {
return BDDMockito.mock(DocumentationUpdater.class);
return mock(DocumentationUpdater.class);
}
}

16
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/.gitignore vendored Normal file
View File

@@ -0,0 +1,16 @@
*~
#*
*#
.#*
.classpath
.project
.settings/
.springBeans
target/
_site/
.idea
*.iml
*.ipr
.factorypath
*.swp
/consul

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/COMMIT_EDITMSG Normal file
View File

@@ -0,0 +1 @@
Removed deployer

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/HEAD Normal file
View File

@@ -0,0 +1 @@
ref: refs/heads/master

7
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/config Normal file
View File

@@ -0,0 +1,7 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/description Normal file
View File

@@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/index Normal file
View File

Binary file not shown.

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/logs/HEAD Normal file
View File

@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 2e289de071592d4d361957e59cc0485c5e1941a0 Marcin Grzejszczak <marcin@grzejszczak.pl> 1489136624 +0100 commit (initial): Initial commit
2e289de071592d4d361957e59cc0485c5e1941a0 386e26ed81099e05b791bbea27a0236abc42a455 Marcin Grzejszczak <marcin@grzejszczak.pl> 1489413813 +0100 commit: Removed deployer

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/logs/refs/heads/master Normal file
View File

@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 2e289de071592d4d361957e59cc0485c5e1941a0 Marcin Grzejszczak <marcin@grzejszczak.pl> 1489136624 +0100 commit (initial): Initial commit
2e289de071592d4d361957e59cc0485c5e1941a0 386e26ed81099e05b791bbea27a0236abc42a455 Marcin Grzejszczak <marcin@grzejszczak.pl> 1489413813 +0100 commit: Removed deployer

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/14/e930a30601eee731b77d0a84499aaf56be8b26 Normal file
View File

Binary file not shown.

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/2e/289de071592d4d361957e59cc0485c5e1941a0 Normal file
View File

@@ -0,0 +1,2 @@
x<01><>1<0E>0 @Q<><51><EFBFBD>;<12><><EFBFBD>"<12><><03>0<EFBFBD><30>@Ӣ<10><><1E> <1C><><0F>˜s<CB9C><73>1<EFBFBD>jQ<05>L<EFBFBD>:[7D
<EFBFBD><EFBFBD><EFBFBD>CV78<37><38><EFBFBD>!FQ1<51><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <0E><><EFBFBD>դ<EFBFBD>vyi<79><69><EFBFBD>m<EFBFBD>c<0F><>Q<>am<61>Z#˻<><EFBFBD>9N<39>&<1E>˙W<>B<EFBFBD>

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/37/296724b949a9c2126e0c3e2e7bf5e5d7678802 Normal file
View File

Binary file not shown.

3
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/38/6e26ed81099e05b791bbea27a0236abc42a455 Normal file
View File

@@ -0,0 +1,3 @@
x<01><>=
1<06>s<EFBFBD><73><EFBFBD>$/<2F>&D<><44>l<EFBFBD>A|<7C><><EFBFBD>u<EFBFBD><75>
<EFBFBD><EFBFBD>`;0<>H<EFBFBD>u<EFBFBD>Q<EFBFBD><51><EFBFBD>X<01>"q<13><><EFBFBD>sf!K

4
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/3f/e60ad83d20b9fcc485d1f4a07c84f81a4820f9 Normal file
View File

@@ -0,0 +1,4 @@
x<01>U<EFBFBD>o<EFBFBD>0<10><><EFBFBD>+L<>#<23>ۍV<><56>`1ic<69><63>!^<5E><><EFBFBD>;<3B>n<EFBFBD>
<EFBFBD><EFBFBD>sv<EFBFBD><1F><>
<09>><3E><>ww<77>}<7D><><EFBFBD><EFBFBD>*!<21><>ӳ<17><><EFBFBD><EFBFBD><EFBFBD><02>J<0E>><3E>d<>2!<21><><EFBFBD><EFBFBD><EFBFBD>c<EFBFBD>68<36><38>Q<EFBFBD><51>7H-A<>4<EFBFBD>`fm9`<60><> <0B><><EFBFBD><<3C>Uz<55>F7<46><37>
<EFBFBD><EFBFBD>,9X<1A>FWUE<55>S<EFBFBD>;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/41/a65456b03d965616e321ae1c3d3afc44599cec Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/51/4eff03a3ead54a8a2cc950ace02f85baf24e35 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/7e/a3be063a4f6503fe63c3a1db5b653cf774ab97 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 Normal file
View File

Binary file not shown.

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/git/refs/heads/master Normal file
View File

@@ -0,0 +1 @@
386e26ed81099e05b791bbea27a0236abc42a455

221
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/pom.xml Normal file
View File

@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Consul</name>
<description>Spring Cloud Consul</description>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.1.BUILD-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<properties>
<spring-cloud-bus.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-commons.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-netflix.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-stream.version>Chelsea.BUILD-SNAPSHOT</spring-cloud-stream.version>
<gson.version>2.3.1</gson.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.5</httpcore.version>
<joda-time.version>2.7</joda-time.version>
</properties>
<scm>
<url>https://github.com/spring-cloud/spring-cloud-consul</url>
<connection>scm:git:git://github.com/spring-cloud/spring-cloud-consul.git</connection>
<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-consul.git</developerConnection>
<tag>HEAD</tag>
</scm>
<modules>
<module>spring-cloud-consul-dependencies</module>
<module>spring-cloud-consul-core</module>
<module>spring-cloud-consul-config</module>
<module>spring-cloud-consul-discovery</module>
<module>spring-cloud-consul-binder</module>
<module>spring-cloud-consul-sample</module>
<module>spring-cloud-starter-consul</module>
<module>spring-cloud-starter-consul-bus</module>
<module>spring-cloud-starter-consul-config</module>
<module>spring-cloud-starter-consul-discovery</module>
<module>spring-cloud-starter-consul-all</module>
<module>docs</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul-dependencies</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>${spring-cloud-deployer.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-test</artifactId>
<version>${spring-cloud-stream.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>${spring-cloud-stream.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-bus-dependencies</artifactId>
<version>${spring-cloud-bus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons-dependencies</artifactId>
<version>${spring-cloud-commons.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-dependencies</artifactId>
<version>${spring-cloud-config.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-dependencies</artifactId>
<version>${spring-cloud-netflix.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- required by com.ecwid.consul but not as a pom dependency -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<!-- force httpclient version -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<profiles>
<profile>
<id>spring</id>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/libs-release-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>

57
projects/spring-cloud/src/test/resources/projects/spring-cloud-consul-commercial/spring-cloud-starter-consul/pom.xml Normal file
View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul</artifactId>
<name>Spring Cloud Starter Consul</name>
<description>Spring Cloud Starter Consul</description>
<url>https://projects.spring.io/spring-cloud</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>https://www.spring.io</url>
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul-core</artifactId>
</dependency>
<dependency>
<groupId>com.ecwid.consul</groupId>
<artifactId>consul-api</artifactId>
</dependency>
<!-- required by com.ecwid.consul but not as a pom dependency -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
</dependencies>
</project>

24
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/.editorconfig Normal file
View File

@@ -0,0 +1,24 @@
root = true
[*.java]
indent_style = tab
indent_size = 4
continuation_indent_size = 8
[*.groovy]
indent_style = tab
indent_size = 4
continuation_indent_size = 8
[*.xml]
indent_style = tab
indent_size = 4
continuation_indent_size = 8
[*.yml]
indent_style = space
indent_size = 2
[*.yaml]
indent_style = space
indent_size = 2

18
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/.gitignore vendored Normal file
View File

@@ -0,0 +1,18 @@
*~
#*
*#
.#*
.classpath
.project
.settings
.springBeans
.gradle
build
bin
target/
.idea
*.iml
*.ipr
*.iws
.factorypath
.flattened-pom.xml

202
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/LICENSE.txt Normal file
View File

@@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

292
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/README.adoc Normal file
View File

@@ -0,0 +1,292 @@
////
DO NOT EDIT THIS FILE. IT WAS GENERATED.
Manual changes to this file will be lost when it is generated again.
Edit the files in the src/main/asciidoc/ directory instead.
////
Spring Cloud Release Train is a curated set of dependencies across a
range of Spring Cloud projects. You consume it by using the
spring-cloud-dependencies POM to manage dependencies in Maven or
Gradle. The release trains have names, not versions, to avoid
confusion with the sub-projects. The names are an alphabetic sequence
(so you can sort them chronologically) with names of London Tube
stations ("Angel" is the first release, "Brixton" is the second).
== Generating release train documentation
In order to generate the release train documentation, please update the project with versions for a given release train and then execute the following command:
```bash
$ ./mvnw clean install -Pdocs,train-docs -pl train-docs
```
In order to upload the documentation to the documentation server just execute the following command:
```bash
$ ./mvnw clean deploy -Pdocs,train-docs -pl train-docs
```
IMPORTANT: If you're releasing milestones don't forget to add `-Pmilestone` and if GA `-Pcentral`.
== Contributing
:spring-cloud-build-branch: master
Spring Cloud is released under the non-restrictive Apache 2.0 license,
and follows a very standard Github development process, using Github
tracker for issues and merging pull requests into master. If you want
to contribute even something trivial please do not hesitate, but
follow the guidelines below.
=== Sign the Contributor License Agreement
Before we accept a non-trivial patch or pull request we will need you to sign the
https://cla.pivotal.io/sign/spring[Contributor License Agreement].
Signing the contributor's agreement does not grant anyone commit rights to the main
repository, but it does mean that we can accept your contributions, and you will get an
author credit if we do. Active contributors might be asked to join the core team, and
given the ability to merge pull requests.
=== Code of Conduct
This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
conduct]. By participating, you are expected to uphold this code. Please report
unacceptable behavior to spring-code-of-conduct@pivotal.io.
=== Code Conventions and Housekeeping
None of these is essential for a pull request, but they will all help. They can also be
added after the original pull request but before a merge.
* Use the Spring Framework code format conventions. If you use Eclipse
you can import formatter settings using the
`eclipse-code-formatter.xml` file from the
https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
Cloud Build] project. If using IntelliJ, you can use the
https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
Plugin] to import the same file.
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
`@author` tag identifying you, and preferably at least a paragraph on what the class is
for.
* Add the ASF license header comment to all new `.java` files (copy from existing files
in the project)
* Add yourself as an `@author` to the .java files that you modify substantially (more
than cosmetic changes).
* Add some Javadocs and, if you change the namespace, some XSD doc elements.
* A few unit tests would help a lot as well -- someone has to do it.
* If no-one else is using your branch, please rebase it against the current master (or
other target branch in the main project).
* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
message (where XXXX is the issue number).
=== Checkstyle
Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
.spring-cloud-build-tools/
----
└── src
   ├── checkstyle
   │   └── checkstyle-suppressions.xml <3>
   └── main
   └── resources
   ├── checkstyle-header.txt <2>
   └── checkstyle.xml <1>
----
<1> Default Checkstyle rules
<2> File header setup
<3> Default suppression rules
==== Checkstyle configuration
Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
.pom.xml
----
<properties>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
<maven-checkstyle-plugin.failsOnViolation>true
</maven-checkstyle-plugin.failsOnViolation> <2>
<maven-checkstyle-plugin.includeTestSourceDirectory>true
</maven-checkstyle-plugin.includeTestSourceDirectory> <3>
</properties>
<build>
<plugins>
<plugin> <4>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
</plugin>
<plugin> <5>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
<reporting>
<plugins>
<plugin> <5>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</reporting>
</build>
----
<1> Fails the build upon Checkstyle errors
<2> Fails the build upon Checkstyle violations
<3> Checkstyle analyzes also the test sources
<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
<5> Add checkstyle plugin to your build and reporting phases
If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
.projectRoot/src/checkstyle/checkstyle-suppresions.xml
----
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
</suppressions>
----
It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
```bash
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
$ touch .springformat
```
=== IDE setup
==== Intellij IDEA
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
.spring-cloud-build-tools/
----
└── src
   ├── checkstyle
   │   └── checkstyle-suppressions.xml <3>
   └── main
   └── resources
   ├── checkstyle-header.txt <2>
   ├── checkstyle.xml <1>
   └── intellij
      ├── Intellij_Project_Defaults.xml <4>
      └── Intellij_Spring_Boot_Java_Conventions.xml <5>
----
<1> Default Checkstyle rules
<2> File header setup
<3> Default suppression rules
<4> Project defaults for Intellij that apply most of Checkstyle rules
<5> Project style conventions for Intellij that apply most of Checkstyle rules
.Code style
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
.Inspection profiles
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
.Checkstyle
To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
=== Duplicate Finder
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
==== Duplicate Finder configuration
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
.pom.xml
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
<ignoredClassPattern>.*module-info</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>
----
== Building and Deploying
Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. To install locally:
----
$ mvn install -s .settings.xml
----
and to deploy snapshots to repo.spring.io:
----
$ mvn install -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
----
for a RELEASE build use
----
$ mvn install -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-release-local
----
and for Maven Central use
----
$ mvn install -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2
----
(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent).

52
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/docs/pom.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-starter-docs</artifactId>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-build</artifactId>
<version>2023.0.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Spring Cloud Starter Docs</name>
<description>Spring Cloud Docs</description>
<properties>
<docs.main>spring-cloud-starters</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
</properties>
<profiles>
<profile>
<id>docs</id>
<build>
<plugins>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

34
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/docs/src/main/asciidoc/README.adoc Normal file
View File

@@ -0,0 +1,34 @@
include::intro.adoc[]
== Contributing
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
== Building and Deploying
Since there is no code to compile in the starters they should do not need to compile, but a compiler has to be available because they are built and deployed as JAR artifacts. To install locally:
----
$ mvn install -s .settings.xml
----
and to deploy snapshots to repo.spring.io:
----
$ mvn install -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
----
for a RELEASE build use
----
$ mvn install -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-release-local
----
and for Maven Central use
----
$ mvn install -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2
----
(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent).

330
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/docs/src/main/asciidoc/ghpages.sh Executable file
View File

@@ -0,0 +1,330 @@
#!/bin/bash -x
set -e
# Set default props like MAVEN_PATH, ROOT_FOLDER etc.
function set_default_props() {
# The script should be executed from the root folder
ROOT_FOLDER=`pwd`
echo "Current folder is ${ROOT_FOLDER}"
if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
echo "You're not in the root folder of the project!"
exit 1
fi
# Prop that will let commit the changes
COMMIT_CHANGES="no"
MAVEN_PATH=${MAVEN_PATH:-}
echo "Path to Maven is [${MAVEN_PATH}]"
REPO_NAME=${PWD##*/}
echo "Repo name is [${REPO_NAME}]"
SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
}
# Check if gh-pages exists and docs have been built
function check_if_anything_to_sync() {
git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
echo "No gh-pages, so not syncing"
exit 0
fi
if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then
echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
exit 0
fi
}
function retrieve_current_branch() {
# Code getting the name of the current branch. For master we want to publish as we did until now
# https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
# If there is a branch already passed will reuse it - otherwise will try to find it
CURRENT_BRANCH=${BRANCH}
if [[ -z "${CURRENT_BRANCH}" ]] ; then
CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
fi
echo "Current branch is [${CURRENT_BRANCH}]"
git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
}
# Switches to the provided value of the release version. We always prefix it with `v`
function switch_to_tag() {
git checkout v${VERSION}
}
# Build the docs if switch is on
function build_docs_if_applicable() {
if [[ "${BUILD}" == "yes" ]] ; then
./mvnw clean install -P docs -pl docs -DskipTests
fi
}
# Get the name of the `docs.main` property
# Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
function retrieve_doc_properties() {
MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
-Dexec.executable="echo" \
-Dexec.args='${docs.main}' \
--non-recursive \
org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
WHITELISTED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
-Dexec.executable="echo" \
-Dexec.args="\${${WHITELIST_PROPERTY}}" \
org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-P docs \
-pl docs)
echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
}
# Stash any outstanding changes
function stash_changes() {
git diff-index --quiet HEAD && dirty=$? || (echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1")
if [ "$dirty" != "0" ]; then git stash; fi
}
# Switch to gh-pages branch to sync it with current branch
function add_docs_from_target() {
local DESTINATION_REPO_FOLDER
if [[ -z "${DESTINATION}" && -z "${CLONE}" ]] ; then
DESTINATION_REPO_FOLDER=${ROOT_FOLDER}
elif [[ "${CLONE}" == "yes" ]]; then
mkdir -p ${ROOT_FOLDER}/target
local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static
if [[ ! -e "${clonedStatic}/.git" ]]; then
echo "Cloning Spring Cloud Static to target"
git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && git checkout gh-pages
else
echo "Spring Cloud Static already cloned - will pull changes"
cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
fi
DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
mkdir -p ${DESTINATION_REPO_FOLDER}
else
if [[ ! -e "${DESTINATION}/.git" ]]; then
echo "[${DESTINATION}] is not a git repository"
exit 1
fi
DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
mkdir -p ${DESTINATION_REPO_FOLDER}
echo "Destination was provided [${DESTINATION}]"
fi
cd ${DESTINATION_REPO_FOLDER}
git checkout gh-pages
git pull origin gh-pages
# Add git branches
###################################################################
if [[ -z "${VERSION}" ]] ; then
copy_docs_for_current_version
else
copy_docs_for_provided_version
fi
commit_changes_if_applicable
}
# Copies the docs by using the retrieved properties from Maven build
function copy_docs_for_current_version() {
if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
echo -e "Current branch is master - will copy the current docs only to the root folder"
for f in docs/target/generated-docs/*; do
file=${f#docs/target/generated-docs/*}
if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
# Not ignored...
cp -rf $f ${ROOT_FOLDER}/
git add -A ${ROOT_FOLDER}/$file
fi
done
COMMIT_CHANGES="yes"
else
echo -e "Current branch is [${CURRENT_BRANCH}]"
# https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
for f in docs/target/generated-docs/*; do
file=${f#docs/target/generated-docs/*}
if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
# Not ignored...
# We want users to access 1.0.0.BUILD-SNAPSHOT/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
# We don't want to copy the spring-cloud-sleuth.html
# we want it to be converted to index.html
cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
else
cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file
fi
fi
done
COMMIT_CHANGES="yes"
else
echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
[docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
fi
fi
}
# Copies the docs by using the explicitly provided version
function copy_docs_for_provided_version() {
local FOLDER=${DESTINATION_REPO_FOLDER}/${VERSION}
mkdir -p ${FOLDER}
echo -e "Current tag is [v${VERSION}] Will copy the current docs to the [${FOLDER}] folder"
for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
copy_docs_for_branch ${file} ${FOLDER}
done
COMMIT_CHANGES="yes"
CURRENT_BRANCH="v${VERSION}"
}
# Copies the docs from target to the provided destination
# Params:
# $1 - file from target
# $2 - destination to which copy the files
function copy_docs_for_branch() {
local file=$1
local destination=$2
if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
# Not ignored...
# We want users to access 1.0.0.BUILD-SNAPSHOT/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
# We don't want to copy the spring-cloud-sleuth.html
# we want it to be converted to index.html
cp -rf $f ${destination}/index.html
git add -A ${destination}/index.html
else
cp -rf $f ${destination}
git add -A ${destination}/$file
fi
fi
}
function commit_changes_if_applicable() {
if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
COMMIT_SUCCESSFUL="no"
git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
# Uncomment the following push if you want to auto push to
# the gh-pages branch whenever you commit to master locally.
# This is a little extreme. Use with care!
###################################################################
if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
git push origin gh-pages
fi
fi
}
# Switch back to the previous branch and exit block
function checkout_previous_branch() {
# If -version was provided we need to come back to root project
cd ${ROOT_FOLDER}
git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
if [ "$dirty" != "0" ]; then git stash pop; fi
exit 0
}
# Assert if properties have been properly passed
function assert_properties() {
echo "VERSION [${VERSION}], DESTINATION [${DESTINATION}], CLONE [${CLONE}]"
if [[ "${VERSION}" != "" && (-z "${DESTINATION}" && -z "${CLONE}") ]] ; then echo "Version was set but destination / clone was not!"; exit 1;fi
if [[ ("${DESTINATION}" != "" && "${CLONE}" != "") && -z "${VERSION}" ]] ; then echo "Destination / clone was set but version was not!"; exit 1;fi
if [[ "${DESTINATION}" != "" && "${CLONE}" == "yes" ]] ; then echo "Destination and clone was set. Pick one!"; exit 1;fi
}
# Prints the usage
function print_usage() {
cat <<EOF
The idea of this script is to update gh-pages branch with the generated docs. Without any options
the script will work in the following manner:
- if there's no gh-pages / target for docs module then the script ends
- for master branch the generated docs are copied to the root of gh-pages branch
- for any other branch (if that branch is whitelisted) a subfolder with branch name is created
and docs are copied there
- if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
USAGE:
You can use the following options:
-v|--version - the script will apply the whole procedure for a particular library version
-d|--destination - the root of destination folder where the docs should be copied. You have to use the full path.
E.g. point to spring-cloud-static folder. Can't be used with (-c)
-b|--build - will run the standard build process after checking out the branch
-c|--clone - will automatically clone the spring-cloud-static repo instead of providing the destination.
Obviously can't be used with (-d)
EOF
}
# ==========================================
# ____ ____ _____ _____ _____ _______
# / ____|/ ____| __ \|_ _| __ \__ __|
# | (___ | | | |__) | | | | |__) | | |
# \___ \| | | _ / | | | ___/ | |
# ____) | |____| | \ \ _| |_| | | |
# |_____/ \_____|_| \_\_____|_| |_|
#
# ==========================================
while [[ $# > 0 ]]
do
key="$1"
case ${key} in
-v|--version)
VERSION="$2"
shift # past argument
;;
-d|--destination)
DESTINATION="$2"
shift # past argument
;;
-b|--build)
BUILD="yes"
;;
-c|--clone)
CLONE="yes"
;;
-h|--help)
print_usage
exit 0
;;
*)
echo "Invalid option: [$1]"
print_usage
exit 1
;;
esac
shift # past argument or value
done
assert_properties
set_default_props
check_if_anything_to_sync
if [[ -z "${VERSION}" ]] ; then
retrieve_current_branch
else
switch_to_tag
fi
build_docs_if_applicable
retrieve_doc_properties
stash_changes
add_docs_from_target
checkout_previous_branch

23
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/docs/src/main/asciidoc/intro.adoc Normal file
View File

@@ -0,0 +1,23 @@
Spring Cloud Release Train is a curated set of dependencies across a
range of Spring Cloud projects. You consume it by using the
spring-cloud-dependencies POM to manage dependencies in Maven or
Gradle. The release trains have names, not versions, to avoid
confusion with the sub-projects. The names are an alphabetic sequence
(so you can sort them chronologically) with names of London Tube
stations ("Angel" is the first release, "Brixton" is the second).
== Generating release train documentation
In order to generate the release train documentation, please update the project with versions for a given release train and then execute the following command:
```bash
$ ./mvnw clean install -Pdocs,train-docs -pl train-docs
```
In order to upload the documentation to the documentation server just execute the following command:
```bash
$ ./mvnw clean deploy -Pdocs,train-docs -pl train-docs
```
IMPORTANT: If you're releasing milestones don't forget to add `-Pmilestone` and if GA `-Pcentral`.

5
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/docs/src/main/asciidoc/spring-cloud-starters.adoc Normal file
View File

@@ -0,0 +1,5 @@
= Spring Cloud Release Train
include::intro.adoc[]
include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc[]

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/COMMIT_EDITMSG Normal file
View File

@@ -0,0 +1 @@
WIP

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/FETCH_HEAD Normal file
View File

@@ -0,0 +1 @@
6e3fe942d6d8e2bedc298097b06f944ff8613fa3 branch '2022.0.x' of github.com:spring-cloud/spring-cloud-release

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/HEAD Normal file
View File

@@ -0,0 +1 @@
ref: refs/heads/main

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/ORIG_HEAD Normal file
View File

@@ -0,0 +1 @@
310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a

17
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/config Normal file
View File

@@ -0,0 +1,17 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git@github.com:spring-cloud/spring-cloud-release.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "main"]
remote = origin
merge = refs/heads/main
[branch "2021.0.x"]
remote = origin
merge = refs/heads/2021.0.x
[branch "2022.0.x"]
remote = origin
merge = refs/heads/2022.0.x

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/description Normal file
View File

@@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

15
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/applypatch-msg.sample Executable file
View File

@@ -0,0 +1,15 @@
#!/bin/sh
#
# An example hook script to check the commit log message taken by
# applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit. The hook is
# allowed to edit the commit message file.
#
# To enable this hook, rename this file to "applypatch-msg".
. git-sh-setup
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
:

24
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/commit-msg.sample Executable file
View File

@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".
# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
# This example catches duplicate Signed-off-by lines.
test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}

173
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/fsmonitor-watchman.sample Executable file
View File

@@ -0,0 +1,173 @@
#!/usr/bin/perl
use strict;
use warnings;
use IPC::Open2;
# An example hook script to integrate Watchman
# (https://facebook.github.io/watchman/) with git to speed up detecting
# new and modified files.
#
# The hook is passed a version (currently 2) and last update token
# formatted as a string and outputs to stdout a new update token and
# all files that have been modified since the update token. Paths must
# be relative to the root of the working tree and separated by a single NUL.
#
# To enable this hook, rename this file to "query-watchman" and set
# 'git config core.fsmonitor .git/hooks/query-watchman'
#
my ($version, $last_update_token) = @ARGV;
# Uncomment for debugging
# print STDERR "$0 $version $last_update_token\n";
# Check the hook interface version
if ($version ne 2) {
die "Unsupported query-fsmonitor hook version '$version'.\n" .
"Falling back to scanning...\n";
}
my $git_work_tree = get_working_dir();
my $retry = 1;
my $json_pkg;
eval {
require JSON::XS;
$json_pkg = "JSON::XS";
1;
} or do {
require JSON::PP;
$json_pkg = "JSON::PP";
};
launch_watchman();
sub launch_watchman {
my $o = watchman_query();
if (is_work_tree_watched($o)) {
output_result($o->{clock}, @{$o->{files}});
}
}
sub output_result {
my ($clockid, @files) = @_;
# Uncomment for debugging watchman output
# open (my $fh, ">", ".git/watchman-output.out");
# binmode $fh, ":utf8";
# print $fh "$clockid\n@files\n";
# close $fh;
binmode STDOUT, ":utf8";
print $clockid;
print "\0";
local $, = "\0";
print @files;
}
sub watchman_clock {
my $response = qx/watchman clock "$git_work_tree"/;
die "Failed to get clock id on '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
return $json_pkg->new->utf8->decode($response);
}
sub watchman_query {
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
or die "open2() failed: $!\n" .
"Falling back to scanning...\n";
# In the query expression below we're asking for names of files that
# changed since $last_update_token but not from the .git folder.
#
# To accomplish this, we're using the "since" generator to use the
# recency index to select candidate nodes and "fields" to limit the
# output to file names only. Then we're using the "expression" term to
# further constrain the results.
if (substr($last_update_token, 0, 1) eq "c") {
$last_update_token = "\"$last_update_token\"";
}
my $query = <<" END";
["query", "$git_work_tree", {
"since": $last_update_token,
"fields": ["name"],
"expression": ["not", ["dirname", ".git"]]
}]
END
# Uncomment for debugging the watchman query
# open (my $fh, ">", ".git/watchman-query.json");
# print $fh $query;
# close $fh;
print CHLD_IN $query;
close CHLD_IN;
my $response = do {local $/; <CHLD_OUT>};
# Uncomment for debugging the watch response
# open ($fh, ">", ".git/watchman-response.json");
# print $fh $response;
# close $fh;
die "Watchman: command returned no output.\n" .
"Falling back to scanning...\n" if $response eq "";
die "Watchman: command returned invalid output: $response\n" .
"Falling back to scanning...\n" unless $response =~ /^\{/;
return $json_pkg->new->utf8->decode($response);
}
sub is_work_tree_watched {
my ($output) = @_;
my $error = $output->{error};
if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
$retry--;
my $response = qx/watchman watch "$git_work_tree"/;
die "Failed to make watchman watch '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
$output = $json_pkg->new->utf8->decode($response);
$error = $output->{error};
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
# Uncomment for debugging watchman output
# open (my $fh, ">", ".git/watchman-output.out");
# close $fh;
# Watchman will always return all files on the first query so
# return the fast "everything is dirty" flag to git and do the
# Watchman query just to get it over with now so we won't pay
# the cost in git to look up each individual file.
my $o = watchman_clock();
$error = $output->{error};
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
output_result($o->{clock}, ("/"));
$last_update_token = $o->{clock};
eval { launch_watchman() };
return 0;
}
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
return 1;
}
sub get_working_dir {
my $working_dir;
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
$working_dir = Win32::GetCwd();
$working_dir =~ tr/\\/\//;
} else {
require Cwd;
$working_dir = Cwd::cwd();
}
return $working_dir;
}

8
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/post-update.sample Executable file
View File

@@ -0,0 +1,8 @@
#!/bin/sh
#
# An example hook script to prepare a packed repository for use over
# dumb transports.
#
# To enable this hook, rename this file to "post-update".
exec git update-server-info

14
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/pre-applypatch.sample Executable file
View File

@@ -0,0 +1,14 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed
# by applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-applypatch".
. git-sh-setup
precommit="$(git rev-parse --git-path hooks/pre-commit)"
test -x "$precommit" && exec "$precommit" ${1+"$@"}
:

49
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/pre-commit.sample Executable file
View File

@@ -0,0 +1,49 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --type=bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --

13
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/pre-merge-commit.sample Executable file
View File

@@ -0,0 +1,13 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git merge" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message to
# stderr if it wants to stop the merge commit.
#
# To enable this hook, rename this file to "pre-merge-commit".
. git-sh-setup
test -x "$GIT_DIR/hooks/pre-commit" &&
exec "$GIT_DIR/hooks/pre-commit"
:

53
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/pre-push.sample Executable file
View File

@@ -0,0 +1,53 @@
#!/bin/sh
# An example hook script to verify what is about to be pushed. Called by "git
# push" after it has checked the remote status, but before anything has been
# pushed. If this script exits with a non-zero status nothing will be pushed.
#
# This hook is called with the following parameters:
#
# $1 -- Name of the remote to which the push is being done
# $2 -- URL to which the push is being done
#
# If pushing without using a named remote those arguments will be equal.
#
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
# <local ref> <local oid> <remote ref> <remote oid>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
remote="$1"
url="$2"
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
while read local_ref local_oid remote_ref remote_oid
do
if test "$local_oid" = "$zero"
then
# Handle delete
:
else
if test "$remote_oid" = "$zero"
then
# New branch, examine all commits
range="$local_oid"
else
# Update to existing branch, examine new commits
range="$remote_oid..$local_oid"
fi
# Check for WIP commit
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
if test -n "$commit"
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done
exit 0

169
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/pre-rebase.sample Executable file
View File

@@ -0,0 +1,169 @@
#!/bin/sh
#
# Copyright (c) 2006, 2008 Junio C Hamano
#
# The "pre-rebase" hook is run just before "git rebase" starts doing
# its job, and can prevent the command from running by exiting with
# non-zero status.
#
# The hook is called with the following parameters:
#
# $1 -- the upstream the series was forked from.
# $2 -- the branch being rebased (or empty when rebasing the current branch).
#
# This sample shows how to prevent topic branches that are already
# merged to 'next' branch from getting rebased, because allowing it
# would result in rebasing already published history.
publish=next
basebranch="$1"
if test "$#" = 2
then
topic="refs/heads/$2"
else
topic=`git symbolic-ref HEAD` ||
exit 0 ;# we do not interrupt rebasing detached HEAD
fi
case "$topic" in
refs/heads/??/*)
;;
*)
exit 0 ;# we do not interrupt others.
;;
esac
# Now we are dealing with a topic branch being rebased
# on top of master. Is it OK to rebase it?
# Does the topic really exist?
git show-ref -q "$topic" || {
echo >&2 "No such branch $topic"
exit 1
}
# Is topic fully merged to master?
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
if test -z "$not_in_master"
then
echo >&2 "$topic is fully merged to master; better remove it."
exit 1 ;# we could allow it, but there is no point.
fi
# Is topic ever merged to next? If so you should not be rebasing it.
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
only_next_2=`git rev-list ^master ${publish} | sort`
if test "$only_next_1" = "$only_next_2"
then
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
echo >&2 "$topic is already up to date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
fi
else
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
/usr/bin/perl -e '
my $topic = $ARGV[0];
my $msg = "* $topic has commits already merged to public branch:\n";
my (%not_in_next) = map {
/^([0-9a-f]+) /;
($1 => 1);
} split(/\n/, $ARGV[1]);
for my $elem (map {
/^([0-9a-f]+) (.*)$/;
[$1 => $2];
} split(/\n/, $ARGV[2])) {
if (!exists $not_in_next{$elem->[0]}) {
if ($msg) {
print STDERR $msg;
undef $msg;
}
print STDERR " $elem->[1]\n";
}
}
' "$topic" "$not_in_next" "$not_in_master"
exit 1
fi
<<\DOC_END
This sample hook safeguards topic branches that have been
published from being rewound.
The workflow assumed here is:
* Once a topic branch forks from "master", "master" is never
merged into it again (either directly or indirectly).
* Once a topic branch is fully cooked and merged into "master",
it is deleted. If you need to build on top of it to correct
earlier mistakes, a new topic branch is created by forking at
the tip of the "master". This is not strictly necessary, but
it makes it easier to keep your history simple.
* Whenever you need to test or publish your changes to topic
branches, merge them into "next" branch.
The script, being an example, hardcodes the publish branch name
to be "next", but it is trivial to make it configurable via
$GIT_DIR/config mechanism.
With this workflow, you would want to know:
(1) ... if a topic branch has ever been merged to "next". Young
topic branches can have stupid mistakes you would rather
clean up before publishing, and things that have not been
merged into other branches can be easily rebased without
affecting other people. But once it is published, you would
not want to rewind it.
(2) ... if a topic branch has been fully merged to "master".
Then you can delete it. More importantly, you should not
build on top of it -- other people may already want to
change things related to the topic as patches against your
"master", so if you need further changes, it is better to
fork the topic (perhaps with the same name) afresh from the
tip of "master".
Let's look at this example:
o---o---o---o---o---o---o---o---o---o "next"
/ / / /
/ a---a---b A / /
/ / / /
/ / c---c---c---c B /
/ / / \ /
/ / / b---b C \ /
/ / / / \ /
---o---o---o---o---o---o---o---o---o---o---o "master"
A, B and C are topic branches.
* A has one fix since it was merged up to "next".
* B has finished. It has been fully merged up to "master" and "next",
and is ready to be deleted.
* C has not merged to "next" at all.
We would want to allow C to be rebased, refuse A, and encourage
B to be deleted.
To compute (1):
git rev-list ^master ^topic next
git rev-list ^master next
if these match, topic has not merged in next at all.
To compute (2):
git rev-list master..topic
if this is empty, it is fully merged to "master".
DOC_END

24
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/pre-receive.sample Executable file
View File

@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to make use of push options.
# The example simply echoes all push options that start with 'echoback='
# and rejects all pushes when the "reject" push option is used.
#
# To enable this hook, rename this file to "pre-receive".
if test -n "$GIT_PUSH_OPTION_COUNT"
then
i=0
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
do
eval "value=\$GIT_PUSH_OPTION_$i"
case "$value" in
echoback=*)
echo "echo from the pre-receive-hook: ${value#*=}" >&2
;;
reject)
exit 1
esac
i=$((i + 1))
done
fi

42
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/prepare-commit-msg.sample Executable file
View File

@@ -0,0 +1,42 @@
#!/bin/sh
#
# An example hook script to prepare the commit log message.
# Called by "git commit" with the name of the file that has the
# commit message, followed by the description of the commit
# message's source. The hook's purpose is to edit the commit
# message file. If the hook fails with a non-zero status,
# the commit is aborted.
#
# To enable this hook, rename this file to "prepare-commit-msg".
# This hook includes three examples. The first one removes the
# "# Please enter the commit message..." help message.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
# commented because it doesn't cope with --amend or with squashed
# commits.
#
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
COMMIT_MSG_FILE=$1
COMMIT_SOURCE=$2
SHA1=$3
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
# case "$COMMIT_SOURCE,$SHA1" in
# ,|template,)
# /usr/bin/perl -i.bak -pe '
# print "\n" . `git diff --cached --name-status -r`
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
# *) ;;
# esac
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
# if test -z "$COMMIT_SOURCE"
# then
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
# fi

78
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/push-to-checkout.sample Executable file
View File

@@ -0,0 +1,78 @@
#!/bin/sh
# An example hook script to update a checked-out tree on a git push.
#
# This hook is invoked by git-receive-pack(1) when it reacts to git
# push and updates reference(s) in its repository, and when the push
# tries to update the branch that is currently checked out and the
# receive.denyCurrentBranch configuration variable is set to
# updateInstead.
#
# By default, such a push is refused if the working tree and the index
# of the remote repository has any difference from the currently
# checked out commit; when both the working tree and the index match
# the current commit, they are updated to match the newly pushed tip
# of the branch. This hook is to be used to override the default
# behaviour; however the code below reimplements the default behaviour
# as a starting point for convenient modification.
#
# The hook receives the commit with which the tip of the current
# branch is going to be updated:
commit=$1
# It can exit with a non-zero status to refuse the push (when it does
# so, it must not modify the index or the working tree).
die () {
echo >&2 "$*"
exit 1
}
# Or it can make any necessary changes to the working tree and to the
# index to bring them to the desired state when the tip of the current
# branch is updated to the new commit, and exit with a zero status.
#
# For example, the hook can simply run git read-tree -u -m HEAD "$1"
# in order to emulate git fetch that is run in the reverse direction
# with git push, as the two-tree form of git read-tree -u -m is
# essentially the same as git switch or git checkout that switches
# branches while keeping the local changes in the working tree that do
# not interfere with the difference between the branches.
# The below is a more-or-less exact translation to shell of the C code
# for the default behaviour for git's push-to-checkout hook defined in
# the push_to_deploy() function in builtin/receive-pack.c.
#
# Note that the hook will be executed from the repository directory,
# not from the working tree, so if you want to perform operations on
# the working tree, you will have to adapt your code accordingly, e.g.
# by adding "cd .." or using relative paths.
if ! git update-index -q --ignore-submodules --refresh
then
die "Up-to-date check failed"
fi
if ! git diff-files --quiet --ignore-submodules --
then
die "Working directory has unstaged changes"
fi
# This is a rough translation of:
#
# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
if git cat-file -e HEAD 2>/dev/null
then
head=HEAD
else
head=$(git hash-object -t tree --stdin </dev/null)
fi
if ! git diff-index --quiet --cached --ignore-submodules $head --
then
die "Working directory has staged changes"
fi
if ! git read-tree -u -m "$commit"
then
die "Could not update working tree to new HEAD"
fi

128
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/hooks/update.sample Executable file
View File

@@ -0,0 +1,128 @@
#!/bin/sh
#
# An example hook script to block unannotated tags from entering.
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
#
# To enable this hook, rename this file to "update".
#
# Config
# ------
# hooks.allowunannotated
# This boolean sets whether unannotated tags will be allowed into the
# repository. By default they won't be.
# hooks.allowdeletetag
# This boolean sets whether deleting tags will be allowed in the
# repository. By default they won't be.
# hooks.allowmodifytag
# This boolean sets whether a tag may be modified after creation. By default
# it won't be.
# hooks.allowdeletebranch
# This boolean sets whether deleting branches will be allowed in the
# repository. By default they won't be.
# hooks.denycreatebranch
# This boolean sets whether remotely creating branches will be denied
# in the repository. By default this is allowed.
#
# --- Command line
refname="$1"
oldrev="$2"
newrev="$3"
# --- Safety check
if [ -z "$GIT_DIR" ]; then
echo "Don't run this script from the command line." >&2
echo " (if you want, you could supply GIT_DIR then run" >&2
echo " $0 <ref> <oldrev> <newrev>)" >&2
exit 1
fi
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
exit 1
fi
# --- Config
allowunannotated=$(git config --type=bool hooks.allowunannotated)
allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
case "$projectdesc" in
"Unnamed repository"* | "")
echo "*** Project description file hasn't been set" >&2
exit 1
;;
esac
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
newrev_type=$(git cat-file -t $newrev)
fi
case "$refname","$newrev_type" in
refs/tags/*,commit)
# un-annotated tag
short_refname=${refname##refs/tags/}
if [ "$allowunannotated" != "true" ]; then
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
exit 1
fi
;;
refs/tags/*,delete)
# delete tag
if [ "$allowdeletetag" != "true" ]; then
echo "*** Deleting a tag is not allowed in this repository" >&2
exit 1
fi
;;
refs/tags/*,tag)
# annotated tag
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
then
echo "*** Tag '$refname' already exists." >&2
echo "*** Modifying a tag is not allowed in this repository." >&2
exit 1
fi
;;
refs/heads/*,commit)
# branch
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
echo "*** Creating a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/heads/*,delete)
# delete branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/remotes/*,commit)
# tracking branch
;;
refs/remotes/*,delete)
# delete tracking branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
exit 1
fi
;;
*)
# Anything else (is there anything else?)
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
exit 1
;;
esac
# --- Finished
exit 0

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/index Normal file
View File

Binary file not shown.

6
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/info/exclude Normal file
View File

@@ -0,0 +1,6 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~

59
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/HEAD Normal file
View File

@@ -0,0 +1,59 @@
0000000000000000000000000000000000000000 5e59b54c95305b5e402f19666f37a91e120810b6 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1639063414 +0100 clone: from github.com:spring-cloud/spring-cloud-release.git
5e59b54c95305b5e402f19666f37a91e120810b6 26c3e2d3254abd6ccf975755e92f11cb850afce0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1639063418 +0100 checkout: moving from main to v2021.0.0
26c3e2d3254abd6ccf975755e92f11cb850afce0 5e59b54c95305b5e402f19666f37a91e120810b6 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 checkout: moving from 26c3e2d3254abd6ccf975755e92f11cb850afce0 to main
5e59b54c95305b5e402f19666f37a91e120810b6 36e5c83639f7596c133691e3256ccc4e2e54338e Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282381 +0100 pull --rebase origin main: Fast-forward
36e5c83639f7596c133691e3256ccc4e2e54338e a8f7edcff2c8117b7a66cd6fb3f62a494df56e4d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643285227 +0100 commit: Bringing back contract
a8f7edcff2c8117b7a66cd6fb3f62a494df56e4d 4a38607b690187fcd596c1034b806d945052260b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726413 +0100 pull --rebase origin main: Fast-forward
4a38607b690187fcd596c1034b806d945052260b ec7331f8a88ddfd84029ef101a033516a322e793 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726432 +0100 checkout: moving from main to 2021.0.x
ec7331f8a88ddfd84029ef101a033516a322e793 b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726437 +0100 pull --rebase origin 2021.0.x: Fast-forward
b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 66873703a4f37736a6c88317262f82f2ee35b83d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062123 +0200 commit: Bumped train-docs versions
66873703a4f37736a6c88317262f82f2ee35b83d 4a38607b690187fcd596c1034b806d945052260b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062129 +0200 checkout: moving from 2021.0.x to main
4a38607b690187fcd596c1034b806d945052260b 66873703a4f37736a6c88317262f82f2ee35b83d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062135 +0200 checkout: moving from main to 2021.0.x
66873703a4f37736a6c88317262f82f2ee35b83d 0cee0b1b487479d6a0c35f6020db5cefffa080de Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062142 +0200 pull --rebase origin 2021.0.x (start): checkout 0cee0b1b487479d6a0c35f6020db5cefffa080de
0cee0b1b487479d6a0c35f6020db5cefffa080de a9144c26b6f2216ceacef51a7866e36ed4a5434b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062142 +0200 pull --rebase origin 2021.0.x (pick): Bumped train-docs versions
a9144c26b6f2216ceacef51a7866e36ed4a5434b a9144c26b6f2216ceacef51a7866e36ed4a5434b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062142 +0200 pull --rebase origin 2021.0.x (finish): returning to refs/heads/2021.0.x
a9144c26b6f2216ceacef51a7866e36ed4a5434b 4a38607b690187fcd596c1034b806d945052260b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062146 +0200 checkout: moving from 2021.0.x to main
4a38607b690187fcd596c1034b806d945052260b b7e7e284090324d7f4d327031086c37970318542 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062150 +0200 pull --rebase origin main: Fast-forward
b7e7e284090324d7f4d327031086c37970318542 b7e7e284090324d7f4d327031086c37970318542 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062214 +0200 reset: moving to HEAD
b7e7e284090324d7f4d327031086c37970318542 95baa3924ea1748e2879d5d87af8659ab223c4d8 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062261 +0200 commit (merge): Merge branch '2021.0.x'
95baa3924ea1748e2879d5d87af8659ab223c4d8 bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651064694 +0200 commit: Going with 3.0.0-SNAPSHOT for Boot
bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a ac2d3d88234950b4c7307664b0957352dc3383fc Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651157365 +0200 checkout: moving from main to v2021.0.2
ac2d3d88234950b4c7307664b0957352dc3383fc a9144c26b6f2216ceacef51a7866e36ed4a5434b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651158679 +0200 checkout: moving from ac2d3d88234950b4c7307664b0957352dc3383fc to 2021.0.x
a9144c26b6f2216ceacef51a7866e36ed4a5434b 9709a7f0eb15744bfb2b8a89369be35281c705ea Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651158684 +0200 pull --rebase origin 2021.0.x: Fast-forward
9709a7f0eb15744bfb2b8a89369be35281c705ea e5d27ba1bf078530af2601b075fcbd3d1018bd2c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651158718 +0200 commit: Don't sign train docs
e5d27ba1bf078530af2601b075fcbd3d1018bd2c 224f5592065ed46d90a2f50df528dc553aaa40f4 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653485226 +0200 pull --rebase origin 2021.0.x: Fast-forward
224f5592065ed46d90a2f50df528dc553aaa40f4 accf3c1e77679f6400d576650883802959e08b65 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653637505 +0200 pull: Fast-forward
accf3c1e77679f6400d576650883802959e08b65 a331ef4c182a2cdf6a745de93d5a234f4e7875b7 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653645700 +0200 checkout: moving from 2021.0.x to a331ef4c182a2cdf6a745de93d5a234f4e7875b7
a331ef4c182a2cdf6a745de93d5a234f4e7875b7 accf3c1e77679f6400d576650883802959e08b65 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653646923 +0200 checkout: moving from a331ef4c182a2cdf6a745de93d5a234f4e7875b7 to 2021.0.x
accf3c1e77679f6400d576650883802959e08b65 aa33294e96817a1720f181e49688004a455f989b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653647008 +0200 commit: Updated versions after the release
aa33294e96817a1720f181e49688004a455f989b a331ef4c182a2cdf6a745de93d5a234f4e7875b7 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653647489 +0200 checkout: moving from 2021.0.x to v2021.0.3
a331ef4c182a2cdf6a745de93d5a234f4e7875b7 bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653982677 +0200 checkout: moving from a331ef4c182a2cdf6a745de93d5a234f4e7875b7 to main
bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a aa33294e96817a1720f181e49688004a455f989b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653982681 +0200 checkout: moving from main to 2021.0.x
aa33294e96817a1720f181e49688004a455f989b 063650255846b01168f6397c7ccd341915e950d0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653982688 +0200 pull --rebase origin 2021.0.x: Fast-forward
063650255846b01168f6397c7ccd341915e950d0 bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1655207117 +0200 checkout: moving from 2021.0.x to main
bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1655209368 +0200 commit: Added train-docs attribute
da95978f91a608cab81aa2020e511e9fce0d3593 da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660659298 +0200 checkout: moving from main to unzipping
da95978f91a608cab81aa2020e511e9fce0d3593 eedb764786313401e1058a8eda4e653d7eb89e01 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660659301 +0200 commit: Prevents unzipping files outside of the target folder
eedb764786313401e1058a8eda4e653d7eb89e01 063650255846b01168f6397c7ccd341915e950d0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729898 +0200 checkout: moving from unzipping to 2021.0.x
063650255846b01168f6397c7ccd341915e950d0 15d9a8568f2289687a85c12a646616943813970c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729903 +0200 cherry-pick: Prevents unzipping files outside of the target folder
15d9a8568f2289687a85c12a646616943813970c da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729911 +0200 checkout: moving from 2021.0.x to main
da95978f91a608cab81aa2020e511e9fce0d3593 15d9a8568f2289687a85c12a646616943813970c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729914 +0200 checkout: moving from main to 2021.0.x
15d9a8568f2289687a85c12a646616943813970c 164958c3e7ab9147b6eff2556eef65c3aeb29da9 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729919 +0200 pull --rebase origin 2021.0.x (start): checkout 164958c3e7ab9147b6eff2556eef65c3aeb29da9
164958c3e7ab9147b6eff2556eef65c3aeb29da9 790dd20d1945dd321f87167071a5ae089158e59f Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729919 +0200 pull --rebase origin 2021.0.x (pick): Prevents unzipping files outside of the target folder
790dd20d1945dd321f87167071a5ae089158e59f 790dd20d1945dd321f87167071a5ae089158e59f Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729919 +0200 pull --rebase origin 2021.0.x (finish): returning to refs/heads/2021.0.x
790dd20d1945dd321f87167071a5ae089158e59f da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729922 +0200 checkout: moving from 2021.0.x to main
da95978f91a608cab81aa2020e511e9fce0d3593 61a279e8d4521d5d2be2c48b8c487758dfa59836 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729926 +0200 pull --rebase origin main: Fast-forward
61a279e8d4521d5d2be2c48b8c487758dfa59836 308c74143e360ad20602d89d1ef51e95ae99a53c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729933 +0200 cherry-pick: Prevents unzipping files outside of the target folder
308c74143e360ad20602d89d1ef51e95ae99a53c acccdd1f0d6020fc598fb6ea3c1f660790a3c916 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: Fast-forward
acccdd1f0d6020fc598fb6ea3c1f660790a3c916 ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675783565 +0100 commit: Disables jar signing for train docs
ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784191 +0100 reset: moving to HEAD
ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 790dd20d1945dd321f87167071a5ae089158e59f Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784194 +0100 checkout: moving from main to 2021.0.x
790dd20d1945dd321f87167071a5ae089158e59f 55f92ff863c185caf81f474702d37b73992f7156 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784199 +0100 pull --rebase origin 2021.0.x: Fast-forward
55f92ff863c185caf81f474702d37b73992f7156 dd371879d6786a9ce4b85c23e1f7564fe251e499 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784259 +0100 commit: Skipping gpg and standard deploy for release train docs
dd371879d6786a9ce4b85c23e1f7564fe251e499 ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784264 +0100 checkout: moving from 2021.0.x to main
ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c79 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784320 +0100 commit (merge): Merge branch '2021.0.x'
5812dd9ca14d6d61a76632662000c7a93c051c79 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: Fast-forward
310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a 6e3fe942d6d8e2bedc298097b06f944ff8613fa3 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912315 +0200 checkout: moving from main to 2022.0.x
6e3fe942d6d8e2bedc298097b06f944ff8613fa3 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912330 +0200 checkout: moving from 2022.0.x to main
310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a 217e46bc4aa6df83f3a131c344d53bf02dd28a9c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912332 +0200 merge 2022.0.x: Merge made by the 'ort' strategy.
217e46bc4aa6df83f3a131c344d53bf02dd28a9c 0686dad89dadf285c219841468fdfec6e6dc67ba Marcin Grzejszczak <mgrzejszczak@vmware.com> 1688124894 +0200 commit: WIP

14
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/heads/2021.0.x Normal file
View File

@@ -0,0 +1,14 @@
0000000000000000000000000000000000000000 ec7331f8a88ddfd84029ef101a033516a322e793 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726432 +0100 branch: Created from refs/remotes/origin/2021.0.x
ec7331f8a88ddfd84029ef101a033516a322e793 b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726437 +0100 pull --rebase origin 2021.0.x: Fast-forward
b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 66873703a4f37736a6c88317262f82f2ee35b83d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062123 +0200 commit: Bumped train-docs versions
66873703a4f37736a6c88317262f82f2ee35b83d a9144c26b6f2216ceacef51a7866e36ed4a5434b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062142 +0200 pull --rebase origin 2021.0.x (finish): refs/heads/2021.0.x onto 0cee0b1b487479d6a0c35f6020db5cefffa080de
a9144c26b6f2216ceacef51a7866e36ed4a5434b 9709a7f0eb15744bfb2b8a89369be35281c705ea Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651158684 +0200 pull --rebase origin 2021.0.x: Fast-forward
9709a7f0eb15744bfb2b8a89369be35281c705ea e5d27ba1bf078530af2601b075fcbd3d1018bd2c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651158718 +0200 commit: Don't sign train docs
e5d27ba1bf078530af2601b075fcbd3d1018bd2c 224f5592065ed46d90a2f50df528dc553aaa40f4 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653485226 +0200 pull --rebase origin 2021.0.x: Fast-forward
224f5592065ed46d90a2f50df528dc553aaa40f4 accf3c1e77679f6400d576650883802959e08b65 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653637505 +0200 pull: Fast-forward
accf3c1e77679f6400d576650883802959e08b65 aa33294e96817a1720f181e49688004a455f989b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653647008 +0200 commit: Updated versions after the release
aa33294e96817a1720f181e49688004a455f989b 063650255846b01168f6397c7ccd341915e950d0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653982688 +0200 pull --rebase origin 2021.0.x: Fast-forward
063650255846b01168f6397c7ccd341915e950d0 15d9a8568f2289687a85c12a646616943813970c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729903 +0200 cherry-pick: Prevents unzipping files outside of the target folder
15d9a8568f2289687a85c12a646616943813970c 790dd20d1945dd321f87167071a5ae089158e59f Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729919 +0200 pull --rebase origin 2021.0.x (finish): refs/heads/2021.0.x onto 164958c3e7ab9147b6eff2556eef65c3aeb29da9
790dd20d1945dd321f87167071a5ae089158e59f 55f92ff863c185caf81f474702d37b73992f7156 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784199 +0100 pull --rebase origin 2021.0.x: Fast-forward
55f92ff863c185caf81f474702d37b73992f7156 dd371879d6786a9ce4b85c23e1f7564fe251e499 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784259 +0100 commit: Skipping gpg and standard deploy for release train docs

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/heads/2022.0.x Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 6e3fe942d6d8e2bedc298097b06f944ff8613fa3 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912315 +0200 branch: Created from refs/remotes/origin/2022.0.x

16
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/heads/main Normal file
View File

@@ -0,0 +1,16 @@
0000000000000000000000000000000000000000 5e59b54c95305b5e402f19666f37a91e120810b6 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1639063414 +0100 clone: from github.com:spring-cloud/spring-cloud-release.git
5e59b54c95305b5e402f19666f37a91e120810b6 36e5c83639f7596c133691e3256ccc4e2e54338e Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282381 +0100 pull --rebase origin main: Fast-forward
36e5c83639f7596c133691e3256ccc4e2e54338e a8f7edcff2c8117b7a66cd6fb3f62a494df56e4d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643285227 +0100 commit: Bringing back contract
a8f7edcff2c8117b7a66cd6fb3f62a494df56e4d 4a38607b690187fcd596c1034b806d945052260b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726413 +0100 pull --rebase origin main: Fast-forward
4a38607b690187fcd596c1034b806d945052260b b7e7e284090324d7f4d327031086c37970318542 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062150 +0200 pull --rebase origin main: Fast-forward
b7e7e284090324d7f4d327031086c37970318542 95baa3924ea1748e2879d5d87af8659ab223c4d8 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062261 +0200 commit (merge): Merge branch '2021.0.x'
95baa3924ea1748e2879d5d87af8659ab223c4d8 bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651064694 +0200 commit: Going with 3.0.0-SNAPSHOT for Boot
bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1655209368 +0200 commit: Added train-docs attribute
da95978f91a608cab81aa2020e511e9fce0d3593 61a279e8d4521d5d2be2c48b8c487758dfa59836 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729926 +0200 pull --rebase origin main: Fast-forward
61a279e8d4521d5d2be2c48b8c487758dfa59836 308c74143e360ad20602d89d1ef51e95ae99a53c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729933 +0200 cherry-pick: Prevents unzipping files outside of the target folder
308c74143e360ad20602d89d1ef51e95ae99a53c acccdd1f0d6020fc598fb6ea3c1f660790a3c916 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: Fast-forward
acccdd1f0d6020fc598fb6ea3c1f660790a3c916 ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675783565 +0100 commit: Disables jar signing for train docs
ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c79 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784320 +0100 commit (merge): Merge branch '2021.0.x'
5812dd9ca14d6d61a76632662000c7a93c051c79 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: Fast-forward
310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a 217e46bc4aa6df83f3a131c344d53bf02dd28a9c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912332 +0200 merge 2022.0.x: Merge made by the 'ort' strategy.
217e46bc4aa6df83f3a131c344d53bf02dd28a9c 0686dad89dadf285c219841468fdfec6e6dc67ba Marcin Grzejszczak <mgrzejszczak@vmware.com> 1688124894 +0200 commit: WIP

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/heads/unzipping Normal file
View File

@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660659298 +0200 branch: Created from HEAD
da95978f91a608cab81aa2020e511e9fce0d3593 eedb764786313401e1058a8eda4e653d7eb89e01 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660659301 +0200 commit: Prevents unzipping files outside of the target folder

4
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/2020.0.x Normal file
View File

@@ -0,0 +1,4 @@
aa85bcc817b537ba5f4de9bff793bfde66746bab 4a8b90beb64fd56865281acca149b199ad291e85 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: fast-forward
4a8b90beb64fd56865281acca149b199ad291e85 f9b62fd49d16d8c75642ec25caf04ca4e2aff077 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651157356 +0200 pull: fast-forward
f9b62fd49d16d8c75642ec25caf04ca4e2aff077 814a756ad4514b1707ae610e765102ee241f10a0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: fast-forward
814a756ad4514b1707ae610e765102ee241f10a0 9f0690abd67176c5307abd28542ddd7a07354518 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: fast-forward

15
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/2021.0.x Normal file
View File

@@ -0,0 +1,15 @@
0000000000000000000000000000000000000000 ec7331f8a88ddfd84029ef101a033516a322e793 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: storing head
ec7331f8a88ddfd84029ef101a033516a322e793 b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726437 +0100 pull --rebase origin 2021.0.x: fast-forward
b0fc42faa6a6101acdafa956c2a4d4f25ce9ead1 0cee0b1b487479d6a0c35f6020db5cefffa080de Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062006 +0200 fetch origin 2021.0.x: fast-forward
0cee0b1b487479d6a0c35f6020db5cefffa080de a9144c26b6f2216ceacef51a7866e36ed4a5434b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062146 +0200 update by push
a9144c26b6f2216ceacef51a7866e36ed4a5434b 9709a7f0eb15744bfb2b8a89369be35281c705ea Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651157356 +0200 pull: fast-forward
9709a7f0eb15744bfb2b8a89369be35281c705ea e5d27ba1bf078530af2601b075fcbd3d1018bd2c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651158724 +0200 update by push
e5d27ba1bf078530af2601b075fcbd3d1018bd2c 224f5592065ed46d90a2f50df528dc553aaa40f4 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653485226 +0200 pull --rebase origin 2021.0.x: fast-forward
224f5592065ed46d90a2f50df528dc553aaa40f4 accf3c1e77679f6400d576650883802959e08b65 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653637505 +0200 pull: fast-forward
accf3c1e77679f6400d576650883802959e08b65 aa33294e96817a1720f181e49688004a455f989b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653647013 +0200 update by push
aa33294e96817a1720f181e49688004a455f989b 063650255846b01168f6397c7ccd341915e950d0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653982688 +0200 pull --rebase origin 2021.0.x: fast-forward
063650255846b01168f6397c7ccd341915e950d0 164958c3e7ab9147b6eff2556eef65c3aeb29da9 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729919 +0200 pull --rebase origin 2021.0.x: fast-forward
164958c3e7ab9147b6eff2556eef65c3aeb29da9 790dd20d1945dd321f87167071a5ae089158e59f Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729922 +0200 update by push
790dd20d1945dd321f87167071a5ae089158e59f 55f92ff863c185caf81f474702d37b73992f7156 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: fast-forward
55f92ff863c185caf81f474702d37b73992f7156 dd371879d6786a9ce4b85c23e1f7564fe251e499 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784264 +0100 update by push
dd371879d6786a9ce4b85c23e1f7564fe251e499 36f2070ea645c75fbf26bc660245b29cdc863e25 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: fast-forward

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/2022.0.x Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 6e3fe942d6d8e2bedc298097b06f944ff8613fa3 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: storing head

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/HEAD Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 5e59b54c95305b5e402f19666f37a91e120810b6 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1639063414 +0100 clone: from github.com:spring-cloud/spring-cloud-release.git

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/Jenkins Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 2b7f449fa7d0e04a786ff097c6b1bfe3f322a28d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: storing head

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/fix-pom Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 3d7d639afa258af09c5c08fd70322d43c95e4f03 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: storing head

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/functionForStreamRelease Normal file
View File

@@ -0,0 +1,2 @@
515f6e98638779b1b1c55d4f732242f4834cd3a1 edf332dd107b84dce1bab96b15ef8b62c874bf1b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: fast-forward
edf332dd107b84dce1bab96b15ef8b62c874bf1b 1d3ec9b883f8b6c894ff0631d061e7df8f704e5f Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651157356 +0200 pull: fast-forward

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/functionForStreamRelease_4.0.x Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 3b1a1270cc2a01012f663519fb7d4a1c7a26d394 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: storing head

6
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/jenkins-releaser-config Normal file
View File

@@ -0,0 +1,6 @@
da4cbaea1a027d0b55fff8f7d798e4012e547cdd 0edf7398e4e68698dc9a2257a57f0892e2648362 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: fast-forward
0edf7398e4e68698dc9a2257a57f0892e2648362 d2601d8c1eefd01a506c54c2f8cb6ed4492c95c4 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651157356 +0200 pull: fast-forward
d2601d8c1eefd01a506c54c2f8cb6ed4492c95c4 60847c1d46bf8fc761b73337455105765d044965 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1653637505 +0200 pull: fast-forward
60847c1d46bf8fc761b73337455105765d044965 4241e281e15c11b769a20606c5973a753c3f9151 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1655207117 +0200 pull: fast-forward
4241e281e15c11b769a20606c5973a753c3f9151 04b6612cbeaf621808db2a0a66d6b78cc3bfbe34 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: fast-forward
04b6612cbeaf621808db2a0a66d6b78cc3bfbe34 c3deede8ccf0d1f58e84159c7e8d0748db104669 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: fast-forward

14
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/main Normal file
View File

@@ -0,0 +1,14 @@
5e59b54c95305b5e402f19666f37a91e120810b6 36e5c83639f7596c133691e3256ccc4e2e54338e Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643282376 +0100 pull: fast-forward
36e5c83639f7596c133691e3256ccc4e2e54338e a8f7edcff2c8117b7a66cd6fb3f62a494df56e4d Marcin Grzejszczak <mgrzejszczak@vmware.com> 1643285231 +0100 update by push
a8f7edcff2c8117b7a66cd6fb3f62a494df56e4d 4a38607b690187fcd596c1034b806d945052260b Marcin Grzejszczak <mgrzejszczak@vmware.com> 1646726413 +0100 pull --rebase origin main: fast-forward
4a38607b690187fcd596c1034b806d945052260b b7e7e284090324d7f4d327031086c37970318542 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062150 +0200 pull --rebase origin main: fast-forward
b7e7e284090324d7f4d327031086c37970318542 95baa3924ea1748e2879d5d87af8659ab223c4d8 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651062266 +0200 update by push
95baa3924ea1748e2879d5d87af8659ab223c4d8 bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1651064698 +0200 update by push
bf1cf4ab4843de5837b48ae7f6cbdccd069c0d3a da95978f91a608cab81aa2020e511e9fce0d3593 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1655209376 +0200 update by push
da95978f91a608cab81aa2020e511e9fce0d3593 61a279e8d4521d5d2be2c48b8c487758dfa59836 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729926 +0200 pull --rebase origin main: fast-forward
61a279e8d4521d5d2be2c48b8c487758dfa59836 308c74143e360ad20602d89d1ef51e95ae99a53c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660729938 +0200 update by push
308c74143e360ad20602d89d1ef51e95ae99a53c acccdd1f0d6020fc598fb6ea3c1f660790a3c916 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: fast-forward
acccdd1f0d6020fc598fb6ea3c1f660790a3c916 ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675783569 +0100 update by push
ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c79 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784325 +0100 update by push
5812dd9ca14d6d61a76632662000c7a93c051c79 310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912310 +0200 pull: fast-forward
310b20cbb6f7fca74695b3ff6dc43cf4b3d4ba6a 217e46bc4aa6df83f3a131c344d53bf02dd28a9c Marcin Grzejszczak <mgrzejszczak@vmware.com> 1686912337 +0200 update by push

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/netflix4-eureka2 Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 b603d412da7e68611e6701926be8a37694e43bd3 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675782967 +0100 pull: storing head

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/remotes/origin/unzipping Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 eedb764786313401e1058a8eda4e653d7eb89e01 Marcin Grzejszczak <mgrzejszczak@vmware.com> 1660659309 +0200 update by push

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/logs/refs/stash Normal file
View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 4e030063b617d966e604e13d608fff1bf9170cdb Marcin Grzejszczak <mgrzejszczak@vmware.com> 1675784191 +0100 WIP on main: ecbeb68 Disables jar signing for train docs

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/02/f6ff9f70afba1235260d53c684803f85565023 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/03/8094dc26f8c35964c2d2a961caa35166e820e1 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/03/a7c66427c0e8766499a7c3e16a2f94baa4e7f8 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/03/c862b65ebfa5e6ce4b305f08a732723086fcb4 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/04/0afe01a067d57631f096fe2ee655dde54440f6 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/05/cc6abe1c30617cb7d5d285620cd98b14ee44f4 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/06/0e9dd33e2530631fab6b8f69fbcb53cd91e25c Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/06/3650255846b01168f6397c7ccd341915e950d0 Normal file
View File

Binary file not shown.

3
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/06/86dad89dadf285c219841468fdfec6e6dc67ba Normal file
View File

@@ -0,0 +1,3 @@
x<01><><EFBFBD>
1E<><45><15><05>c<EFBFBD>;<3B>쬓ɬ<ECAC93>WbTد7<D8AF>`y<0F><>ũ<EFBFBD><C5A9>qb<>*O<>g
";<15><><EFBFBD><EFBFBD>K"H987<10>r!<21>G<EFBFBD>t<EFBFBD><74>t6!<21>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD><EFBFBD>5@6:

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/07/21ae0cd9bb4b9387cf407d88de1f93af7ead39 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/07/229069124ec4492fc66c575618f547fa5a0ac6 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/07/6c89868e657ca8d8e6a32fd549536f10072a33 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/08/79e03a4b3239a0748ff9733b8f29301dc6b8ce Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/09/db338cb8f5d95da86e52d1ce8a50f0141c4a72 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0c/50700198c3220841653a1fca6e402dd410d151 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0c/90ea6340d9ee286cab9014c619e57847ee3ab0 Normal file
View File

Binary file not shown.

1
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0c/e8820f1a3d46172668eb309d358d80282027dc Normal file
View File

@@ -0,0 +1 @@
x<01><>1R<31>0E<>9<17>&v<19>t<>3<>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>X<EFBFBD>zVRH8=r삎<72><1E><><EFBFBD><EFBFBD><EFBFBD>_ʡz<CAA1><7A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> @<40><>+<2B><>(X<><58>F<><46><EFBFBD>b<<3C><1A>"^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|<7C><><EFBFBD>S[<5B>d]{ޭE-6<><36><EFBFBD>a<EFBFBD>3<EFBFBD>`<60><><EFBFBD>y<EFBFBD><79><EFBFBD>sJ<>H <20><>}.dUZF^<17>Q<EFBFBD>~2y<32>p<EFBFBD><1B><><EFBFBD><EFBFBD><10><>W|<7C><><EFBFBD><EFBFBD>[<5B><>/<2F>.<2E>#x<03><><1F><><1F><>IkK:٨<><D9A8>{<7B><><EFBFBD>r<EFBFBD>NF<4E><46><EFBFBD><EFBFBD><EFBFBD>R<><52>9<EFBFBD><39><EFBFBD><03><>ܼn<DCBC>HR<48>Rs<52>>)<29><1C>I<EFBFBD><49>v<EFBFBD><76>-<2D>MaI<61>O'뮚Z<EBAE9A>ʫ<EFBFBD><CAAB><EFBFBD><EFBFBD><1F>_f2<66>,

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0c/ee0b1b487479d6a0c35f6020db5cefffa080de Normal file
View File

@@ -0,0 +1,2 @@
x<01><><EFBFBD>m<EFBFBD>0Dsfۀ<05><><05> P <09>`D<>( <0C><>>J:<3A>m<EFBFBD>0o0<6F><30><EFBFBD>u<EFBFBD>޾<EFBFBD>&Bɧ<42>ݚ<EFBFBD>g<> <0B><>G<EFBFBD>c<EFBFBD><63>n<11><><EFBFBD>P4<>;<3B>y<EFBFBD> <0C> >h<04><><EFBFBD>xcV<63>$'bڭ
<EFBFBD><EFBFBD>]}=<3D>ӄG<D384>F<EFBFBD>m<EFBFBD><0F><>r?ֆ\<5C><07>t<08>]<5D><><EFBFBD>Z<EFBFBD><5A><0F><><EFBFBD><EFBFBD>j<EFBFBD><6A>˶<EFBFBD>i<EFBFBD><69><EFBFBD>M<EFBFBD><4D>Vw<56><77><EFBFBD><10><>~g<>M<EFBFBD>

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0d/25db895e65c784745767f11b67c9549a407ea2 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0d/b4d8cbf44e05d84c378de7c959a22284ab7287 Normal file
View File

Binary file not shown.

6
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0d/dc66754e49d6b4ea50395245d14350d53b7e52 Normal file
View File

@@ -0,0 +1,6 @@
x<01>YMo<4D>6<10><><EFBFBD><15><>WI<57><49>C(Zm<14><> i<>^)<29><><EFBFBD><EFBFBD>H<EFBFBD><48>⸋<EFBFBD><E2B88B>~<7E><>l<EFBFBD>I<EFBFBD>.P5<50><35>"g<1E><> <0C><>()X<>]_\^<5E>}~- <0B>sA<18><>_<04>sӔe<D394><65>n<EFBFBD><EFBFBD>~<7E>_<EFBFBD>?<3F>gQ<67><51><17>J<0F><><EFBFBD>y<15>v<EFBFBD><76><EFBFBD><EFBFBD> <09><>vl/<03>W<EFBFBD><57><EFBFBD><EFBFBD>"<22>k<EFBFBD><6B><EFBFBD><EFBFBD>q<EFBFBD>|B<>D4<44>s<EFBFBD><73>4J<34><4A>i<EFBFBD>*bZ<62><5A><EFBFBD>ex<15><><EFBFBD>g<EFBFBD><67><07>7B#<<3C>Im<49>]븦<>$<04>s <20>*23<32><33>%x<><78>g<EFBFBD><67>d.<2E>4<EFBFBD>c=<15><>1<EFBFBD><31><10>T<EFBFBD><54>,ZqVW<56>f1<66> D<><44>=9G%<25>2<EFBFBD> ҂<>Y6"JqIr<49>J<EFBFBD>0Ҿ<16>3\a<><61><EFBFBD> <16><><EFBFBD>Ž<EFBFBD>ҵ<EFBFBD>0F<30>˫(lF<6C>,<2C>8<>?"<22><15><>Y<EFBFBD><59>U<EFBFBD><55>s<EFBFBD>-<2D> <15><>#
,<2C>s<EFBFBD>B=fdX<64><58>T*^<5E><>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>rvŴ<76><C5B4>
Z<EFBFBD>7㊕<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD>8<EFBFBD>0<EFBFBD> <1D>$H<><48><EFBFBD><EFBFBD><EFBFBD>W<EFBFBD><57>[<04><0F><>N+G<><47><EFBFBD>3<EFBFBD>'<27>O.<2E>Ep<<3C>=<3D><><EFBFBD>|<17>'e<><65><EFBFBD>"<22><>]'<27><>҃<EFBFBD>)+KF<4B>^<5E><>ܗ%<<3C><>L8F̝<><CC9D>̓<EFBFBD><CD83><EFBFBD>j<EFBFBD>K0<4B><30><EFBFBD><EFBFBD>V<EFBFBD>= <09>?)<29><>#<23>]<5D>c<EFBFBD><63><EFBFBD>~<7E>h_a6<>i<EFBFBD>2<EFBFBD><32>^<5E>g<EFBFBD>OD<4F>@av<>$ޢ<>C}˩<>򃠛:<3A><>b<EFBFBD><62><1C><><EFBFBD>=<15><01>Ah@<40> <0B><>n{<7B><>Aa<41><61><1C>U<EFBFBD>ܷ<EFBFBD>p<EFBFBD>1,<2C><><EFBFBD>L=Uzƒp/<2F>.ޟW}<7D>A<EFBFBD><41><19>`(<28><>~}<7D>Zj<>s<EFBFBD>[?<3F>>ۓg<DB93>D<14>pٜln<6C><16>Y<EFBFBD><59><EFBFBD>{ +<2B><EFBFBD>'<27>ƥ<>)<29><><EFBFBD><EFBFBD>K<11><12>1<EFBFBD><31><EFBFBD>dp<64>y(<28><07><>U<EFBFBD>V<EFBFBD>B<EFBFBD><42>~<7E><>9
<08>ñW<C3B1>m<EFBFBD>띨{g<>2<EFBFBD>)<29><><EFBFBD>i7i<37><69>wƂ<77><C682>U<EFBFBD>I<><49><EFBFBD>'J
<16><>b\™<><C299>4K8<4B>z4<7A>#m<>uF<75><46><EFBFBD>xӡ-$a<>H<EFBFBD>Fyz<79>V<EFBFBD>g$<24>nٚN<D99A><4E><EFBFBD>{<7B>H<EFBFBD>}<7D><>E=<3D>oHc<48><63>^<5E><><13><><EFBFBD>h$<24>F}zѶ<7A>n#y<><79><EFBFBD>M'ސ<><DE90><EFBFBD>><3E><>Q<EFBFBD>^<5E><><EFBFBD><EFBFBD>Hν<48><CEBD><EFBFBD><EFBFBD>ٽ<EFBFBD><D9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>mh7<68>$<24>iTL'Ұ)<29><>y$<24>F}zqv<71>Α̝<CE91><CC9D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><>C^<5E><1B><><EFBFBD><EFBFBD>n;<03>{p<><70>ТӍƪ<D38D><C6AA>#<23><><EFBFBD>Є<EFBFBD><03>W<EFBFBD><57><EFBFBD>5<EFBFBD><35>bɾ<62>^<5E><>i͡]+1<>uc<75>7p<03>TBט<13><>8G<38><47>Q<EFBFBD><0E><>'~<7E>i<EFBFBD>zM<7A>0Xč<18>`D]<5D><><EFBFBD>z<1E><>'<27><>Z<EFBFBD>|籚{lK=<3D><>{9<><39>n<EFBFBD><17><>N<EFBFBD>v<EFBFBD>m]<5D>q `<10><04>}<7D><><EFBFBD><EFBFBD>x<EFBFBD><78>#<23>b!|<7C> <20>O<EFBFBD><4F><EFBFBD> m"h<>ߘc[85<38>́ú<CC81>l<6C>"<22>\<5C><><1B>YTW<19><>YyO
K^<5E>c<EFBFBD>cv<63>Yd<59>^BXbh^Daw<61>IA<49><41><EFBFBD>н<EFBFBD><D0BD>L<EFBFBD><4C>ǯx<><78>PW<50><57><EFBFBD>&A<>o<EFBFBD><6F>3 <20>s<EFBFBD>3<EFBFBD>,<2C><>][<5B>n3<6E><33><EFBFBD>^~<7E><04><><EFBFBD><EFBFBD>丄<EFBFBD>I<14>DX<44><58><EFBFBD>(r[<14>'<27>@<40><>a<EFBFBD>с`<60><><EFBFBD>l<05><><EFBFBD><EFBFBD><EFBFBD>΀<EFBFBD>f֗*<2A><>_<EFBFBD>L6<>R}

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0e/7ca9611afc83cad950fe7b6664487d23aa24e5 Normal file
View File

Binary file not shown.

BIN
projects/spring-cloud/src/test/resources/projects/spring-cloud-release-commercial/git/objects/0f/32b8a0490778dd9bc8744d0dcb84dc0159bf01 Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More