misc(ci) Automatic readme generation + upgrade Spring Boot versions

groupe-sii · Sep 10, 2020 · 079444f · 079444f
1 parent bfa6603
commit 079444f
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 41 deletions.
diff --git a/.externalToolBuilders/generate readme + wiki.launch b/.externalToolBuilders/generate readme + wiki.launch
@@ -6,7 +6,7 @@
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/ogham/src/docs/asciidoc&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/ogham/src/docs/resources&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/sample-spring-usage/src&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/sample-standard-usage/src&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ogham/mvnw}"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="auto,"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="spring-boot:run &#10;-Dspring-boot.run.arguments=&quot;--generator.doc.source.root-directory=${workspace_loc:/ogham},--generator.github.latestReleaseBranch=${OGHAM_CURRENT_RELEASE_BRANCH},--generator.ogham.latestReleaseVersion=${OGHAM_CURRENT_RELEASE_VERSION},--generator.github.futureDevBranch=${OGHAM_FUTURE_DEV_BRANCH},--generator.ogham.futureDevVersion=${OGHAM_FUTURE_DEV_VERSION},--readme,--wiki&quot;"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="spring-boot:run &#10;-Dspring-boot.run.arguments=&quot;--generator.doc.source.root-directory=${workspace_loc:/ogham} --generator.github.latestReleaseBranch=${OGHAM_CURRENT_RELEASE_BRANCH} --generator.ogham.latestReleaseVersion=${OGHAM_CURRENT_RELEASE_VERSION} --generator.github.futureDevBranch=${OGHAM_FUTURE_DEV_BRANCH} --generator.ogham.futureDevVersion=${OGHAM_FUTURE_DEV_VERSION} --readme --wiki&quot;"/>
     <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/documentation-generator}"/>
 </launchConfiguration>
diff --git a/DEV.adoc b/DEV.adoc
@@ -164,7 +164,7 @@ Once generated, just push `gh-pages` branch on Github
 ----
 cd documentation-generator
 ./mvnw spring-boot:run \
-	-Dspring-boot.run.arguments="--generator.doc.source.root-directory=<ogham root directory>,--generator.github.latestReleaseBranch=v<release version>,--generator.ogham.latestReleaseVersion=<release version>,--generator.github.futureDevBranch=<development branch: master>,--generator.ogham.futureDevVersion=<future release version with -SNAPSHOT>,--readme,--wiki"
+	-Dspring-boot.run.arguments="--generator.doc.source.root-directory=<ogham root directory> --generator.github.latestReleaseBranch=v<release version> --generator.ogham.latestReleaseVersion=<release version> --generator.github.futureDevBranch=<development branch: master> --generator.ogham.futureDevVersion=<future release version with -SNAPSHOT> --readme --wiki"
 ----
 
 Once generated, just push on Github

diff --git a/README.adoc b/README.adoc
@@ -295,9 +295,9 @@ Ogham is compatible with following Spring Boot versions:
 
 * 1.4.x (currently automatically tested against 1.4.7.RELEASE, see note below)
 * 1.5.x (currently automatically tested against 1.5.22.RELEASE)
-* 2.1.x (currently automatically tested against 2.1.15.RELEASE)
-* 2.2.x (currently automatically tested against 2.2.8.RELEASE)
-* 2.3.x (currently automatically tested against 2.3.1.RELEASE)
+* 2.1.x (currently automatically tested against 2.1.16.RELEASE)
+* 2.2.x (currently automatically tested against 2.2.9.RELEASE)
+* 2.3.x (currently automatically tested against 2.3.3.RELEASE)
 
 .Java version compatibility
 [NOTE]

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
@@ -47,10 +47,7 @@
 							<skip>${readme.skip}</skip>
 							<executable>${project.basedir}/.././mvnw</executable>
 							<workingDirectory>${project.basedir}/../documentation-generator</workingDirectory>
