Skip to content

Commit 36f6c91

Browse files
rPramlrPraml
committed
Merge branch 'master-rob' into bug-property-access-on-inherited
2 parents f4167ba + c7241ba commit 36f6c91

File tree

1,332 files changed

+5618
-3838
lines changed

Some content is hidden

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

1,332 files changed

+5618
-3838
lines changed

‎.github/workflows/multi-jdk-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
java_version: [11, 17]
19+
java_version: [11, 17, 21]
2020
os: [ubuntu-latest]
2121

2222
steps:
@@ -34,6 +34,8 @@ jobs:
3434
path:
3535
~/.m2
3636
key: build-${{ env.cache-name }}
37+
- name: Maven version
38+
run: mvn --version
3739
- name: Build with Maven
3840
run: mvn package
3941

‎composites/ebean-clickhouse/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-clickhouse</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-clickhouse</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-cockroach/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-cockroach</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-postgres</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-db2/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-db2</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-db2</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-h2/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-h2</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-h2</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-hana/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-hana</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-hana</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-mariadb/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-mariadb</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-mariadb</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-mysql/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-mysql</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-mysql</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

‎composites/ebean-nuodb/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>composites</artifactId>
5+
<artifactId>ebean-parent</artifactId>
66
<groupId>io.ebean</groupId>
7-
<version>13.21.1-SNAPSHOT</version>
7+
<version>13.23.0-jakarta</version>
8+
<relativePath>../..</relativePath>
89
</parent>
910

1011
<name>ebean-nuodb</name>
@@ -16,13 +17,13 @@
1617
<dependency>
1718
<groupId>io.ebean</groupId>
1819
<artifactId>ebean-api</artifactId>
19-
<version>13.21.1-SNAPSHOT</version>
20+
<version>13.23.0-jakarta</version>
2021
</dependency>
2122

2223
<dependency>
2324
<groupId>io.ebean</groupId>
2425
<artifactId>ebean-core</artifactId>
25-
<version>13.21.1-SNAPSHOT</version>
26+
<version>13.23.0-jakarta</version>
2627
</dependency>
2728

2829
<dependency>
@@ -41,13 +42,13 @@
4142
<dependency>
4243
<groupId>io.ebean</groupId>
4344
<artifactId>ebean-querybean</artifactId>
44-
<version>13.21.1-SNAPSHOT</version>
45+
<version>13.23.0-jakarta</version>
4546
</dependency>
4647

4748
<dependency>
4849
<groupId>io.ebean</groupId>
4950
<artifactId>ebean-platform-nuodb</artifactId>
50-
<version>13.21.1-SNAPSHOT</version>
51+
<version>13.23.0-jakarta</version>
5152
</dependency>
5253

5354
</dependencies>

0 commit comments

Comments
 (0)