diff --git a/.drone.yml b/.drone.yml
index e1ce14b..1ecede4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,7 +14,8 @@ volumes:
steps:
- name: publish
- image: hub.docker.struchkov.dev/maven:3.9.5-eclipse-temurin-17-alpine
+ # https://hub.docker.com/_/maven
+ image: hub.docker.struchkov.dev/maven:3.9-eclipse-temurin-22-alpine
privileged: true
volumes:
- name: m2
@@ -44,7 +45,8 @@ volumes:
steps:
- name: publish maven central
- image: hub.docker.struchkov.dev/maven:3.9.5-eclipse-temurin-17-alpine
+ # https://hub.docker.com/_/maven
+ image: hub.docker.struchkov.dev/maven:3.9-eclipse-temurin-22-alpine
privileged: true
volumes:
- name: m2
@@ -81,7 +83,8 @@ volumes:
steps:
- name: publish struchkov nexus
- image: hub.docker.struchkov.dev/maven:3.9.5-eclipse-temurin-17-alpine
+ # https://hub.docker.com/_/maven
+ image: hub.docker.struchkov.dev/maven:3.9-eclipse-temurin-22-alpine
privileged: true
volumes:
- name: m2
@@ -102,11 +105,10 @@ steps:
image_pull_secrets:
- DOCKER_AUTH
- -
# drone sign --save SDK/gitlab-sdk
---
kind: signature
-hmac: 8decd4f4dd2989517600b941df5de21ce78535082985355021bcaea31a31ba97
+hmac: 40b1cf1fb637bef3db3b5ee8601533a2977c8c5bb170e5e6a835efe9e20ad135
...
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6c6717..9cb9377 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,11 @@
-
+
+
+
+
+
@@ -18,6 +22,11 @@
+
{
@@ -37,7 +46,7 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"SONARLINT_PRECOMMIT_ANALYSIS": "true",
- "git-widget-placeholder": "main",
+ "git-widget-placeholder": "develop",
"jdk.selected.JAVA_MODULE": "corretto-21",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "/Users/struchkov/Documents/IdeaProjects/struchkov/sdk/gitlab-sdk/gitlab-sdk/gitlab-sdk-spring-boot-starter/src/main/resources/META-INF.spring",
@@ -116,6 +125,12 @@
1724441351469
+
+
+
+
+
+
@@ -125,7 +140,15 @@
1724445478405
-
+
+
+ 1724502447621
+
+
+
+ 1724502447621
+
+
@@ -144,6 +167,7 @@
-
+
+
\ No newline at end of file
diff --git a/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java b/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java
index d820f78..6727933 100644
--- a/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java
+++ b/gitlab-core/src/main/java/dev/struchkov/sdk/gitlab/core/GitlabSdkManager.java
@@ -172,8 +172,8 @@ public class GitlabSdkManager {
return pullTaskResults(tasks);
}
- public List getDiscussionForMergeRequest(Long projectId, Long mergeRequestIdForProject, int pageNumber) {
- return HttpParse.request(MessageFormat.format(gitlabUrl.getDiscussions(), projectId, mergeRequestIdForProject, pageNumber, pageNumber))
+ public List getDiscussionForMergeRequest(Long projectId, Long mergeRequestIdForProject, int pageNumber, int pageSize) {
+ return HttpParse.request(MessageFormat.format(gitlabUrl.getDiscussions(), projectId, mergeRequestIdForProject, pageNumber, pageSize))
.header(ACCEPT)
.header(StringUtils.H_PRIVATE_TOKEN, gitlabProperty.getAccessToken())
.executeList(DiscussionJson.class);
diff --git a/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java b/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java
index 2e8a1e6..ce71807 100644
--- a/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java
+++ b/gitlab-domain/src/main/java/dev/struchkov/sdk/gitlab/domain/GitlabUrl.java
@@ -34,7 +34,7 @@ public class GitlabUrl {
this.mergeRequest = baseUrl + "/api/v4/projects/{0,number,#}/merge_requests/{1,number,#}";
this.mergeRequestApproval = baseUrl + "/api/v4/projects/{0,number,#}/merge_requests/{1,number,#}/approvals";
this.projectAdd = baseUrl + "/api/v4/projects/";
- this.note = baseUrl + "{0}#note_{1,number,#}";
+ this.note = "{0}#note_{1,number,#}";
this.noteOfMergeRequest = baseUrl + "/api/v4/projects/{0,number,#}/merge_requests/{1,number,#}/notes/{2,number,#}";
this.pipelines = baseUrl + "/api/v4/projects/{0,number,#}/pipelines?&page={1,number,#}&per_page={2,number,#}";
this.pipeline = baseUrl + "/api/v4/projects/{0,number,#}/pipelines/{1,number,#}";
diff --git a/pom.xml b/pom.xml
index 1eaebc3..38650fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
- 17
+ 21
${java.version}
${java.version}
UTF-8