Skip to content

Commit 0a92cdd

Browse files
github-actions[bot]github-actions[bot]
authored
Build(deps): Bump git-code-format-maven-plugin.version from 5.3 to 5.4 (#1388)
Bumps `git-code-format-maven-plugin.version` from 5.3 to 5.4. Updates `com.cosium.code:google-java-format` from 5.3 to 5.4 <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/1a7f9104d32a87a0035e75d90a092f3137a1f98c"><code>1a7f910</code></a> [maven-release-plugin] prepare release 5.4</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/ba3835e660ca56eb902857fe08227926c4164b47"><code>ba3835e</code></a> Upgrade the release script</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/652d6ed489b06f658599d93fa0582060be10aec6"><code>652d6ed</code></a> Use com.cosium.maven_oss:maven-oss as superpom</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/55f560edb32d8d8e39d848b917d3a37267569dab"><code>55f560e</code></a> Bump org.assertj:assertj-core from 3.27.4 to 3.27.5 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/305">#305</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/cd88ce1bca506b2ac470f089057ef4649034d074"><code>cd88ce1</code></a> Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.3 to 3.12.0 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/306">#306</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/1217fb2cd1fb0cf928643321d51868e2b5c8a039"><code>1217fb2</code></a> Bump org.apache.maven.plugins:maven-compiler-plugin from 3.14.0 to 3.14.1 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/307">#307</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/920d26450d0526f71b86cc5d55913b322b24b889"><code>920d264</code></a> Bump com.google.guava:guava from 33.4.8-jre to 33.5.0-jre (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/308">#308</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/cd3f552af7d4d0c37faa568fc4abb65c99a54971"><code>cd3f552</code></a> Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.3 to 3.5.4 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/304">#304</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/8dba0d71e78348e9be9433145526103f55b8032d"><code>8dba0d7</code></a> Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.2 to 3.11.3 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/302">#302</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/8620261ef8927a802950be6df15ba2de1b1dcc9c"><code>8620261</code></a> Bump org.assertj:assertj-core from 3.27.3 to 3.27.4 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/301">#301</a>)</li> <li>Additional commits viewable in <a href="https://github.com/Cosium/git-code-format-maven-plugin/compare/5.3...5.4">compare view</a></li> </ul> </details> <br /> Updates `com.cosium.code:git-code-format-maven-plugin` from 5.3 to 5.4 <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/1a7f9104d32a87a0035e75d90a092f3137a1f98c"><code>1a7f910</code></a> [maven-release-plugin] prepare release 5.4</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/ba3835e660ca56eb902857fe08227926c4164b47"><code>ba3835e</code></a> Upgrade the release script</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/652d6ed489b06f658599d93fa0582060be10aec6"><code>652d6ed</code></a> Use com.cosium.maven_oss:maven-oss as superpom</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/55f560edb32d8d8e39d848b917d3a37267569dab"><code>55f560e</code></a> Bump org.assertj:assertj-core from 3.27.4 to 3.27.5 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/305">#305</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/cd88ce1bca506b2ac470f089057ef4649034d074"><code>cd88ce1</code></a> Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.3 to 3.12.0 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/306">#306</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/1217fb2cd1fb0cf928643321d51868e2b5c8a039"><code>1217fb2</code></a> Bump org.apache.maven.plugins:maven-compiler-plugin from 3.14.0 to 3.14.1 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/307">#307</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/920d26450d0526f71b86cc5d55913b322b24b889"><code>920d264</code></a> Bump com.google.guava:guava from 33.4.8-jre to 33.5.0-jre (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/308">#308</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/cd3f552af7d4d0c37faa568fc4abb65c99a54971"><code>cd3f552</code></a> Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.3 to 3.5.4 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/304">#304</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/8dba0d71e78348e9be9433145526103f55b8032d"><code>8dba0d7</code></a> Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.2 to 3.11.3 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/302">#302</a>)</li> <li><a href="https://github.com/Cosium/git-code-format-maven-plugin/commit/8620261ef8927a802950be6df15ba2de1b1dcc9c"><code>8620261</code></a> Bump org.assertj:assertj-core from 3.27.3 to 3.27.4 (<a href="https://redirect.github.com/Cosium/git-code-format-maven-plugin/issues/301">#301</a>)</li> <li>Additional commits viewable in <a href="https://github.com/Cosium/git-code-format-maven-plugin/compare/5.3...5.4">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
2 parents b324a0f + 281ebc6 commit 0a92cdd

File tree

23 files changed

+88
-65
lines changed

23 files changed

+88
-65
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<main.java.version>17</main.java.version>
103103
<latest.java.version>21</latest.java.version>
104104

105-
<git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
105+
<git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
106106

107107
<junit.version>6.0.0</junit.version>
108108
<ecj.version>3.43.0</ecj.version>

‎querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ public void nullsFirst() {
245245
md.addOrderBy(cat.name.asc().nullsFirst());
246246
serializer.serialize(md, false, null);
247247
assertThat(serializer.toString())
248-
.isEqualTo("""
248+
.isEqualTo(
249+
"""
249250
select cat
250251
from Cat cat
251252
order by cat.name asc nulls first""");
@@ -260,7 +261,8 @@ public void nullsLast() {
260261
md.addOrderBy(cat.name.asc().nullsLast());
261262
serializer.serialize(md, false, null);
262263
assertThat(serializer.toString())
263-
.isEqualTo("""
264+
.isEqualTo(
265+
"""
264266
select cat
265267
from Cat cat
266268
order by cat.name asc nulls last""");

‎querydsl-libraries/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/SQLTemplates.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -455,25 +455,25 @@ public String serialize(String literal, int jdbcType) {
455455
case Types.DATE -> "(date '" + literal + "')";
456456
case Types.TIME, TIME_WITH_TIMEZONE -> "(time '" + literal + "')";
457457
case Types.CHAR,
458-
Types.CLOB,
459-
Types.LONGNVARCHAR,
460-
Types.LONGVARCHAR,
461-
Types.NCHAR,
462-
Types.NCLOB,
463-
Types.NVARCHAR,
464-
Types.VARCHAR ->
458+
Types.CLOB,
459+
Types.LONGNVARCHAR,
460+
Types.LONGVARCHAR,
461+
Types.NCHAR,
462+
Types.NCLOB,
463+
Types.NVARCHAR,
464+
Types.VARCHAR ->
465465
"'" + escapeLiteral(literal) + "'";
466466
case Types.BIGINT,
467-
Types.BIT,
468-
Types.BOOLEAN,
469-
Types.DECIMAL,
470-
Types.DOUBLE,
471-
Types.FLOAT,
472-
Types.INTEGER,
473-
Types.NULL,
474-
Types.NUMERIC,
475-
Types.SMALLINT,
476-
Types.TINYINT ->
467+
Types.BIT,
468+
Types.BOOLEAN,
469+
Types.DECIMAL,
470+
Types.DOUBLE,
471+
Types.FLOAT,
472+
Types.INTEGER,
473+
Types.NULL,
474+
Types.NUMERIC,
475+
Types.SMALLINT,
476+
Types.TINYINT ->
477477
literal;
478478
default -> /* for other JDBC types the Type instance is expected to provide */ /* the necessary quoting */
479479
literal;

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractSQLTemplatesTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public void union() {
8383
""");
8484
} else {
8585
assertThat(union.toString())
86-
.isEqualTo("""
86+
.isEqualTo(
87+
"""
8788
select 1 as col1)
8889
union
8990
select 2

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinFlagsTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public void joinFlags_beforeCondition() {
5050
query.addJoinFlag(" a ", JoinFlag.Position.BEFORE_CONDITION);
5151

5252
assertThat(query.toString())
53-
.isEqualTo("""
53+
.isEqualTo(
54+
"""
5455
from SURVEY s
5556
inner join SURVEY s2 a\s
5657
on s.ID = s2.ID""");
@@ -63,7 +64,8 @@ public void joinFlags_beforeTarget() {
6364
query.addJoinFlag(" b ", JoinFlag.Position.BEFORE_TARGET);
6465

6566
assertThat(query.toString())
66-
.isEqualTo("""
67+
.isEqualTo(
68+
"""
6769
from SURVEY s
6870
inner join b SURVEY s3
6971
on s.ID = s3.ID""");
@@ -76,7 +78,8 @@ public void joinFlags_end() {
7678
query.addJoinFlag(" c ", JoinFlag.Position.END);
7779

7880
assertThat(query.toString())
79-
.isEqualTo("""
81+
.isEqualTo(
82+
"""
8083
from SURVEY s
8184
inner join SURVEY s4
8285
on s.ID = s4.ID c""");
@@ -98,7 +101,8 @@ public void joinFlags_start() {
98101
query.addJoinFlag(" e ", JoinFlag.Position.START);
99102

100103
assertThat(query.toString())
101-
.isEqualTo("""
104+
.isEqualTo(
105+
"""
102106
from SURVEY s e\s
103107
inner join SURVEY s6
104108
on s.ID = s6.ID""");

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PostgreSQLTemplatesTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public void union() {
4848
R2DBCExpressions.select(two),
4949
R2DBCExpressions.select(three));
5050
assertThat(union.toString())
51-
.isEqualTo("""
51+
.isEqualTo(
52+
"""
5253
(select 1 as col1)
5354
union
5455
(select 2)

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2005TemplatesTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public void union() {
5252
R2DBCExpressions.select(two),
5353
R2DBCExpressions.select(three));
5454
assertThat(union.toString())
55-
.isEqualTo("""
55+
.isEqualTo(
56+
"""
5657
(select 1 as col1)
5758
union
5859
(select 2)

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2012TemplatesTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public void union() {
5353
R2DBCExpressions.select(two),
5454
R2DBCExpressions.select(three));
5555
assertThat(union.toString())
56-
.isEqualTo("""
56+
.isEqualTo(
57+
"""
5758
(select 1 as col1)
5859
union
5960
(select 2)

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServerTemplatesTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public void union() {
5151
R2DBCExpressions.select(two),
5252
R2DBCExpressions.select(three));
5353
assertThat(union.toString())
54-
.isEqualTo("""
54+
.isEqualTo(
55+
"""
5556
(select 1 as col1)
5657
union
5758
(select 2)

‎querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionSubQueryTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public void in_union() {
4747

4848
serializer.handle(expr);
4949
assertThat(serializer.toString())
50-
.isEqualTo("""
50+
.isEqualTo(
51+
"""
5152
intPath in ((select 1 from dual)
5253
union
5354
(select 2 from dual))""");

0 commit comments

Comments
 (0)