Skip to content

Commit ff0adec

Browse files
slonopotamusslonopotamus
committed
Upgrade deps, drop Java 8 support
1 parent 4c06126 commit ff0adec

23 files changed

+40
-37
lines changed

‎.github/workflows/ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jobs:
77
strategy:
88
matrix:
99
include:
10-
- java: 8
1110
- java: 11
1211
- java: 15
1312
runs-on: ubuntu-latest
@@ -34,7 +33,7 @@ jobs:
3433
uses: actions/setup-java@v2
3534
with:
3635
distribution: 'adopt'
37-
java-version: 8 # Build releases using oldest supported jdk
36+
java-version: 11 # Build releases using oldest supported jdk
3837
- name: Publish to Sonatype
3938
uses: eskatos/gradle-command-action@v1
4039
env:

‎build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ val ossrhUsername: String? = System.getenv("OSSRH_USERNAME")
88
val ossrhPassword: String? = System.getenv("OSSRH_PASSWORD")
99

1010
tasks.wrapper {
11-
gradleVersion = "6.8.1"
11+
gradleVersion = "7.1.1"
1212
distributionType = Wrapper.DistributionType.ALL
1313
}
1414

@@ -32,7 +32,7 @@ allprojects {
3232
}
3333
}
3434

35-
val javaVersion = JavaVersion.VERSION_1_8
35+
val javaVersion = JavaVersion.VERSION_11
3636

