From 6695ca89a91cf8a550faf687e1a3b66f7753e2e3 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Thu, 12 Aug 2021 22:32:38 +0530 Subject: [PATCH 01/26] added minimal access 5 for git 13.x onwards more details at https://docs.gitlab.com/ee/api/access_requests.html#valid-access-levels This relates to issue # 393 I raised --- src/main/java/org/gitlab/api/models/GitlabAccessLevel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java b/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java index 1b88f7c7..3c34a17d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java +++ b/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java @@ -7,6 +7,7 @@ public enum GitlabAccessLevel { Reporter(20), Developer(30), Master(40), + MinimalAccess(5), Owner(50); public final int accessValue; From 02c1cf88a4b5993700768600f3be8e7f2fc248e2 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Thu, 12 Aug 2021 22:40:46 +0530 Subject: [PATCH 02/26] added comments --- src/main/java/org/gitlab/api/models/GitlabAccessLevel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java b/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java index 3c34a17d..3b2850b7 100644 --- a/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java +++ b/src/main/java/org/gitlab/api/models/GitlabAccessLevel.java @@ -1,7 +1,7 @@ package org.gitlab.api.models; import com.fasterxml.jackson.annotation.JsonCreator; - +// added MinimalAccess level 5 - for git 13.x and beyond public enum GitlabAccessLevel { Guest(10), Reporter(20), From 44332b45719cfe2e4bf9ff9513dcb0e5446ef9de Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 00:07:51 +0530 Subject: [PATCH 03/26] removed --pinentry-mode as giving error in build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 902f0424..f5319225 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,7 @@ - --pinentry-mode + loopback From 270b59118b0f6b78175aff58563496ef52bd4049 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 00:14:41 +0530 Subject: [PATCH 04/26] removed gpg args --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f5319225..007f1d10 100644 --- a/pom.xml +++ b/pom.xml @@ -234,10 +234,7 @@ sign - - - loopback - + From 48e1a7e380f8cb2869c715b57632abc95ee6ecde Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 00:19:38 +0530 Subject: [PATCH 05/26] added back gpg config --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 007f1d10..9b29daa8 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,9 @@ sign - + + --pinentry-mode=loopback + From 5d9d2087548006b1aa9e957f10cb461cd80bc9c6 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 00:34:05 +0530 Subject: [PATCH 06/26] updated to maven gpg plugin 3.x --- pom.xml | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 9b29daa8..ecee5d9b 100644 --- a/pom.xml +++ b/pom.xml @@ -222,25 +222,20 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode=loopback - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + From 7926bcdea2233e1f431025768f0dc2207aefcd08 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 01:30:51 +0530 Subject: [PATCH 07/26] added key namea nd key details --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index ecee5d9b..e8c95238 100644 --- a/pom.xml +++ b/pom.xml @@ -233,6 +233,10 @@ sign + + ${gpg.keyname} + ${gpg.keyname} + From dd4278a4abe4c845e9fce70cbe6b63d6d3ae992a Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 01:36:04 +0530 Subject: [PATCH 08/26] Update pom.xml --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e8c95238..c462bf67 100644 --- a/pom.xml +++ b/pom.xml @@ -233,10 +233,7 @@ sign - - ${gpg.keyname} - ${gpg.keyname} - + From 7da5224ff1bb844c5c59e80b930322477b922e5a Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 01:36:35 +0530 Subject: [PATCH 09/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 257d4981..fde8919c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,6 @@ services: jdk: - openjdk8 install: -- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip +- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Dgpg.passphrase=thephrase script: - ./mvnw -B -V -Pdocker-gitlab verify From a10dce314237ef801e0b435ae646ce2447b3923a Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 01:41:32 +0530 Subject: [PATCH 10/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fde8919c..01e2efba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,6 @@ services: jdk: - openjdk8 install: -- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Dgpg.passphrase=thephrase +- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: - ./mvnw -B -V -Pdocker-gitlab verify From 1b8e311ef122529e38a877e6bfee3afa0f67d941 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:39:40 +0530 Subject: [PATCH 11/26] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 01e2efba..f458ca2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ services: jdk: - openjdk8 install: +- gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: - ./mvnw -B -V -Pdocker-gitlab verify From b1a875c6d166c4b1a047a009cb0f7ee0a7cdc580 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:44:47 +0530 Subject: [PATCH 12/26] Update .travis.yml --- .travis.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.travis.yml b/.travis.yml index f458ca2e..090fd37c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,25 @@ services: jdk: - openjdk8 install: +- export GNUPGHOME="$(mktemp -d)" +- cat >foo < Date: Fri, 13 Aug 2021 02:45:01 +0530 Subject: [PATCH 13/26] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 090fd37c..2dfe2152 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,6 @@ install: %echo done EOF - gpg --batch --generate-key foo - [...] -$ gpg --list-secret-keys - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: From 5cb615a5e7668b2acb461f8a6d6419429cd5c725 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:49:30 +0530 Subject: [PATCH 14/26] Update .travis.yml --- .travis.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2dfe2152..c7f7bea5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,21 +6,18 @@ jdk: - openjdk8 install: - export GNUPGHOME="$(mktemp -d)" -- cat >foo < foo +- echo " Key-Length: 1024" >> foo +- echo " Subkey-Type: ELG-E" >> foo +- echo " Subkey-Length: 1024" >> foo +- echo " Name-Real: Joe Tester" >> foo +- echo " Name-Comment: with passphrase" >> foo +- echo " Name-Email: joe@foo.bar" >> foo +- echo "Passphrase: abc" >> foo +- echo " Key-Length: 1024" >> foo +- echo " Key-Length: 1024" >> foo +- echo " Key-Length: 1024" >> foo +- echo " Key-Length: 1024" >> foo - gpg --batch --generate-key foo - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase From 2ebf853b94d03579664b0ee4497726c344062965 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:53:02 +0530 Subject: [PATCH 15/26] Update .travis.yml --- .travis.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7f7bea5..22086e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,7 @@ jdk: - openjdk8 install: - export GNUPGHOME="$(mktemp -d)" -- echo " Key-Type: DSA " > foo -- echo " Key-Length: 1024" >> foo -- echo " Subkey-Type: ELG-E" >> foo -- echo " Subkey-Length: 1024" >> foo -- echo " Name-Real: Joe Tester" >> foo -- echo " Name-Comment: with passphrase" >> foo -- echo " Name-Email: joe@foo.bar" >> foo -- echo "Passphrase: abc" >> foo -- echo " Key-Length: 1024" >> foo -- echo " Key-Length: 1024" >> foo -- echo " Key-Length: 1024" >> foo -- echo " Key-Length: 1024" >> foo -- gpg --batch --generate-key foo +- gpg --gen-key - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: From ab9ea7a6ba0eac1512824b49796b763b13e4c6c5 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:56:15 +0530 Subject: [PATCH 16/26] Create gpg.key --- gpg.key | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 gpg.key diff --git a/gpg.key b/gpg.key new file mode 100644 index 00000000..4376aaa2 --- /dev/null +++ b/gpg.key @@ -0,0 +1,9 @@ + Key-Type: DSA + Key-Length: 1024 + Subkey-Type: ELG-E + Subkey-Length: 1024 + Name-Real: Joe Tester + Name-Comment: with regular passphrase + Name-Email: joe@foo.bar + Expire-Date: 0 + Passphrase: abc From e4fbeed474cd58252ae5fe83d8e27cd3fe1e4521 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:56:50 +0530 Subject: [PATCH 17/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22086e87..9eeb2a21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: - openjdk8 install: - export GNUPGHOME="$(mktemp -d)" -- gpg --gen-key +- gpg --gen-key gpg.key - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: From 6a28e03a6c3bb1ca4c6f445f3b7a793f3349fd49 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 02:58:31 +0530 Subject: [PATCH 18/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9eeb2a21..f2cd8ec9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: - openjdk8 install: - export GNUPGHOME="$(mktemp -d)" -- gpg --gen-key gpg.key +- gpg --batch --generate-key gpg.key - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: From 69a1448aa3d7b4039217d02bd53958b8fa9cf771 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:03:39 +0530 Subject: [PATCH 19/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f2cd8ec9..424d0e4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ jdk: - openjdk8 install: - export GNUPGHOME="$(mktemp -d)" -- gpg --batch --generate-key gpg.key +- gpg --batch --gen-key gpg.key - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase script: From 7e333f19f764f8cfd1f977057e89ecb5fbd96c6a Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:06:12 +0530 Subject: [PATCH 20/26] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 424d0e4a..defe4641 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ jdk: - openjdk8 install: - export GNUPGHOME="$(mktemp -d)" +- eval $(gpg-agent --daemon) - gpg --batch --gen-key gpg.key - gpg --list-keys - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase From d251cd66fe1d217272f1d5db92a3d8e3e79eecde Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:08:55 +0530 Subject: [PATCH 21/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index defe4641..ece2e338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ install: - eval $(gpg-agent --daemon) - gpg --batch --gen-key gpg.key - gpg --list-keys -- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=thephrase +- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc script: - ./mvnw -B -V -Pdocker-gitlab verify From 82b8b546c601cf624d5ddb76ee8a237828979472 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:13:21 +0530 Subject: [PATCH 22/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ece2e338..ca2030f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ install: - eval $(gpg-agent --daemon) - gpg --batch --gen-key gpg.key - gpg --list-keys -- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc +- ./mvnw -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc script: - ./mvnw -B -V -Pdocker-gitlab verify From 92f24575f6be89b5c4f720611235be5a10673795 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:15:02 +0530 Subject: [PATCH 23/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca2030f7..929a79d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ install: - gpg --list-keys - ./mvnw -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc script: -- ./mvnw -B -V -Pdocker-gitlab verify +- ./mvnw -B -V -Pdocker-gitlab verify -Darguments=-Dgpg.passphrase=abc From c870486b5e31acc94078a768af80b47e1837bc35 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:15:22 +0530 Subject: [PATCH 24/26] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 929a79d3..4d7afb5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ install: - eval $(gpg-agent --daemon) - gpg --batch --gen-key gpg.key - gpg --list-keys -- ./mvnw -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc +- ./mvnw -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc script: -- ./mvnw -B -V -Pdocker-gitlab verify -Darguments=-Dgpg.passphrase=abc +- ./mvnw -V -Pdocker-gitlab verify -Darguments=-Dgpg.passphrase=abc From f26ac99b59184a80c6f53ab17085df02c0eec901 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:18:35 +0530 Subject: [PATCH 25/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d7afb5f..badf74ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ install: - eval $(gpg-agent --daemon) - gpg --batch --gen-key gpg.key - gpg --list-keys -- ./mvnw -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc +- ./mvnw -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc script: - ./mvnw -V -Pdocker-gitlab verify -Darguments=-Dgpg.passphrase=abc From 18a13a172fd7a4ebd71ca35e344d35f35d0208d7 Mon Sep 17 00:00:00 2001 From: Ashwin Prakash Date: Fri, 13 Aug 2021 03:20:28 +0530 Subject: [PATCH 26/26] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index badf74ce..c2a4206f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,6 @@ install: - eval $(gpg-agent --daemon) - gpg --batch --gen-key gpg.key - gpg --list-keys -- ./mvnw -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Darguments=-Dgpg.passphrase=abc +- ./mvnw -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip -Dgpg.passphrase=abc script: - ./mvnw -V -Pdocker-gitlab verify -Darguments=-Dgpg.passphrase=abc