Compare commits

...
43 Commits
Author SHA1 Message Date
buildmaster 65986252e6 Update SNAPSHOT to 4.1.0-M1 2023-08-10 00:49:35 +00:00
Olga MaciaszekSharma 1610010b63 Upgrade to Boot 3.2.0-M1. 2023-07-21 16:12:30 +02:00
Marcin Grzejszczak 0e66d54ff4 Merge branch '4.0.x' 2023-06-27 16:04:41 +02:00
Marcin Grzejszczak 21a18395fa Merge branch '3.1.x' into 4.0.x 2023-06-27 16:04:31 +02:00
Marcin Grzejszczak a2e2ff90e2 Not building the docs for CI builds - changed the env var; fixes gh-239 2023-06-27 14:13:48 +02:00
Marcin Grzejszczak d7f3a8f35d Not building the docs for CI builds - we cant' fetch jars; fixes gh-239 2023-06-27 14:07:14 +02:00
Marcin Grzejszczak b52dff8956 Revert "Not building the docs for CI builds - we cant' fetch jars; fixes gh-239"
This reverts commit 4bea4c590f.
2023-06-27 13:43:19 +02:00
Marcin Grzejszczak 4bea4c590f Not building the docs for CI builds - we cant' fetch jars; fixes gh-239 2023-06-27 13:39:12 +02:00
Marcin Grzejszczak 8087edaf9a Unpacking docs resources only for non CI builds, fixed wrong env var derefernce; fixes gh-239 2023-06-27 12:48:21 +02:00
Marcin Grzejszczak 79ec1a0b58 Unpacking docs resources only for non CI builds; fixes gh-239 2023-06-27 12:29:41 +02:00
Marcin Grzejszczak e095c0f0aa Merge branch '4.0.x' 2023-06-26 14:41:05 +02:00
Marcin Grzejszczak a14578930a Merge branch '3.1.x' into 4.0.x 2023-06-26 14:40:56 +02:00
Marcin Grzejszczak 6f7f008710 Uses jar-with-deps for sc-build-docs; fixes gh-238 2023-06-26 14:40:37 +02:00
Spencer Gibb 443452ebac Merge branch '4.0.x' 2023-06-20 12:21:25 -04:00
Spencer Gibb 2701008de8 Updates spring-asciidoctor-backends version to 0.0.5 2023-06-20 12:21:05 -04:00
Spencer Gibb 87363903b6 Deploy docs jar for now 2023-06-13 14:18:56 -04:00
Spencer Gibb 1902c5b907 Revert "Use previous version for docs temporarily"
This reverts commit b4ad31d593.
2023-06-13 13:26:08 -04:00
Spencer Gibb b4ad31d593 Use previous version for docs temporarily 2023-06-13 13:15:12 -04:00
Spencer Gibb a715cbc47a Updates boot to 3.2.0-SNAPSHOT 2023-06-13 12:45:09 -04:00
Spencer Gibb 4556f19136 Updates to 4.1.0-SNAPSHOT 2023-06-13 12:42:26 -04:00
buildmaster 3243b7a322 Bumping versions 2023-05-25 23:06:26 +00:00
buildmaster cb733fd590 Bumping versions 2023-05-25 14:57:21 +00:00
buildmaster a6af2759db Bumping versions to 4.0.4-SNAPSHOT after release 2023-05-24 17:16:10 +00:00
buildmaster 5d6caf1235 Going back to snapshots 2023-05-24 17:16:10 +00:00
buildmaster 8420504e81 Update SNAPSHOT to 4.0.3 2023-05-24 17:14:35 +00:00
Marcin Grzejszczak 737a871aae Merge branch '3.1.x' 2023-05-04 17:12:43 +02:00
Marcin Grzejszczak 240995fa09 Created a separate task; related to gh-221 2023-05-04 17:12:35 +02:00
Marcin Grzejszczak 6aa7ce8922 Merge branch '3.1.x' 2023-05-04 17:07:47 +02:00
Marcin Grzejszczak 661a4ccb61 Don't fail on error; related to gh-221 2023-05-04 17:07:32 +02:00
Marcin Grzejszczak 753c1e78db Merge branch '3.1.x' 2023-05-04 17:03:08 +02:00
Marcin Grzejszczak 983d743cd6 Adds a conditional on folder; related to gh-221 2023-05-04 17:03:02 +02:00
Marcin Grzejszczak d94e0350a3 Merge branch '3.1.x' 2023-05-04 16:46:07 +02:00
Marcin Grzejszczak 04b16bd386 Fixes htmlsingleadoc by copying the index file; gh-221 2023-05-04 16:44:58 +02:00
buildmaster c34d045a87 Bumping versions to 3.1.8-SNAPSHOT after release 2023-04-27 14:07:42 +00:00
buildmaster 5e60d0ba3b Going back to snapshots 2023-04-27 14:07:42 +00:00
buildmaster 754ac21e0c Update SNAPSHOT to 3.1.7 2023-04-27 14:06:04 +00:00
buildmaster 0c8a004022 Bumping versions 2023-03-29 14:58:01 +00:00
buildmaster 2ddad64197 Bumping versions 2023-03-28 14:57:34 +00:00
buildmaster b39ddf77cd Bumping versions to 4.0.3-SNAPSHOT after release 2023-03-28 13:31:40 +00:00
buildmaster aa945db6ba Going back to snapshots 2023-03-28 13:31:40 +00:00
buildmaster 2742082c21 Bumping versions to 3.1.7-SNAPSHOT after release 2023-02-23 21:59:17 +00:00
buildmaster 4965414a99 Going back to snapshots 2023-02-23 21:59:17 +00:00
buildmaster 63c0f70252 Update SNAPSHOT to 3.1.6 2023-02-23 21:57:59 +00:00
5 changed files with 53 additions and 16 deletions
+4 -2
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.0.2</version>
<version>4.1.0-M1</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
@@ -21,9 +21,11 @@
<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
<!-- Don't upload docs jar to central / repo.spring.io -->
<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
<!-- TODO: temporary, don't want it to central? -->
<maven-deploy-plugin-default.phase>deploy</maven-deploy-plugin-default.phase>
<!-- We don't want to reference plugin classpath of ourselves -->
<readme.class.path>maven.compile.classpath</readme.class.path>
<spring-cloud-build-docs-classifier></spring-cloud-build-docs-classifier>
</properties>
<dependencies>
<!-- Script -->
+44 -9
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.0.2</version>
<version>4.1.0-M1</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,12 +28,12 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>3.0.5</spring-boot.version>
<spring-cloud-build.version>4.0.2</spring-cloud-build.version>
<spring-boot.version>3.2.0-M1</spring-boot.version>
<spring-cloud-build.version>4.1.0-M1</spring-cloud-build.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
<spring-asciidoctor-backends.version>0.0.3</spring-asciidoctor-backends.version>
<spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
<asciidoctorj-diagram.version>2.1.2</asciidoctorj-diagram.version>
<guides-project.version>${project.version}</guides-project.version>
@@ -87,6 +87,7 @@
</maven-checkstyle-plugin.includeTestSourceDirectory>
<spring-cloud-build-checkstyle.branch>master
</spring-cloud-build-checkstyle.branch>
<spring-cloud-build-docs-classifier>jar-with-dependencies</spring-cloud-build-docs-classifier>
<checkstyle.suppressions.file>
https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
</checkstyle.suppressions.file>
@@ -137,6 +138,9 @@
<duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>true</duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>
<duplicate-finder-maven-plugin.includePomProjects>false</duplicate-finder-maven-plugin.includePomProjects>
<maven-gpg-plugin.phase>verify</maven-gpg-plugin.phase>
<generate-docs.phase>prepare-package</generate-docs.phase>
<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
</properties>
<dependencyManagement>
<dependencies>
@@ -1098,6 +1102,7 @@
</artifactId>
<version>${spring-cloud-build.version}
</version>
<classifier>${spring-cloud-build-docs-classifier}</classifier>
<type>jar</type>
</dependency>
</dependencies>
@@ -1192,7 +1197,7 @@
<executions>
<execution>
<id>generate-html-documentation</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -1227,7 +1232,7 @@
</execution>
<execution>
<id>generate-htmlsingle-documentation</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -1255,7 +1260,7 @@
</execution>
<execution>
<id>generate-pdf-documentation</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
@@ -1339,7 +1344,7 @@
</execution>
<execution>
<id>assert-no-unresolved-links</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>run</goal>
</goals>
@@ -1359,9 +1364,24 @@
</target>
</configuration>
</execution>
<execution>
<id>copy-missing-html-files</id>
<phase>${copy-missing-html-files.phase}</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<failOnError>false</failOnError>
<target>
<copy tofile="${project.build.directory}/generated-docs/reference/htmlsingle/index.html">
<fileset dir="${project.build.directory}/generated-docs/reference/htmlsingle" includes="${docs.main}.html" />
</copy>
</target>
</configuration>
</execution>
<execution>
<id>package-and-attach-docs-zip</id>
<phase>package</phase>
<phase>${package-and-attach-docs-zip.phase}</phase>
<goals>
<goal>run</goal>
</goals>
@@ -1615,5 +1635,20 @@
</plugins>
</build>
</profile>
<profile>
<id>CI</id>
<activation>
<property>
<name>env.GITHUB_API_URL</name>
</property>
</activation>
<properties>
<!-- Because of this we will not be catching broken docs in the PRs -->
<generate-docs.phase>none</generate-docs.phase>
<copy-missing-html-files.phase>none</copy-missing-html-files.phase>
<package-and-attach-docs-zip.phase>none</package-and-attach-docs-zip.phase>
<upload-docs-zip.phase>none</upload-docs-zip.phase>
</properties>
</profile>
</profiles>
</project>
+3 -3
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>4.0.2</version>
<version>4.1.0-M1</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,12 +14,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.0.5</version>
<version>3.2.0-M1</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.0.5</spring-boot.version>
<spring-boot.version>3.2.0-M1</spring-boot.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
</properties>
<build>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.0.2</version>
<version>4.1.0-M1</version>
</parent>
<dependencies>
<dependency>
+1 -1
View File
@@ -4,7 +4,7 @@
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>
<version>4.0.2</version>
<version>4.1.0-M1</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>