3737
idea {
3838
project.jdkName = javaVersion.name

‎gitlfs-client/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description = "Java Git-LFS client library"
33
dependencies {
44
api(project(":gitlfs-common"))
55
api("org.apache.httpcomponents:httpclient:4.5.13")
6-
implementation("org.slf4j:slf4j-api:1.7.30")
6+
implementation("org.slf4j:slf4j-api:1.7.32")
77

8-
testImplementation("org.yaml:snakeyaml:1.27")
9-
testRuntimeOnly("org.slf4j:slf4j-simple:1.7.30")
8+
testImplementation("org.yaml:snakeyaml:1.29")
9+
testRuntimeOnly("org.slf4j:slf4j-simple:1.7.32")
1010
}

‎gitlfs-common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
description = "Java Git-LFS common structures"
22

33
dependencies {
4-
api("com.fasterxml.jackson.core:jackson-databind:2.12.1")
4+
api("com.fasterxml.jackson.core:jackson-databind:2.12.4")
55
}

‎gitlfs-server/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ description = "Java Git-LFS server implementation-free library"
22

33
dependencies {
44
api(project(":gitlfs-common"))
5-
api("javax.servlet:javax.servlet-api:4.0.1")
5+
api("org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2")
66

77
testImplementation(project(":gitlfs-client"))
8-
testImplementation("org.eclipse.jetty:jetty-servlet:9.4.36.v20210114")
9-
testRuntimeOnly("org.slf4j:slf4j-simple:1.7.30")
8+
testImplementation("org.eclipse.jetty:jetty-servlet:11.0.6")
9+
testRuntimeOnly("org.slf4j:slf4j-simple:1.7.32")
1010
}

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/ContentManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletRequest;
34
import ru.bozaro.gitlfs.common.data.Meta;
45

56
import javax.annotation.CheckForNull;
67
import javax.annotation.Nonnull;
7-
import javax.servlet.http.HttpServletRequest;
88
import java.io.IOException;
99
import java.io.InputStream;
1010
import java.util.Map;

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/ContentServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
37
import ru.bozaro.gitlfs.common.Constants;
48
import ru.bozaro.gitlfs.common.JsonHelper;
59
import ru.bozaro.gitlfs.common.data.Meta;
@@ -8,10 +12,6 @@
812
import ru.bozaro.gitlfs.server.internal.ResponseWriter;
913

1014
import javax.annotation.Nonnull;
11-
import javax.servlet.ServletException;
12-
import javax.servlet.http.HttpServlet;
13-
import javax.servlet.http.HttpServletRequest;
14-
import javax.servlet.http.HttpServletResponse;
1515
import java.io.IOException;
1616
import java.io.InputStream;
1717
import java.util.regex.Pattern;

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/ForbiddenError.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletResponse;
4+
35
import javax.annotation.Nonnull;
4-
import javax.servlet.http.HttpServletResponse;
56

67
/**
78
* Forbidden error.

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/LocalPointerManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletRequest;
34
import ru.bozaro.gitlfs.common.Constants;
45
import ru.bozaro.gitlfs.common.data.Error;
56
import ru.bozaro.gitlfs.common.data.*;
67

78
import javax.annotation.CheckForNull;
89
import javax.annotation.Nonnull;
9-
import javax.servlet.http.HttpServletRequest;
1010
import java.io.IOException;
1111
import java.net.URI;
1212
import java.util.EnumMap;

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/LockManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletRequest;
34
import ru.bozaro.gitlfs.common.LockConflictException;
45
import ru.bozaro.gitlfs.common.VerifyLocksResult;
56
import ru.bozaro.gitlfs.common.data.Lock;
67
import ru.bozaro.gitlfs.common.data.Ref;
78

89
import javax.annotation.CheckForNull;
910
import javax.annotation.Nonnull;
10-
import javax.servlet.http.HttpServletRequest;
1111
import java.io.IOException;
1212
import java.util.List;
1313

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/LocksServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
37
import ru.bozaro.gitlfs.common.JsonHelper;
48
import ru.bozaro.gitlfs.common.LockConflictException;
59
import ru.bozaro.gitlfs.common.VerifyLocksResult;
@@ -8,10 +12,6 @@
812
import ru.bozaro.gitlfs.server.internal.ResponseWriter;
913

1014
import javax.annotation.Nonnull;
11-
import javax.servlet.ServletException;
12-
import javax.servlet.http.HttpServlet;
13-
import javax.servlet.http.HttpServletRequest;
14-
import javax.servlet.http.HttpServletResponse;
1515
import java.io.IOException;
1616
import java.util.List;
1717

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/PointerManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletRequest;
34
import ru.bozaro.gitlfs.common.data.BatchItem;
45
import ru.bozaro.gitlfs.common.data.Meta;
56

67
import javax.annotation.Nonnull;
7-
import javax.servlet.http.HttpServletRequest;
88
import java.io.IOException;
99
import java.net.URI;
1010

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/PointerServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
37
import ru.bozaro.gitlfs.common.Constants;
48
import ru.bozaro.gitlfs.common.JsonHelper;
59
import ru.bozaro.gitlfs.common.data.Error;
@@ -9,10 +13,6 @@
913

1014
import javax.annotation.CheckForNull;
1115
import javax.annotation.Nonnull;
12-
import javax.servlet.ServletException;
13-
import javax.servlet.http.HttpServlet;
14-
import javax.servlet.http.HttpServletRequest;
15-
import javax.servlet.http.HttpServletResponse;
1616
import java.io.IOException;
1717
import java.net.URI;
1818
import java.net.URISyntaxException;

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/ServerError.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletResponse;
4+
35
import javax.annotation.Nonnull;
4-
import javax.servlet.http.HttpServletResponse;
56

67
/**
78
* Server side error exception.

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/UnauthorizedError.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.http.HttpServletResponse;
4+
35
import javax.annotation.Nonnull;
4-
import javax.servlet.http.HttpServletResponse;
56

67
/**
78
* Unauthorized error.

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/internal/ObjectResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package ru.bozaro.gitlfs.server.internal;
22

3+
import jakarta.servlet.http.HttpServletResponse;
34
import ru.bozaro.gitlfs.common.JsonHelper;
45

56
import javax.annotation.Nonnull;
6-
import javax.servlet.http.HttpServletResponse;
77
import java.io.IOException;
88

99
import static ru.bozaro.gitlfs.common.Constants.MIME_LFS_JSON;

‎gitlfs-server/src/main/java/ru/bozaro/gitlfs/server/internal/ResponseWriter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ru.bozaro.gitlfs.server.internal;
22

3+
import jakarta.servlet.http.HttpServletResponse;
4+
35
import javax.annotation.Nonnull;
4-
import javax.servlet.http.HttpServletResponse;
56
import java.io.IOException;
67

78
/**

‎gitlfs-server/src/test/java/ru/bozaro/gitlfs/server/EmbeddedHttpServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package ru.bozaro.gitlfs.server;
22

3+
import jakarta.servlet.Servlet;
34
import org.eclipse.jetty.server.HttpConnectionFactory;
45
import org.eclipse.jetty.server.Server;
56
import org.eclipse.jetty.server.ServerConnector;
67
import org.eclipse.jetty.servlet.ServletHandler;
78
import org.eclipse.jetty.servlet.ServletHolder;
89

910
import javax.annotation.Nonnull;
10-
import javax.servlet.Servlet;
1111
import java.net.URI;
1212
import java.net.URISyntaxException;
1313

‎gitlfs-server/src/test/java/ru/bozaro/gitlfs/server/MemoryLockManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ru.bozaro.gitlfs.server;
22

33
import com.google.common.base.Strings;
4+
import jakarta.servlet.http.HttpServletRequest;
45
import ru.bozaro.gitlfs.common.LockConflictException;
56
import ru.bozaro.gitlfs.common.VerifyLocksResult;
67
import ru.bozaro.gitlfs.common.data.Lock;
@@ -9,7 +10,6 @@
910

1011
import javax.annotation.CheckForNull;
1112
import javax.annotation.Nonnull;
12-
import javax.servlet.http.HttpServletRequest;
1313
import java.io.IOException;
1414
import java.util.ArrayList;
1515
import java.util.Collections;

‎gitlfs-server/src/test/java/ru/bozaro/gitlfs/server/MemoryStorage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.google.common.collect.ImmutableMap;
44
import com.google.common.hash.Hashing;
55
import com.google.common.io.ByteStreams;
6+
import jakarta.servlet.http.HttpServletRequest;
67
import org.testng.Assert;
78
import ru.bozaro.gitlfs.client.Client;
89
import ru.bozaro.gitlfs.client.auth.AuthProvider;
@@ -15,7 +16,6 @@
1516

1617
import javax.annotation.CheckForNull;
1718
import javax.annotation.Nonnull;
18-
import javax.servlet.http.HttpServletRequest;
1919
import java.io.ByteArrayInputStream;
2020
import java.io.FileNotFoundException;
2121
import java.io.IOException;

‎gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ case "`uname`" in
7272
Darwin* )
7373
darwin=true
7474
;;
75-
MINGW* )
75+
MSYS* | MINGW* )
7676
msys=true
7777
;;
7878
NONSTOP* )

0 commit comments

Comments
 (0)