Merging main and fixing tests
This commit is contained in:
Ryan Baxter
@@ -13,4 +13,4 @@ _site/
|
||||
*.ipr
|
||||
.factorypath
|
||||
*.swp
|
||||
/consul
|
||||
/consul
|
||||
@@ -1 +1 @@
|
||||
Removed deployer
|
||||
initial commit
|
||||
|
||||
Binary file not shown.
@@ -1,2 +1,5 @@
|
||||
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
|
||||
386e26ed81099e05b791bbea27a0236abc42a455 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343905 -0400 checkout: moving from master to docs-build
|
||||
386e26ed81099e05b791bbea27a0236abc42a455 0945bf835a7909d9fb0f2ba89250095ae2784169 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343956 -0400 commit: initial commit
|
||||
0945bf835a7909d9fb0f2ba89250095ae2784169 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343971 -0400 checkout: moving from docs-build to master
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
0000000000000000000000000000000000000000 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343905 -0400 branch: Created from HEAD
|
||||
386e26ed81099e05b791bbea27a0236abc42a455 0945bf835a7909d9fb0f2ba89250095ae2784169 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343956 -0400 commit: initial commit
|
||||
@@ -0,0 +1,3 @@
|
||||
x<01><>MN1 @<40><>s
|
||||
<EFBFBD>#'q<>Z<EFBFBD><10><08><>ɸ4<C9B8><34>TiF<69><46>g
|
||||
W`<60><16>^Y<><59>vp) zS<7A><53><EFBFBD>k<EFBFBD><6B>G<EFBFBD>,<2C>9<EFBFBD><39>(<28>l<EFBFBD><6C><EFBFBD><EFBFBD>367i<37>t<EFBFBD>Ǩ.<2E>x<EFBFBD>Ȭrb<72><62><EFBFBD>K<EFBFBD><4B>GɅ<47>PF<>~Y|>d<><0F><><EFBFBD><EFBFBD> <1C>@/mo<6D><6F><EFBFBD><EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>Mo<4D>c<EFBFBD><63><EFBFBD><EFBFBD>塬<EFBFBD><<y^<5E><10>^<5E><>'K<F48FA8A9>U&<26><><EFBFBD>b<>YZ
|
||||
@@ -0,0 +1 @@
|
||||
xK<><4B>OR<4F>4eЍȭ0402<30>UЍ<55><D08D>r<EFBFBD>t<EFBFBD><74>-<2D><>I-r<>/<2F>+<2B>5<04><>d<EFBFBD><16><><04><>8<><38><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]<5D><12><12><>S<EFBFBD>K<EFBFBD>2K*<2A>R<EFBFBD>SlӀ<1A><>SR<53><52><EFBFBD><EFBFBD>K<EFBFBD><12>R<EFBFBD>s<01>p"<22>
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
x+)JMU<4D>0`040031Q<31>K,<2C>-NM,J<><4A><EFBFBD>H*f<>3<EFBFBD><1A>R-<2D><>VpR<70><52><kyK<>3<EFBFBD>J$U~<01><><EFBFBD><EFBFBD>;<3B>s<EFBFBD>щ<EFBFBD><D189><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<01><> <1F>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,3 @@
|
||||
x<01><>A
|
||||
<EFBFBD>@ P<>=<3D>H<>-<<3C><07><>`<60>u&<26>Q<EFBFBD>Ӌ3<D38B>t<EFBFBD><74><EFBFBD><17>c<0E>v<EFBFBD>_]dr<64><72>t<EFBFBD><74>d<EFBFBD>qp<71><70>@dQ3><3E><13><>y<EFBFBD><79><EFBFBD>JZ<>ŪU<C5AA><02>L <1D><>-
|
||||
A<EFBFBD><EFBFBD> <1F><>m<EFBFBD><1A><>9<EFBFBD><39>|g<><67><06>?mp<6D><70>Ҡ<18>ؚ/<2F><>Or
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
xUNAj1 <0C>ٯ<EFBFBD>y<EFBFBD>2<EFBFBD>@<40><><EFBFBD>y@<40>ڊ<DA8A>2<EFBFBD><32>6<EFBFBD><36><EFBFBD><EFBFBD><EFBFBD>^<06>f<EFBFBD><66><EFBFBD><EFBFBD><EFBFBD>~<7E><>|S <1C>48R--<2D><>}<7D><><EFBFBD>:<3A>E:<3A><>&<26>Q<EFBFBD><51><EFBFBD>0<EFBFBD>a<17><><EFBFBD><EFBFBD>@T<>>b\<5C>6<><36>`<60><>Vj<56>ߵ:1<><12><>[<5B><>ɧ"<22><>&n8<6E><38><EFBFBD>.49<EFBFBD>><3E>O<EFBFBD>B6<42>X<EFBFBD>a O<><17>$<24>`,싩<><13>p^9m<39><6D><EFBFBD><EFBFBD><EFBFBD>c<EFBFBD>a&<26>Z<EFBFBD> <1F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>KEUj<55>|<7C><><EFBFBD><EFBFBD><01>5c<35>
|
||||
@@ -0,0 +1 @@
|
||||
0945bf835a7909d9fb0f2ba89250095ae2784169
|
||||
@@ -1,7 +1,7 @@
|
||||
<?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">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
@@ -26,7 +26,7 @@
|
||||
<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>
|
||||
<httpclient.version>4.5.2</httpclient.version>
|
||||
<httpcore.version>4.4.5</httpcore.version>
|
||||
<joda-time.version>2.7</joda-time.version>
|
||||
</properties>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?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">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
|
||||
Binary file not shown.
@@ -8,3 +8,5 @@ bf90641942a884ced73fbc9dfaf17a3a49b25aed 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d5
|
||||
5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572385 -0400 checkout: moving from main to master
|
||||
386e26ed81099e05b791bbea27a0236abc42a455 5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572426 -0400 checkout: moving from master to main
|
||||
5de87a5b39dc5a67bf7b4ca095a37a0a9b8c6d53 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714572445 -0400 checkout: moving from main to master
|
||||
386e26ed81099e05b791bbea27a0236abc42a455 bf90641942a884ced73fbc9dfaf17a3a49b25aed Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343739 -0400 checkout: moving from master to docs-build
|
||||
bf90641942a884ced73fbc9dfaf17a3a49b25aed 386e26ed81099e05b791bbea27a0236abc42a455 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719343994 -0400 checkout: moving from docs-build to master
|
||||
|
||||
@@ -1 +1 @@
|
||||
WIP
|
||||
initial commit
|
||||
|
||||
Binary file not shown.
@@ -57,3 +57,6 @@ ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c7
|
||||
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
|
||||
0686dad89dadf285c219841468fdfec6e6dc67ba 0686dad89dadf285c219841468fdfec6e6dc67ba Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344531 -0400 checkout: moving from main to docs-build
|
||||
0686dad89dadf285c219841468fdfec6e6dc67ba d4c7d4760e5df6907e35aafc3b9d7537d210ee90 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344562 -0400 commit: initial commit
|
||||
d4c7d4760e5df6907e35aafc3b9d7537d210ee90 0686dad89dadf285c219841468fdfec6e6dc67ba Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344577 -0400 checkout: moving from docs-build to main
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
0000000000000000000000000000000000000000 0686dad89dadf285c219841468fdfec6e6dc67ba Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344531 -0400 branch: Created from HEAD
|
||||
0686dad89dadf285c219841468fdfec6e6dc67ba d4c7d4760e5df6907e35aafc3b9d7537d210ee90 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344562 -0400 commit: initial commit
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
xUO1n<31>0 <0C><>Wt`zh<7A><68>E<45>4<>8JdQ<10><><EFBFBD>}<7D><> <1E> x<>y7<17>_<EFBFBD><5F><EFBFBD>/N} M<>s],<2C><><EFBFBD>,<2C><>\Ȭ<><C8AC>`<60><><EFBFBD><12><><EFBFBD><EFBFBD>!T
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,3 @@
|
||||
x<01><>MN<4D>0<10>a<EFBFBD>><3E><><15><EFBFBD>cGB<47><42><08>`< S<>&<26>\G<><47>'<27><15>|<7C>g<EFBFBD><67><EFBFBD>mY<6D><59>.Ƨ<>E<EFBFBD>8g`<60><>ɓ<EFBFBD><C993>pr&T<>%/<2F>H<EFBFBD><48><EFBFBD>Q<EFBFBD>uh<75> <0B>4 S]
|
||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><02>Z<EFBFBD>0
|
||||
ƘI<C698>>.[<5B><>Z<>}
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
d4c7d4760e5df6907e35aafc3b9d7537d210ee90
|
||||
Binary file not shown.
@@ -59,3 +59,5 @@ ecbeb68df64f1dcd9a45cd7dac70e857e2cde8a0 5812dd9ca14d6d61a76632662000c7a93c051c7
|
||||
217e46bc4aa6df83f3a131c344d53bf02dd28a9c 0686dad89dadf285c219841468fdfec6e6dc67ba Marcin Grzejszczak <mgrzejszczak@vmware.com> 1688124894 +0200 commit: WIP
|
||||
0686dad89dadf285c219841468fdfec6e6dc67ba 75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714589675 -0400 checkout: moving from main to docs-build
|
||||
75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 0686dad89dadf285c219841468fdfec6e6dc67ba Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1714589683 -0400 checkout: moving from docs-build to main
|
||||
0686dad89dadf285c219841468fdfec6e6dc67ba 75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344488 -0400 checkout: moving from main to docs-build
|
||||
75b4bfe286e37d0ac4ee2b08215b5fc0bc5823a7 0686dad89dadf285c219841468fdfec6e6dc67ba Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1719344586 -0400 checkout: moving from docs-build to main
|
||||
|
||||
@@ -367,7 +367,8 @@ class CommandPicker {
|
||||
String publishAntoraDocsCommand(File project, ReleaserProperties properties) {
|
||||
ProjectVersion version = new ProjectVersion(project);
|
||||
// the GitHub project for spring-cloud-starter-build is spring-cloud-release
|
||||
String projectName = version.projectName.equals("spring-cloud-starter-build") ? "spring-cloud-release" : version.projectName;
|
||||
String projectName = version.projectName.equals("spring-cloud-starter-build") ? "spring-cloud-release"
|
||||
: version.projectName;
|
||||
String repo = properties.getGit().getOrgName() + "/" + projectName;
|
||||
String command = properties.getAntora().getSyncAntoraDocsCommand().replace("{{github-repo}}", repo)
|
||||
.replace("{{site-path}}", project.getAbsolutePath() + "/target/antora/site");
|
||||
|
||||
@@ -61,6 +61,7 @@ public class ArgsBuilder {
|
||||
"releaser.git.test-samples-project-url=" + tempDirTestSamplesProject.getAbsolutePath(),
|
||||
"releaser.git.release-train-docs-url=" + tempDirReleaseTrainDocs.getAbsolutePath(),
|
||||
"releaser.antora.spring-docs-actions-url=" + file("/projects/spring-docs-actions").toURI(),
|
||||
"releaser.antora.spring-docs-actions-tag=v0.0.16",
|
||||
"releaser.maven.build-command=echo build",
|
||||
"releaser.maven.deploy-command=echo deploy",
|
||||
"releaser.maven.deploy-guides-command=echo guides",
|
||||
|
||||
Reference in New Issue
Block a user