This is an automated email from the ASF dual-hosted git repository. CritasWang pushed a commit to branch wx/iotdb-2.0.11-alignment in repository https://gitbox.apache.org/repos/asf/iotdb-extras.git
commit a6d5cb810f3b0da3701f0ba9e7906bb2bbab1f3c Author: CritasWang <[email protected]> AuthorDate: Thu Sep 17 17:50:47 2026 +0800 build: run the reactor quality gates on the Spring Boot examples The MyBatis-Plus example had no parent since the Spring Boot starter parent was dropped, so Spotless ran from a hand-copied configuration and Checkstyle, RAT and the reactor's plugin management never touched it. Inherit the examples parent and re-point the inherited Spring, Jackson and Mockito management at the selected Boot line for both the default Boot 3.5.1 build and the spring-boot4 profile; surefire moves to a JUnit Platform 6 capable version for Boot 4. The Spring Boot starter example now uses the reactor's google-java-format 1.28.0 / Spotless 2.44.5 instead of the pins the reactor moved away from. --- examples/iotdb-spring-boot-start/pom.xml | 4 +- examples/mybatisplus-generator/README.md | 2 +- examples/mybatisplus-generator/pom.xml | 65 +++++++++++++++++--------------- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/examples/iotdb-spring-boot-start/pom.xml b/examples/iotdb-spring-boot-start/pom.xml index c3f4fc1..8de45bf 100644 --- a/examples/iotdb-spring-boot-start/pom.xml +++ b/examples/iotdb-spring-boot-start/pom.xml @@ -36,8 +36,8 @@ <properties> <java.version>17</java.version> <version>3.5.1</version> - <google.java.format.version>1.22.0</google.java.format.version> - <spotless.version>2.43.0</spotless.version> + <google.java.format.version>1.28.0</google.java.format.version> + <spotless.version>2.44.5</spotless.version> <iotdb.version>2.0.11</iotdb.version> </properties> <dependencies> diff --git a/examples/mybatisplus-generator/README.md b/examples/mybatisplus-generator/README.md index ac51797..a694794 100644 --- a/examples/mybatisplus-generator/README.md +++ b/examples/mybatisplus-generator/README.md @@ -21,7 +21,7 @@ # MyBatis-Plus example -An IoTDB **table-model** example using **JDK 17+, MyBatis-Plus 3.5.15 and JDBC 2.0.11**. The default build uses Spring Boot 3.5.1; `spring-boot4` selects Boot 4.1.1 and `mybatis-plus-spring-boot4-starter`. Each build uses one Boot BOM for its complete dependency set. Velocity 2.4.1 is declared explicitly for code generation. +An IoTDB **table-model** example using **JDK 17+, MyBatis-Plus 3.5.15 and JDBC 2.0.11**. The default build uses Spring Boot 3.5.1; `spring-boot4` selects Boot 4.1.1 and `mybatis-plus-spring-boot4-starter`. Each build imports one Boot BOM; the module inherits the reactor parent, so the reactor's Spring, Jackson and Mockito management is re-pointed at the selected Boot line in the pom, and the reactor quality gates (Spotless, Checkstyle, RAT) run on it like on every other module. Velocity [...] ## Prepare and run diff --git a/examples/mybatisplus-generator/pom.xml b/examples/mybatisplus-generator/pom.xml index d95c303..26bb891 100644 --- a/examples/mybatisplus-generator/pom.xml +++ b/examples/mybatisplus-generator/pom.xml @@ -21,7 +21,11 @@ --> <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.apache.iotdb</groupId> + <parent> + <groupId>org.apache.iotdb</groupId> + <artifactId>examples</artifactId> + <version>2.0.4-SNAPSHOT</version> + </parent> <artifactId>mybatisplus-generator-example</artifactId> <name>IoTDB: Example: Mybatis Plus Generator</name> <version>2.0.4-SNAPSHOT</version> @@ -29,12 +33,19 @@ <mybatisplus.version>3.5.15</mybatisplus.version> <mybatisplus-starter>mybatis-plus-spring-boot3-starter</mybatisplus-starter> <web-starter>spring-boot-starter-web</web-starter> - <java.version>17</java.version> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- + The reactor parent manages spring-boot, spring-boot-autoconfigure, the spring-* artifacts, + jackson-bom and mockito-core for the legacy Boot 2 / Spring 5 Grafana WAR. Inherited + management wins over the BOM imported below, so those lines are re-pointed at the + Spring Boot 3.5.1 values here and at the Spring Boot 4.1.1 values in the spring-boot4 + profile. Logging (slf4j, logback) stays on the reactor's line. + --> <spring-boot.version>3.5.1</spring-boot.version> - <iotdb.version>2.0.11</iotdb.version> + <spring.version>6.2.8</spring.version> + <jackson.version>2.19.1</jackson.version> + <jackson-annotations.version>2.19.1</jackson-annotations.version> + <mockito.version>5.17.0</mockito.version> </properties> <dependencyManagement> <dependencies> @@ -45,13 +56,22 @@ <type>pom</type> <scope>import</scope> </dependency> + <!-- + Jackson 2.21 publishes jackson-annotations as 2.21 while the rest of the line is + 2.21.x; the reactor pins jackson-annotations to ${jackson.version}, so re-pin it here. + --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson-annotations.version}</version> + </dependency> </dependencies> </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>mybatis-support</artifactId> - <version>2.0.4-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.baomidou</groupId> @@ -71,7 +91,6 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-jdbc</artifactId> - <version>${iotdb.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -82,7 +101,6 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -91,7 +109,6 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> - <version>${spring-boot.version}</version> <scope>test</scope> </dependency> <dependency> @@ -113,38 +130,20 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.14.0</version> <configuration> - <release>17</release> <parameters>true</parameters> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <!-- JUnit Platform 6 (Spring Boot 4) needs a newer provider than the reactor's 3.1.2. --> <version>3.5.3</version> - </plugin> - <plugin> - <groupId>com.diffplug.spotless</groupId> - <artifactId>spotless-maven-plugin</artifactId> - <version>2.44.5</version> - <configuration> - <java> - <googleJavaFormat> - <version>1.28.0</version> - </googleJavaFormat> - <importOrder> - <order>org.apache.iotdb,,javax,java,\#</order> - </importOrder> - <removeUnusedImports/> - </java> - </configuration> <executions> + <!-- *IT classes need a live server; they run through failsafe under iotdb-mybatis-it. --> <execution> - <goals> - <goal>check</goal> - </goals> - <phase>validate</phase> + <id>integration-tests</id> + <phase>none</phase> </execution> </executions> </plugin> @@ -160,6 +159,10 @@ <id>spring-boot4</id> <properties> <spring-boot.version>4.1.1</spring-boot.version> + <spring.version>7.0.9</spring.version> + <jackson.version>2.21.5</jackson.version> + <jackson-annotations.version>2.21</jackson-annotations.version> + <mockito.version>5.23.0</mockito.version> <mybatisplus-starter>mybatis-plus-spring-boot4-starter</mybatisplus-starter> <web-starter>spring-boot-starter-webmvc</web-starter> </properties>
