Skip to content

Commit 773d849

Browse files
committed
Revert "upgrade spring data to 3.2 (#280)"
This reverts commit cee52e7.
1 parent cee52e7 commit 773d849

File tree

244 files changed

+527
-807
lines changed

Some content is hidden

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

244 files changed

+527
-807
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ ij_java_for_statement_wrap = off
115115
ij_java_generate_final_locals = false
116116
ij_java_generate_final_parameters = false
117117
ij_java_if_brace_force = never
118-
ij_java_imports_layout = java.**, |, jakarta.**, |, *, |, io.easybest.**, |, $*
118+
ij_java_imports_layout = java.**, |, javax.**, |, *, |, io.easybest.**, |, $*
119119
ij_java_indent_case_from_switch = true
120120
ij_java_insert_inner_class_imports = false
121121
ij_java_insert_override_annotation = true

.github/workflows/github-actions-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
name: 'Deploy to Maven Central'
1414
steps:
1515
- uses: actions/checkout@v3
16-
- name: 'Set up JDK 17'
16+
- name: 'Set up JDK 8'
1717
uses: actions/setup-java@v3
1818
with:
19-
java-version: '17'
19+
java-version: '8'
2020
distribution: 'adopt'
2121
- name: Gradle Cache
2222
uses: actions/cache@v3

.github/workflows/github-actions-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
strategy:
77
matrix:
8-
java: [ 17 ]
8+
java: [ 8, 11, 17 ]
99
name: 'Build on Java ${{ matrix.java }}'
1010
steps:
1111
- uses: actions/checkout@v3

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "org.jetbrains.kotlin.jvm" apply false
3-
id "io.spring.nohttp" version "0.0.11"
3+
id "io.spring.nohttp" version "0.0.10"
44
}
55

66

@@ -47,12 +47,12 @@ configure(javaProjects) { project ->
4747
apply plugin: "io.easybest.gradle.plugin.deployed"
4848
apply plugin: "io.easybest.gradle.plugin.optional-dependencies"
4949

50-
sourceCompatibility = 17
51-
targetCompatibility = 17
50+
sourceCompatibility = 1.8
51+
targetCompatibility = 1.8
5252

5353
java {
5454
toolchain {
55-
languageVersion = JavaLanguageVersion.of(17)
55+
languageVersion = JavaLanguageVersion.of(8)
5656
}
5757
}
5858
}

buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
maven { url "https://repo.spring.io/release" }
1111
}
1212

13-
sourceCompatibility = 17
14-
targetCompatibility = 17
13+
sourceCompatibility = 1.8
14+
targetCompatibility = 1.8
1515

1616
dependencies {
1717
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.28")

buildSrc/src/main/java/io/easybest/mybatis/build/JavaConventions.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.TreeMap;
2525
import java.util.stream.Collectors;
2626

27+
import io.easybest.mybatis.build.toolchain.ToolchainPlugin;
2728
import io.spring.javaformat.gradle.FormatTask;
2829
import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
2930
import org.gradle.api.JavaVersion;
@@ -38,14 +39,12 @@
3839
import org.gradle.api.tasks.compile.JavaCompile;
3940
import org.gradle.api.tasks.javadoc.Javadoc;
4041

41-
import io.easybest.mybatis.build.toolchain.ToolchainPlugin;
42-
4342
/**
4443
* @author Jarvis Song
4544
*/
4645
class JavaConventions {
4746

48-
private static final String SOURCE_AND_TARGET_COMPATIBILITY = "17";
47+
private static final String SOURCE_AND_TARGET_COMPATIBILITY = "1.8";
4948

5049
void apply(Project project) {
5150
project.getPlugins().withType(JavaBasePlugin.class, java -> {
@@ -115,7 +114,7 @@ private void configureJavaCompileConventions(Project project) {
115114
}
116115

117116
private boolean buildingWithJava8(Project project) {
118-
return !project.hasProperty("toolchainVersion") && JavaVersion.current() == JavaVersion.VERSION_17;
117+
return !project.hasProperty("toolchainVersion") && JavaVersion.current() == JavaVersion.VERSION_1_8;
119118
}
120119

121120
private void configureSpringJavaFormat(Project project) {

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description "${projectName} core"
22

33
dependencies {
44

5-
api("jakarta.persistence:jakarta.persistence-api:3.1.0")
5+
api("javax.persistence:javax.persistence-api:2.2")
66
compileOnly("org.springframework.data:spring-data-commons:${springDataVersion}")
77
compileOnly('com.google.code.findbugs:annotations:3.0.1')
88

core/src/main/java/io/easybest/mybatis/annotation/DatabaseDefault.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2023 the original author or authors.
2+
* Copyright 2019-2022 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.

core/src/main/java/io/easybest/mybatis/annotation/GetterOptional.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2023 the original author or authors.
2+
* Copyright 2019-2022 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.

core/src/main/java/io/easybest/mybatis/annotation/JdbcType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2023 the original author or authors.
2+
* Copyright 2019-2022 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)