From b3a4685e492a3f21f6c257ec288f8922008dd36f Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Thu, 17 Sep 2020 09:05:14 +0200 Subject: [PATCH 1/8] fix folder version --- .../nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java index 5a3ecec..186376e 100644 --- a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java +++ b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java @@ -114,11 +114,13 @@ public Response content( return commitAndReturn(NOT_FOUND, tx); } + String folderVersion = version.replaceAll("-\\d{8}\\.\\d{6}\\-\\d+", "-SNAPSHOT"); String fileName = artifactId + "-" + version + (isBlank(classifier) ? "" : ("-" + classifier)) + "." + extension; String path = groupId.replace(".", "/") + "/" + artifactId + - "/" + version + + "/" + folderVersion + "/" + fileName; + Asset asset = tx.findAssetWithProperty("name", path, bucket); log.debug("rundeck download asset: {}", asset); if (null == asset) { From 33fe66148518cf79779d304082022a17bc40a101 Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Thu, 17 Sep 2020 09:08:40 +0200 Subject: [PATCH 2/8] fix folder version --- .../plugin/rundeck/RundeckMavenResource.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java index 186376e..649dcc7 100644 --- a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java +++ b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 黑牛 + * Copyright 2017 * * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the @@ -38,9 +38,18 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import javax.ws.rs.*; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkNotNull; From cafa4b0c3eea35a5d8b7214e79141252c00aac3e Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Thu, 17 Sep 2020 09:09:03 +0200 Subject: [PATCH 3/8] fix folder version --- src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckXO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckXO.java b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckXO.java index 346c355..95491a9 100644 --- a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckXO.java +++ b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckXO.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 黑牛 + * Copyright 2017 * * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the From 48f3a91ad749a22c562a641f0b0cace0d4487e18 Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Thu, 17 Sep 2020 09:10:48 +0200 Subject: [PATCH 4/8] bump version --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 51f754a..8399f09 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'com.nongfenqi.nexus.plugin' -version '1.0.1' +version '1.0.2' apply plugin: 'java' @@ -24,9 +24,9 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.20.1-01' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.20.1-01' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.20.1-01' + compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.27.0-03' + compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.27.0-03' + compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.27.0-03' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.18' } From 1816f03030385319e602c359927d69c0c4e658b5 Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Wed, 20 Jan 2021 09:43:34 +0100 Subject: [PATCH 5/8] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8399f09..6eb6de4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'com.nongfenqi.nexus.plugin' -version '1.0.2' +version '1.0.3' apply plugin: 'java' From 56c0de443c5346b6dcb047daac8823c8093aaa0b Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Wed, 20 Jan 2021 09:46:18 +0100 Subject: [PATCH 6/8] Update build.gradle --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6eb6de4..3de0232 100644 --- a/build.gradle +++ b/build.gradle @@ -24,9 +24,9 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.27.0-03' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.27.0-03' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.27.0-03' + compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.29.2-02 + compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.29.2-02' + compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.29.2-02' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.18' } From dcac3fc3306f99ee8b21f3d11c2e9e2806df0544 Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Wed, 20 Jan 2021 09:47:01 +0100 Subject: [PATCH 7/8] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3de0232..a1b1bf3 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.29.2-02 + compileOnly group: 'org.sonatype.nexus', name: 'nexus-plugin-api', version: '3.29.2-02' compileOnly group: 'org.sonatype.nexus', name: 'nexus-repository', version: '3.29.2-02' compileOnly group: 'org.sonatype.nexus', name: 'nexus-rest', version: '3.29.2-02' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.18' From 7a3def6c8655a6d93d27401cecfb8307b5c92995 Mon Sep 17 00:00:00 2001 From: Matej Spiller Muys Date: Wed, 20 Jan 2021 09:51:57 +0100 Subject: [PATCH 8/8] migrate to jdk suplier function --- .../nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java index 649dcc7..88e202b 100644 --- a/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java +++ b/src/main/java/com/nongfenqi/nexus/plugin/rundeck/RundeckMavenResource.java @@ -17,7 +17,6 @@ */ package com.nongfenqi.nexus.plugin.rundeck; -import com.google.common.base.Supplier; import org.apache.http.client.utils.DateUtils; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -50,6 +49,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Supplier; import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkNotNull;