sonatype-nexus-community#121 Adios nexus-platform-api - Hello nexus-plaform-api (sonatype-nexus-community#122)

guillermo-varela · web-flow · commit 322e2ff96a28 · 2022-09-16T11:28:48.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -55,7 +55,6 @@ shadowJar {
 }
 
 task relocateShadowJar(type: ConfigureShadowRelocation) {
-  dependsOn(':nexus-platform-api:shadowJar')
   target = tasks.shadowJar
 }
 
@@ -71,14 +70,11 @@ allprojects {
   }
 }
 
-// Compiles and shades the nexus-platform-api before compiling the plugin project
-tasks.compileJava.dependsOn(':nexus-platform-api:shadowJar')
-
 dependencies {
   shadow localGroovy()
   shadow gradleApi()
 
-  implementation files ("nexus-platform-api/build/libs/nexus-platform-api-${version}.jar")
+  implementation "com.sonatype.nexus:nexus-platform-api:$nexusPlatformApiVersion"
   implementation "org.sonatype.ossindex:ossindex-service-client:$ossIndexClientVersion"
   implementation "io.github.openfeign:feign-core:$feignVersion"
   implementation "io.github.openfeign:feign-gson:$feignVersion"
@@ -99,7 +95,7 @@ configurations.named(JavaPlugin.API_CONFIGURATION_NAME) {
 }
 
 processResources {
-  filesMatching('nexus/shadow/com/sonatype/insight/client.properties') {
+  filesMatching('com/sonatype/insight/client.properties') {
     expand(project.properties)
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -15,10 +15,10 @@
 #
 
 group=org.sonatype.gradle.plugins
-version=2.4.2-SNAPSHOT
+version=2.5.0-SNAPSHOT
 release.useAutomaticVersion=true
 
-nexusPlatformApiVersion=3.49.2-01
+nexusPlatformApiVersion=4.0.0-01
 ossIndexClientVersion=1.8.1
 feignVersion=11.8
 gsonVersion=2.9.0
diff --git a/nexus-platform-api/build.gradle b/nexus-platform-api/build.gradle
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1 @@
 rootProject.name = 'scan-gradle-plugin'
-include 'nexus-platform-api'
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinder.java b/src/main/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinder.java
@@ -28,9 +28,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import hidden.com.sonatype.insight.scan.module.model.Artifact;
-import hidden.com.sonatype.insight.scan.module.model.Dependency;
-import hidden.com.sonatype.insight.scan.module.model.Module;
+import com.sonatype.insight.scan.module.model.Artifact;
+import com.sonatype.insight.scan.module.model.Dependency;
+import com.sonatype.insight.scan.module.model.Module;
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/common/PluginVersionUtils.java b/src/main/java/org/sonatype/gradle/plugins/scan/common/PluginVersionUtils.java
@@ -28,7 +28,7 @@ public class PluginVersionUtils
 {
   private static final Logger log = LoggerFactory.getLogger(PluginVersionUtils.class);
 
-  private static final String PROPERTIES_PATH = "nexus/shadow/com/sonatype/insight/client.properties";
+  private static final String PROPERTIES_PATH = "com/sonatype/insight/client.properties";
 
   private PluginVersionUtils() {
     // Utils class
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/nexus/iq/index/NexusIqIndexTask.java b/src/main/java/org/sonatype/gradle/plugins/scan/nexus/iq/index/NexusIqIndexTask.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Set;
 
-import hidden.com.sonatype.insight.scan.module.model.Module;
-import hidden.com.sonatype.insight.scan.module.model.io.ModuleIoManager;
+import com.sonatype.insight.scan.module.model.Module;
+import com.sonatype.insight.scan.module.model.io.ModuleIoManager;
 
 import org.sonatype.gradle.plugins.scan.common.DependenciesFinder;
 
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/nexus/iq/scan/NexusIqScanTask.java b/src/main/java/org/sonatype/gradle/plugins/scan/nexus/iq/scan/NexusIqScanTask.java
@@ -42,7 +42,7 @@
 import org.sonatype.gradle.plugins.scan.nexus.iq.api.Application;
 import org.sonatype.gradle.plugins.scan.nexus.iq.api.NexusIqApi;
 
-import hidden.com.sonatype.insight.scan.module.model.Module;
+import com.sonatype.insight.scan.module.model.Module;
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/ossindex/CycloneDxResponseHandler.java b/src/main/java/org/sonatype/gradle/plugins/scan/ossindex/CycloneDxResponseHandler.java
@@ -37,19 +37,19 @@
 import org.sonatype.ossindex.service.api.componentreport.ComponentReportVulnerability;
 
 import com.google.common.base.CharMatcher;
-import nexus.shadow.org.cyclonedx.BomGeneratorFactory;
-import nexus.shadow.org.cyclonedx.CycloneDxSchema;
-import nexus.shadow.org.cyclonedx.generators.json.BomJsonGenerator;
-import nexus.shadow.org.cyclonedx.model.Bom;
-import nexus.shadow.org.cyclonedx.model.Component;
-import nexus.shadow.org.cyclonedx.model.Metadata;
-import nexus.shadow.org.cyclonedx.model.Tool;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Advisory;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Affect;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Rating;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Rating.Severity;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Source;
+import org.cyclonedx.BomGeneratorFactory;
+import org.cyclonedx.CycloneDxSchema;
+import org.cyclonedx.generators.json.BomJsonGenerator;
+import org.cyclonedx.model.Bom;
+import org.cyclonedx.model.Component;
+import org.cyclonedx.model.Metadata;
+import org.cyclonedx.model.Tool;
+import org.cyclonedx.model.vulnerability.Vulnerability;
+import org.cyclonedx.model.vulnerability.Vulnerability.Advisory;
+import org.cyclonedx.model.vulnerability.Vulnerability.Affect;
+import org.cyclonedx.model.vulnerability.Vulnerability.Rating;
+import org.cyclonedx.model.vulnerability.Vulnerability.Rating.Severity;
+import org.cyclonedx.model.vulnerability.Vulnerability.Source;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.gradle.api.Project;
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/ossindex/OssIndexAuditTask.java b/src/main/java/org/sonatype/gradle/plugins/scan/ossindex/OssIndexAuditTask.java
@@ -43,7 +43,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Lists;
-import nexus.shadow.org.cyclonedx.model.Component;
+import org.cyclonedx.model.Component;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/ossindex/OssIndexPluginExtension.java b/src/main/java/org/sonatype/gradle/plugins/scan/ossindex/OssIndexPluginExtension.java
@@ -22,7 +22,7 @@
 import org.sonatype.ossindex.service.client.transport.ProxyConfiguration;
 
 import groovy.lang.Closure;
-import nexus.shadow.org.cyclonedx.model.Component;
+import org.cyclonedx.model.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.Project;
 
diff --git a/src/main/resources/com/sonatype/insight/client.properties b/src/main/resources/com/sonatype/insight/client.properties
diff --git a/src/test/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinderTest.java b/src/test/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinderTest.java
@@ -23,9 +23,9 @@
 import java.util.stream.Stream;
 
 import com.google.common.collect.Sets;
-import hidden.com.sonatype.insight.scan.module.model.Artifact;
-import hidden.com.sonatype.insight.scan.module.model.Dependency;
-import hidden.com.sonatype.insight.scan.module.model.Module;
+import com.sonatype.insight.scan.module.model.Artifact;
+import com.sonatype.insight.scan.module.model.Dependency;
+import com.sonatype.insight.scan.module.model.Module;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
diff --git a/src/test/java/org/sonatype/gradle/plugins/scan/nexus/iq/index/NexusIqIndexTaskTest.java b/src/test/java/org/sonatype/gradle/plugins/scan/nexus/iq/index/NexusIqIndexTaskTest.java
@@ -22,8 +22,8 @@
 import java.util.Collections;
 import java.util.Set;
 
-import hidden.com.sonatype.insight.scan.module.model.Module;
-import hidden.com.sonatype.insight.scan.module.model.io.ModuleIoManager;
+import com.sonatype.insight.scan.module.model.Module;
+import com.sonatype.insight.scan.module.model.io.ModuleIoManager;
 
 import org.sonatype.gradle.plugins.scan.common.DependenciesFinder;
 
diff --git a/src/test/java/org/sonatype/gradle/plugins/scan/ossindex/CycloneDxResponseHandlerTest.java b/src/test/java/org/sonatype/gradle/plugins/scan/ossindex/CycloneDxResponseHandlerTest.java
@@ -31,17 +31,17 @@
 import org.sonatype.ossindex.service.api.componentreport.ComponentReportVulnerability;
 
 import com.google.common.collect.ImmutableMap;
-import nexus.shadow.org.cyclonedx.exception.ParseException;
-import nexus.shadow.org.cyclonedx.model.Bom;
-import nexus.shadow.org.cyclonedx.model.Component;
-import nexus.shadow.org.cyclonedx.model.Metadata;
-import nexus.shadow.org.cyclonedx.model.Tool;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Advisory;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Affect;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Rating;
-import nexus.shadow.org.cyclonedx.model.vulnerability.Vulnerability.Rating.Severity;
-import nexus.shadow.org.cyclonedx.parsers.JsonParser;
+import org.cyclonedx.exception.ParseException;
+import org.cyclonedx.model.Bom;
+import org.cyclonedx.model.Component;
+import org.cyclonedx.model.Metadata;
+import org.cyclonedx.model.Tool;
+import org.cyclonedx.model.vulnerability.Vulnerability;
+import org.cyclonedx.model.vulnerability.Vulnerability.Advisory;
+import org.cyclonedx.model.vulnerability.Vulnerability.Affect;
+import org.cyclonedx.model.vulnerability.Vulnerability.Rating;
+import org.cyclonedx.model.vulnerability.Vulnerability.Rating.Severity;
+import org.cyclonedx.parsers.JsonParser;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.junit.After;
diff --git a/src/test/java/org/sonatype/gradle/plugins/scan/ossindex/TransportBuilderTest.java b/src/test/java/org/sonatype/gradle/plugins/scan/ossindex/TransportBuilderTest.java
@@ -55,7 +55,7 @@ public void testBuildUserAgentSupplier() throws IOException {
     String gradleVersion = GradleVersion.current().getVersion();
     String pluginVersion;
 
-    try (InputStream stream = getClass().getResourceAsStream("/nexus/shadow/com/sonatype/insight/client.properties")) {
+    try (InputStream stream = getClass().getResourceAsStream("/com/sonatype/insight/client.properties")) {
       Properties properties = new Properties();
       properties.load(stream);
       pluginVersion = properties.getProperty("version");

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ shadowJar {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`task relocateShadowJar(type: ConfigureShadowRelocation) {`
`58`		`- dependsOn(':nexus-platform-api:shadowJar')`
`59`	`58`	`target = tasks.shadowJar`
`60`	`59`	`}`
`61`	`60`
`@@ -71,14 +70,11 @@ allprojects {`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`
`74`		`-// Compiles and shades the nexus-platform-api before compiling the plugin project`
`75`		`-tasks.compileJava.dependsOn(':nexus-platform-api:shadowJar')`
`76`		`-`
`77`	`73`	`dependencies {`
`78`	`74`	`shadow localGroovy()`
`79`	`75`	`shadow gradleApi()`
`80`	`76`
`81`		`- implementation files ("nexus-platform-api/build/libs/nexus-platform-api-${version}.jar")`
	`77`	`+ implementation "com.sonatype.nexus:nexus-platform-api:$nexusPlatformApiVersion"`
`82`	`78`	`implementation "org.sonatype.ossindex:ossindex-service-client:$ossIndexClientVersion"`
`83`	`79`	`implementation "io.github.openfeign:feign-core:$feignVersion"`
`84`	`80`	`implementation "io.github.openfeign:feign-gson:$feignVersion"`
`@@ -99,7 +95,7 @@ configurations.named(JavaPlugin.API_CONFIGURATION_NAME) {`
`99`	`95`	`}`
`100`	`96`
`101`	`97`	`processResources {`
`102`		`- filesMatching('nexus/shadow/com/sonatype/insight/client.properties') {`
	`98`	`+ filesMatching('com/sonatype/insight/client.properties') {`
`103`	`99`	`expand(project.properties)`
`104`	`100`	`}`
`105`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`rootProject.name = 'scan-gradle-plugin'`
`2`		`-include 'nexus-platform-api'`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class PluginVersionUtils`
`28`	`28`	`{`
`29`	`29`	`private static final Logger log = LoggerFactory.getLogger(PluginVersionUtils.class);`
`30`	`30`
`31`		`- private static final String PROPERTIES_PATH = "nexus/shadow/com/sonatype/insight/client.properties";`
	`31`	`+ private static final String PROPERTIES_PATH = "com/sonatype/insight/client.properties";`
`32`	`32`
`33`	`33`	`private PluginVersionUtils() {`
`34`	`34`	`// Utils class`