-							<arguments>
-								<argument>spring-boot:run</argument>
-								<argument>-Dspring-boot.run.arguments="--readme,--generator.doc.source.root-directory=${project.basedir}/../,--generator.github.latest-release-branch=v${docLatestReleaseVersion},--generator.ogham.latest-release-version=${docLatestReleaseVersion},--generator.github.future-dev-branch=master,--generator.ogham.future-dev-version=${docFutureDevVersion}"</argument>
-							</arguments>
+							<commandlineArgs>spring-boot:run -Dspring-boot.run.arguments="--generator.doc.source.root-directory=${project.basedir}/../ --generator.github.latest-release-branch=v${docLatestReleaseVersion} --generator.ogham.latest-release-version=${docLatestReleaseVersion} --generator.github.future-dev-branch=master --generator.ogham.future-dev-version=${docFutureDevVersion} --readme"</commandlineArgs>
 						</configuration>
 					</execution>
 					<!-- TODO: replace by maven plugin when abort-on-exit is supported -->

diff --git a/documentation-generator/pom.xml b/documentation-generator/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.3.3.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/ogham-test-classpath/src/main/resources/application.yml b/ogham-test-classpath/src/main/resources/application.yml
@@ -40,7 +40,7 @@ spring-matrix:
     build:
       - maven
     spring-boot-version:
-      - 2.1.15.RELEASE
+      - 2.1.16.RELEASE
     spring-boot-dependencies:
       -
       - web
@@ -77,8 +77,8 @@ spring-matrix:
     build:
       - maven
     spring-boot-version:
-      - 2.2.8.RELEASE
-      - 2.3.1.RELEASE
+      - 2.2.9.RELEASE
+      - 2.3.3.RELEASE
     spring-boot-dependencies:
       -
       - web

