Skip to content

Commit e0d9ef6

Browse files
jeffgbutlerjeffgbutler
committed
Merge branch 'master' into r2dbc-support
# Conflicts: # src/main/resources/org/mybatis/dynamic/sql/util/messages.properties
2 parents 81ec453 + 4c21023 commit e0d9ef6

File tree

556 files changed

+687
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

556 files changed

+687
-557
lines changed

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2016-2023 the original author or authors.
4+
Copyright 2016-2024 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎.mvn/settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2016-2023 the original author or authors.
4+
Copyright 2016-2024 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions

‎checkstyle-override.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright 2016-2023 the original author or authors.
4+
Copyright 2016-2024 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright 2016-2023 the original author or authors.
3+
Copyright 2016-2024 the original author or authors.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.mybatis</groupId>
2222
<artifactId>mybatis-parent</artifactId>
23-
<version>41</version>
23+
<version>42</version>
2424
</parent>
2525
<groupId>org.mybatis.dynamic-sql</groupId>
2626
<artifactId>mybatis-dynamic-sql</artifactId>
@@ -71,7 +71,7 @@
7171
<sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
7272

7373
<kotlin.code.style>official</kotlin.code.style>
74-
<test.containers.version>1.19.3</test.containers.version>
74+
<test.containers.version>1.19.4</test.containers.version>
7575
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
7676

7777
<!-- Reproducible Builds -->
@@ -122,7 +122,7 @@
122122
<dependency>
123123
<groupId>org.assertj</groupId>
124124
<artifactId>assertj-core</artifactId>
125-
<version>3.25.1</version>
125+
<version>3.25.2</version>
126126
<scope>test</scope>
127127
</dependency>
128128
<dependency>

‎src/main/java/org/mybatis/dynamic/sql/AbstractColumnComparisonCondition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2023 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2023 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/org/mybatis/dynamic/sql/AbstractNoValueCondition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2023 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/org/mybatis/dynamic/sql/AbstractSingleValueCondition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2023 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/java/org/mybatis/dynamic/sql/AbstractSubselectCondition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2023 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)