diff --git a/...utils/src/test/groovy/oghamtesting/it/extensions/logging/SpockLoggingExtensionSpec.groovy b/...utils/src/test/groovy/oghamtesting/it/extensions/logging/SpockLoggingExtensionSpec.groovy
@@ -242,7 +242,7 @@ class SpockLoggingExtensionSpec extends Specification {
 
 	@Unroll
 	@LogTestInformation(maxLength = 100, marker = "foo", printer = TestPrinterFactoryAdapter.class)
-	static class FakeSpec extends Specification {
+	public static class FakeSpec extends Specification {
 
 		@Requires({ System.getProperty("execute-fake-test-for-testing-logging-extension", "").equals("success") })
 		def "success"() {
@@ -293,7 +293,7 @@ class SpockLoggingExtensionSpec extends Specification {
 				and == expected
 
 			where:
-				a | b || expected
+				a     | b     || expected
 				false | false || true
 				false | true  || false
 				true  | false || true

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
 		<httpclient.version>4.5.12</httpclient.version>
 		<httpmime.version>4.5.12</httpmime.version>
 		<spring-boot-v1.version>1.5.22.RELEASE</spring-boot-v1.version>
-		<spring-boot-v2.version>2.3.1.RELEASE</spring-boot-v2.version>
+		<spring-boot-v2.version>2.3.3.RELEASE</spring-boot-v2.version>
 		<spring-boot.version>${spring-boot-v2.version}</spring-boot.version>
 		<joda-time.version>2.10.6</joda-time.version>
 		<!-- Dependencies - tests -->
@@ -72,6 +72,7 @@
 		<wiremock.version>2.27.1</wiremock.version>
 		<hamcrest.version>2.2</hamcrest.version>
 		<spock.version>1.3-groovy-2.5</spock.version>
+		<groovy.version>2.5.12</groovy.version>
 		<groovy-eclipse-compiler.version>3.6.0-03</groovy-eclipse-compiler.version>
 		<groovy-eclipse-batch.version>2.5.8-03</groovy-eclipse-batch.version>
 		<awaitility.version>4.0.3</awaitility.version>
@@ -636,6 +637,46 @@
 				<artifactId>spock-core</artifactId>
 				<version>${spock.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-json</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-nio</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-macro</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-templates</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-test</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-sql</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-xml</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.awaitility</groupId>
 				<artifactId>awaitility</artifactId>

diff --git a/sample-spring-usage/pom.xml b/sample-spring-usage/pom.xml
@@ -14,7 +14,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- Spring version -->
-		<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.3.RELEASE</spring-boot.version>
 
 		<!-- Skip Sonar analysis -->
 		<sonar.skip>true</sonar.skip>

diff --git a/spring-initializr/src/main/resources/application.yml b/spring-initializr/src/main/resources/application.yml
@@ -5,14 +5,14 @@ initializr:
     - id: 1.5.22.RELEASE
       name: 1.5.22
       default: false
-    - id: 2.1.15.RELEASE
-      name: 2.1.15
+    - id: 2.1.16.RELEASE
+      name: 2.1.16
       default: true
-    - id: 2.2.8.RELEASE
-      name: 2.2.8
+    - id: 2.2.9.RELEASE
+      name: 2.2.9
       default: false
-    - id: 2.3.1.RELEASE
-      name: 2.3.1
+    - id: 2.3.3.RELEASE
+      name: 2.3.3
       default: false
   javaVersions:
     - id: 14
@@ -77,9 +77,6 @@ initializr:
           scope: compileOnly
           description: Java annotation library which helps to reduce boilerplate code and code faster
           starter: false
-#          mappings:
-#            - versionRange: "[1.3.0.RELEASE,1.4.0.RELEASE)"
-#              version: 1.16.6
     - name: Web
       content:
         - name: Web

diff --git a/src/docs/asciidoc/user-manual/installation/springboot-all.adoc b/src/docs/asciidoc/user-manual/installation/springboot-all.adoc
@@ -18,7 +18,7 @@ include::{docdir}/variables.adoc[]
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.3.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>samples</groupId>
@@ -73,8 +73,8 @@ include::{docdir}/variables.adoc[]
 [source, groovy, subs=attributes+, role="collapse-lines:1-13,17-24 highlight-lines:16"]
 ----
 plugins {
-	id 'org.springframework.boot' version '2.3.1.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'org.springframework.boot' version '2.3.3.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java'
 }
 
@@ -134,7 +134,7 @@ You can combine Ogham with existing Spring Boot dependencies:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.3.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>samples</groupId>
@@ -209,8 +209,8 @@ by Spring Boot.
 [source, groovy, subs=attributes+, role="collapse-lines:1-13,21-27 highlight-lines:16"]
 ----
 plugins {
-	id 'org.springframework.boot' version '2.3.1.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'org.springframework.boot' version '2.3.3.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java'
 }
 
@@ -259,9 +259,9 @@ Ogham is compatible with following Spring Boot versions:
 
 * 1.4.x (currently automatically tested against 1.4.7.RELEASE, see note below)
 * 1.5.x (currently automatically tested against 1.5.22.RELEASE)
-* 2.1.x (currently automatically tested against 2.1.15.RELEASE)
-* 2.2.x (currently automatically tested against 2.2.8.RELEASE)
-* 2.3.x (currently automatically tested against 2.3.1.RELEASE)
+* 2.1.x (currently automatically tested against 2.1.16.RELEASE)
+* 2.2.x (currently automatically tested against 2.2.9.RELEASE)
+* 2.3.x (currently automatically tested against 2.3.3.RELEASE)
 
 .Java version compatibility
 [NOTE]

diff --git a/src/docs/asciidoc/user-manual/installation/springboot-selective.adoc b/src/docs/asciidoc/user-manual/installation/springboot-selective.adoc
@@ -25,7 +25,7 @@ it doesn't import anything to deal with SMS.
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.3.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>samples</groupId>
@@ -101,8 +101,8 @@ by Spring Boot.
 [source, groovy, subs=attributes+, role="collapse-lines:1-13,21-27 highlight-lines:16"]
 ----
 plugins {
-	id 'org.springframework.boot' version '2.3.1.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'org.springframework.boot' version '2.3.3.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java'
 }
 
@@ -165,7 +165,7 @@ To benefit from Spring Boot auto-configuration, you just need to add
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version>
+		<version>2.3.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>samples</groupId>
@@ -246,8 +246,8 @@ itself to use Spring Boot features.
 [source, groovy, subs=attributes+, role="collapse-lines:1-13,22-28 highlight-lines:16-18"]
 ----
 plugins {
-	id 'org.springframework.boot' version '2.3.1.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'org.springframework.boot' version '2.3.3.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java'
 }