diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/BomDecomposer.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/BomDecomposer.java index 93a1485c..37f10336 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/BomDecomposer.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/BomDecomposer.java @@ -10,6 +10,7 @@ import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.domino.scm.ScmRevisionResolver; import io.quarkus.maven.dependency.ArtifactCoords; import java.nio.file.Path; import java.util.ArrayList; diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ReleaseIdDetector.java index 890d9b13..7200ef0e 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ReleaseIdDetector.java @@ -1,6 +1,7 @@ package io.quarkus.bom.decomposer; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public interface ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/Util.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/Util.java index b3a4fadb..b4a89859 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/Util.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/Util.java @@ -81,14 +81,16 @@ private static String scmToHttps(String s) { s = "https://" + s; } } + if (s.startsWith("https://github.com:")) { + s = s.replace("https://github.com:", HTTPS_GITHUB_COM); + } if (s.startsWith(HTTPS_GITHUB_COM)) { var tmp = s.substring(HTTPS_GITHUB_COM.length()); final String[] parts = tmp.split("/"); if (parts.length > 2) { - s = HTTPS_GITHUB_COM + parts[0] + "/" + parts[1]; + s = HTTPS_GITHUB_COM + parts[0].replace(":", "") + "/" + parts[1]; } } - return s; } diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AnimalSnifferReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AnimalSnifferReleaseIdDetector.java index 89d48159..94fb3555 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AnimalSnifferReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AnimalSnifferReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class AnimalSnifferReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheAvroReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheAvroReleaseIdDetector.java index 86831f18..32d03d55 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheAvroReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheAvroReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ApacheAvroReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheCommonsReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheCommonsReleaseIdDetector.java index 0ab993d7..ec75583a 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheCommonsReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheCommonsReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ApacheCommonsReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheHttpComponentsReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheHttpComponentsReleaseIdDetector.java index a708b89e..29b19af3 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheHttpComponentsReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheHttpComponentsReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ApacheHttpComponentsReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheMavenReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheMavenReleaseIdDetector.java index 42066f43..cc1ee83b 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheMavenReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheMavenReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ApacheMavenReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheParentReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheParentReleaseIdDetector.java index 82992bc4..c7dd12b2 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheParentReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheParentReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ApacheParentReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheQPidReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheQPidReleaseIdDetector.java index 5e4271e9..e6cd8480 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheQPidReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ApacheQPidReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ApacheQPidReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Argparse4jReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Argparse4jReleaseIdDetector.java index 66b8171b..d54e9e9e 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Argparse4jReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Argparse4jReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class Argparse4jReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AsmReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AsmReleaseIdDetector.java index 76172525..02e8bf71 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AsmReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/AsmReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class AsmReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/BouncyCastleReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/BouncyCastleReleaseIdDetector.java index e2cea9ea..32feaef1 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/BouncyCastleReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/BouncyCastleReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class BouncyCastleReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ComSunActivationReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ComSunActivationReleaseIdDetector.java index 818f92f9..c2a4d4ca 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ComSunActivationReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ComSunActivationReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ComSunActivationReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsIoReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsIoReleaseIdDetector.java index 99f2110e..0fa1b626 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsIoReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsIoReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class CommonsIoReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsParentReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsParentReleaseIdDetector.java index d93e2cb6..a7b6ee22 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsParentReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/CommonsParentReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class CommonsParentReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/EclipseEe4jInterceptorApiReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/EclipseEe4jInterceptorApiReleaseIdDetector.java index b0f0eff2..c09dfad2 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/EclipseEe4jInterceptorApiReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/EclipseEe4jInterceptorApiReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class EclipseEe4jInterceptorApiReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/FasterXmlReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/FasterXmlReleaseIdDetector.java index e49031ab..dd0dbf0b 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/FasterXmlReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/FasterXmlReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class FasterXmlReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishHk2ReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishHk2ReleaseIdDetector.java index af2cb45c..8c78d34f 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishHk2ReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishHk2ReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GlassfishHk2ReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJerseyReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJerseyReleaseIdDetector.java index c5691b4d..41060ae6 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJerseyReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJerseyReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GlassfishJerseyReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJsonpReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJsonpReleaseIdDetector.java index 3f12d7c3..babdf3a7 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJsonpReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GlassfishJsonpReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GlassfishJsonpReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleApiCommonReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleApiCommonReleaseIdDetector.java index 8fb0f6a0..c7c7f432 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleApiCommonReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleApiCommonReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GoogleApiCommonReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudCoreReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudCoreReleaseIdDetector.java index 816b4441..e544c885 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudCoreReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudCoreReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GoogleCloudCoreReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudIamReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudIamReleaseIdDetector.java index 00b48c63..3152124d 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudIamReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleCloudIamReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GoogleCloudIamReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGaxReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGaxReleaseIdDetector.java index c7e445f6..e606301b 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGaxReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGaxReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GoogleGaxReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGrpcReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGrpcReleaseIdDetector.java index 51585d03..f166ebc9 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGrpcReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GoogleGrpcReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GoogleGrpcReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GuavaReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GuavaReleaseIdDetector.java index 339c3deb..601074f6 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GuavaReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/GuavaReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class GuavaReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/H2ReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/H2ReleaseIdDetector.java index 70f126d4..e5835657 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/H2ReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/H2ReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class H2ReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HapiFhirReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HapiFhirReleaseIdDetector.java index 53c5bd9e..709432aa 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HapiFhirReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HapiFhirReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class HapiFhirReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HibernateReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HibernateReleaseIdDetector.java index 6341ca1c..3c9162a4 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HibernateReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/HibernateReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class HibernateReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossJaxRsApiReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossJaxRsApiReleaseIdDetector.java index 1d8ccd2b..3a60e80c 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossJaxRsApiReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossJaxRsApiReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JBossJaxRsApiReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossLogManagerEmbeddedReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossLogManagerEmbeddedReleaseIdDetector.java index 39acd9c8..2137a9e0 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossLogManagerEmbeddedReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossLogManagerEmbeddedReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JBossLogManagerEmbeddedReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossParentReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossParentReleaseIdDetector.java index d61b25ce..63bf4c81 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossParentReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossParentReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JBossParentReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossTransactionSpiReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossTransactionSpiReleaseIdDetector.java index 41ee1533..9b44de62 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossTransactionSpiReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JBossTransactionSpiReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JBossTransactionSpiReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JUnitPlatformReleaseDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JUnitPlatformReleaseDetector.java index 009ff0b1..a9f133a3 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JUnitPlatformReleaseDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JUnitPlatformReleaseDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JUnitPlatformReleaseDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaActivationReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaActivationReleaseIdDetector.java index 0b820f1b..ae8ffd93 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaActivationReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaActivationReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaActivationReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCdiSpecReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCdiSpecReleaseIdDetector.java index 03672fe8..f0d16006 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCdiSpecReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCdiSpecReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaCdiSpecReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCommonAnnotationsApiReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCommonAnnotationsApiReleaseIdDetector.java index 75edfcc1..146004fc 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCommonAnnotationsApiReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaCommonAnnotationsApiReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaCommonAnnotationsApiReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaElReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaElReleaseIdDetector.java index fd971f32..0c80beb0 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaElReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaElReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaElReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaInterceptorReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaInterceptorReleaseIdDetector.java index fed98b86..b21e5063 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaInterceptorReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaInterceptorReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaInterceptorReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJaxbReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJaxbReleaseIdDetector.java index fc853b1f..b06e63ee 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJaxbReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJaxbReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaJaxbReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJmsApiReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJmsApiReleaseIdDetector.java index 00371a56..7ee0f644 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJmsApiReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJmsApiReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaJmsApiReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJsonBindReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJsonBindReleaseIdDetector.java index 9ee19096..07a27d1f 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJsonBindReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaJsonBindReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaJsonBindReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaPersistenceReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaPersistenceReleaseIdDetector.java index 58d4f331..32898ad4 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaPersistenceReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaPersistenceReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaPersistenceReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaRestReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaRestReleaseIdDetector.java index e7a67015..b2d35f44 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaRestReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaRestReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaRestReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaServletReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaServletReleaseIdDetector.java index 508efb7d..d72d0a26 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaServletReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaServletReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaServletReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaTransactionReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaTransactionReleaseIdDetector.java index 74fb546b..bca8ba10 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaTransactionReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaTransactionReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaTransactionReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaValidationReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaValidationReleaseIdDetector.java index 929180ef..72c1aae6 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaValidationReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaValidationReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaValidationReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaWebsocketReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaWebsocketReleaseIdDetector.java index 3752da3b..6f615bab 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaWebsocketReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JakartaWebsocketReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JakartaWebsocketReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JandexReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JandexReleaseIdDetector.java index 0b8786d6..c0120b6e 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JandexReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JandexReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JandexReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavassistReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavassistReleaseIdDetector.java index 606df0f0..e2ae6e75 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavassistReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavassistReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JavassistReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxElReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxElReleaseIdDetector.java index 2c08340d..0f8f1a89 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxElReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxElReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JavaxElReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInjectReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInjectReleaseIdDetector.java index 1fd7e26b..5d5e4c92 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInjectReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInjectReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JavaxInjectReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInterceptorReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInterceptorReleaseIdDetector.java index 134d9c29..5a14d9e8 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInterceptorReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JavaxInterceptorReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JavaxInterceptorReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JaxbRiReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JaxbRiReleaseIdDetector.java index bfa069fc..dca75060 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JaxbRiReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JaxbRiReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JaxbRiReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JettyReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JettyReleaseIdDetector.java index eb9634ef..ce2181d4 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JettyReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JettyReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JettyReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JoptSimpleReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JoptSimpleReleaseIdDetector.java index c79adcbb..d3a27ce8 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JoptSimpleReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JoptSimpleReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JoptSimpleReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JsonPathReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JsonPathReleaseIdDetector.java index ac756873..9401af5a 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JsonPathReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/JsonPathReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class JsonPathReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KafkaReleaseDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KafkaReleaseDetector.java index d637cdaf..45b03ea6 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KafkaReleaseDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KafkaReleaseDetector.java @@ -2,10 +2,10 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class KafkaReleaseDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KnownVPrefixReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KnownVPrefixReleaseIdDetector.java index 456eb4d8..2273275b 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KnownVPrefixReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/KnownVPrefixReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import java.util.Set; import org.eclipse.aether.artifact.Artifact; diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/LogbackReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/LogbackReleaseIdDetector.java index 5b1c8840..4494e2d7 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/LogbackReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/LogbackReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class LogbackReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MojoParentReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MojoParentReleaseIdDetector.java index 79ae7e45..f4889498 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MojoParentReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MojoParentReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class MojoParentReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MongoDbReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MongoDbReleaseIdDetector.java index d24449b0..c609f236 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MongoDbReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/MongoDbReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class MongoDbReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyDevToolsReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyDevToolsReleaseIdDetector.java index b96586f9..ad9cef86 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyDevToolsReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyDevToolsReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class NettyDevToolsReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyTcnativeReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyTcnativeReleaseIdDetector.java index 547d454d..195085d5 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyTcnativeReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/NettyTcnativeReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class NettyTcnativeReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/OpentelemetryReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/OpentelemetryReleaseIdDetector.java index a536467a..a31a3ddf 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/OpentelemetryReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/OpentelemetryReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.bom.resolver.ArtifactNotFoundException; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class OpentelemetryReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PgJdbcReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PgJdbcReleaseIdDetector.java index 2253e7cb..e8e0c81a 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PgJdbcReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PgJdbcReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class PgJdbcReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PlexusSecDispatcherReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PlexusSecDispatcherReleaseIdDetector.java index fcaec75d..cc1076d0 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PlexusSecDispatcherReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PlexusSecDispatcherReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class PlexusSecDispatcherReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PrefixedTagReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PrefixedTagReleaseIdDetector.java index 02063048..f896fc0f 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PrefixedTagReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/PrefixedTagReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import java.util.Collection; import org.eclipse.aether.artifact.Artifact; diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QosReload4jReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QosReload4jReleaseIdDetector.java index 4c8d73ed..e761e51f 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QosReload4jReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QosReload4jReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class QosReload4jReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QuarkusSecurityReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QuarkusSecurityReleaseIdDetector.java index c792d3b1..abc32602 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QuarkusSecurityReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/QuarkusSecurityReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class QuarkusSecurityReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ReactiveStreamsReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ReactiveStreamsReleaseIdDetector.java index 3fe5e875..44131ce1 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ReactiveStreamsReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ReactiveStreamsReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ReactiveStreamsReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/RestAssuredReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/RestAssuredReleaseIdDetector.java index 5b8503b6..6463b558 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/RestAssuredReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/RestAssuredReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class RestAssuredReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ResteasyBomReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ResteasyBomReleaseIdDetector.java index f88b583e..d5a1c880 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ResteasyBomReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ResteasyBomReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ResteasyBomReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ShrinkwrapResolverBomReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ShrinkwrapResolverBomReleaseIdDetector.java index b74f7223..dfc0adc4 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ShrinkwrapResolverBomReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/ShrinkwrapResolverBomReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class ShrinkwrapResolverBomReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SisuPlexusReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SisuPlexusReleaseIdDetector.java index 39c171cf..ffd09c35 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SisuPlexusReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SisuPlexusReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class SisuPlexusReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jJBossLogManagerReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jJBossLogManagerReleaseIdDetector.java index 7c176c8c..57767a8e 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jJBossLogManagerReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jJBossLogManagerReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class Slf4jJBossLogManagerReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jReleaseIdDetector.java index a99b67e7..9f62a86b 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/Slf4jReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class Slf4jReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SmallryeStorkReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SmallryeStorkReleaseIdDetector.java index d18b7483..0a3e1f1a 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SmallryeStorkReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SmallryeStorkReleaseIdDetector.java @@ -2,9 +2,9 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class SmallryeStorkReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SonatypeOssParentReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SonatypeOssParentReleaseIdDetector.java index ec173d77..331df7b5 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SonatypeOssParentReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/SonatypeOssParentReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class SonatypeOssParentReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/VertxReleaseDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/VertxReleaseDetector.java index ca19b3e1..9193ebab 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/VertxReleaseDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/VertxReleaseDetector.java @@ -2,10 +2,10 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class VertxReleaseDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/WildFlyCommonReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/WildFlyCommonReleaseIdDetector.java index f74c8b4d..376e8aed 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/WildFlyCommonReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/WildFlyCommonReleaseIdDetector.java @@ -3,8 +3,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class WildFlyCommonReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/XStreamReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/XStreamReleaseIdDetector.java index 2b8f37c5..3689e903 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/XStreamReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/XStreamReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class XStreamReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/YetusReleaseIdDetector.java b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/YetusReleaseIdDetector.java index b2c847e3..e4ed5d22 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/YetusReleaseIdDetector.java +++ b/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/detector/YetusReleaseIdDetector.java @@ -2,8 +2,8 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class YetusReleaseIdDetector implements ReleaseIdDetector { diff --git a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ScmRevisionResolver.java b/bom-decomposer/src/main/java/io/quarkus/domino/scm/ScmRevisionResolver.java similarity index 76% rename from bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ScmRevisionResolver.java rename to bom-decomposer/src/main/java/io/quarkus/domino/scm/ScmRevisionResolver.java index eacdab7a..efe32ecd 100644 --- a/bom-decomposer/src/main/java/io/quarkus/bom/decomposer/ScmRevisionResolver.java +++ b/bom-decomposer/src/main/java/io/quarkus/domino/scm/ScmRevisionResolver.java @@ -1,11 +1,14 @@ -package io.quarkus.bom.decomposer; +package io.quarkus.domino.scm; +import io.quarkus.bom.decomposer.BomDecomposerException; +import io.quarkus.bom.decomposer.ReleaseIdDetector; +import io.quarkus.bom.decomposer.ReleaseIdFactory; +import io.quarkus.bom.decomposer.Util; import io.quarkus.bom.resolver.ArtifactResolver; import io.quarkus.bom.resolver.ArtifactResolverProvider; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.domino.scm.ScmRevision; import io.quarkus.maven.dependency.GAV; import java.net.URI; import java.net.http.HttpClient; @@ -14,6 +17,7 @@ import java.nio.file.Paths; import java.time.Duration; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -30,10 +34,9 @@ public class ScmRevisionResolver { private final MessageWriter log; private final ArtifactResolver resolver; private final Collection releaseDetectors; - private final boolean validateRepoTag; private Set validatedReleaseIds; private HttpClient httpClient; - private final Map releaseIdCache = new WeakHashMap<>(); + private final ScmRevisionCache cache = new ScmRevisionCache(); public ScmRevisionResolver(MavenArtifactResolver resolver) { this(ArtifactResolverProvider.get(resolver)); @@ -44,9 +47,8 @@ public ScmRevisionResolver(MavenArtifactResolver resolver, Collection releaseDetectors, - MessageWriter log, - boolean validateRepoTag) { - this(ArtifactResolverProvider.get(resolver), releaseDetectors, log, validateRepoTag); + MessageWriter log) { + this(ArtifactResolverProvider.get(resolver), releaseDetectors, log); } public ScmRevisionResolver(ArtifactResolver resolver) { @@ -56,38 +58,42 @@ public ScmRevisionResolver(ArtifactResolver resolver) { public ScmRevisionResolver(ArtifactResolver resolver, Collection releaseDetectors) { this.resolver = Objects.requireNonNull(resolver); this.releaseDetectors = releaseDetectors; - this.validateRepoTag = false; this.log = MessageWriter.info(); } - public ScmRevisionResolver(ArtifactResolver resolver, Collection releaseDetectors, MessageWriter log, - boolean validateRepoTag) { + public ScmRevisionResolver(ArtifactResolver resolver, Collection releaseDetectors, MessageWriter log) { this.resolver = Objects.requireNonNull(resolver); this.releaseDetectors = releaseDetectors; - this.validateRepoTag = validateRepoTag; this.log = log; } public ScmRevision resolveRevision(Artifact artifact, List repos) throws BomDecomposerException, UnresolvableModelException { var gav = new GAV(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion()); - var releaseId = releaseIdCache.get(gav); - if (releaseId == null) { + var revision = cache.get(gav); + if (revision == null) { for (ReleaseIdDetector releaseDetector : releaseDetectors) { - releaseId = releaseDetector.detectReleaseId(this, artifact); - if (releaseId != null) { + revision = releaseDetector.detectReleaseId(this, artifact); + if (revision != null) { break; } } - if (releaseId == null) { - releaseId = readRevisionFromPom(artifact, repos); - } - if (validateRepoTag) { - validateTag(releaseId); + if (revision == null) { + revision = readRevisionFromPom(artifact, repos); + var cachedGroupIdRevision = cache.groupIdRevisions.get(artifact.getGroupId()); + if (cachedGroupIdRevision != null && cachedGroupIdRevision.getRepository().isUrl()) { + if (!revision.getRepository().isUrl()) { + revision = cachedGroupIdRevision; + } else if (revision.getKind().equals(ScmRevision.Kind.VERSION) + && !cachedGroupIdRevision.getKind().equals(ScmRevision.Kind.VERSION) + && revision.getValue().equals(cachedGroupIdRevision.getValue())) { + revision = cachedGroupIdRevision; + } + } } - releaseIdCache.put(gav, releaseId); + cache.put(gav, revision); } - return releaseId; + return revision; } public ScmRevision readRevisionFromPom(Artifact artifact) throws BomDecomposerException { @@ -176,9 +182,11 @@ private Model workspaceParent(Model model, List repos) throws final Model parentModel = readPom(Util.parentArtifact(model), repos); - if (Util.getScmOrigin(model) != null) { - return Util.getScmOrigin(model).equals(Util.getScmOrigin(parentModel)) - && Util.getScmTag(model).equals(Util.getScmTag(parentModel)) ? parentModel : null; + final String scmOrigin = Util.getScmOrigin(model); + if (scmOrigin != null) { + final String scmTag = Util.getScmTag(model); + return scmOrigin.equals(Util.getScmOrigin(parentModel)) + && scmTag == null || scmTag.equals(Util.getScmTag(parentModel)) ? parentModel : null; } if (model.getParent().getRelativePath().isEmpty()) { @@ -211,4 +219,18 @@ public Model readPom(Artifact artifact) throws BomDecomposerException { public Model readPom(Artifact artifact, List repos) throws BomDecomposerException { return Util.model(resolver.resolve(Util.pom(artifact), repos).getArtifact().getFile()); } + + private static class ScmRevisionCache { + private final Map gavRevisions = new WeakHashMap<>(); + private final Map groupIdRevisions = new HashMap<>(); + + ScmRevision get(GAV gav) { + return gavRevisions.get(gav); + } + + void put(GAV gav, ScmRevision revision) { + gavRevisions.put(gav, revision); + groupIdRevisions.put(gav.getGroupId(), revision); + } + } } diff --git a/domino/api/src/main/java/io/quarkus/domino/PncReleaseIdDetector.java b/domino/api/src/main/java/io/quarkus/domino/PncReleaseIdDetector.java index e5b84174..f050df21 100644 --- a/domino/api/src/main/java/io/quarkus/domino/PncReleaseIdDetector.java +++ b/domino/api/src/main/java/io/quarkus/domino/PncReleaseIdDetector.java @@ -2,12 +2,12 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.domino.manifest.PncArtifactBuildInfo; import io.quarkus.domino.manifest.PncArtifactBuildInfo.Build; import io.quarkus.domino.manifest.PncArtifactBuildInfo.Content; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import org.eclipse.aether.artifact.Artifact; public class PncReleaseIdDetector implements ReleaseIdDetector { diff --git a/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyConfig.java b/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyConfig.java index 820f997e..03540f72 100644 --- a/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyConfig.java +++ b/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyConfig.java @@ -185,10 +185,13 @@ public interface ProjectDependencyConfig { List getRecipeRepos(); /** - * Whether to validate the discovered code repo and tags that are included in the report + * @deprecated this option isn't used anymore + * + * Whether to validate the discovered code repo and tags that are included in the report * * @return whether to validate core repos and tags */ + @Deprecated(forRemoval = true) boolean isValidateCodeRepoTags(); /** diff --git a/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java b/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java index 7878c0e0..aa10ee78 100644 --- a/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java +++ b/domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java @@ -8,7 +8,6 @@ import io.quarkus.bom.decomposer.BomDecomposerException; import io.quarkus.bom.decomposer.ReleaseIdDetector; import io.quarkus.bom.decomposer.ReleaseIdFactory; -import io.quarkus.bom.decomposer.ScmRevisionResolver; import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; @@ -18,6 +17,7 @@ import io.quarkus.domino.pnc.PncVersionProvider; import io.quarkus.domino.scm.ScmRepository; import io.quarkus.domino.scm.ScmRevision; +import io.quarkus.domino.scm.ScmRevisionResolver; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; import java.io.IOException; @@ -367,7 +367,8 @@ public void log() { int i = 0; while (chains.hasNext()) { logComment(" Chain #" + ++i + ":"); - chains.next().getDependencyChain().forEach(id -> logComment(" " + id)); + chains.next().getDependencyChain().forEach(id -> logComment(" " + id.getRepository() + " " + + id.getKind().toString().toLowerCase() + " " + id.getValue())); logComment(""); } } @@ -847,7 +848,7 @@ private static ScmRevisionResolver newRevisionResolver(MavenArtifactResolver art ProjectDependencyConfig config) { if (config.isLegacyScmLocator()) { - return getLegacyReleaseIdResolver(artifactResolver, log, config.isValidateCodeRepoTags()); + return getLegacyReleaseIdResolver(artifactResolver, log); } final List releaseDetectors = ServiceLoader.load(ReleaseIdDetector.class).stream() @@ -893,6 +894,10 @@ public void run() { .setCloneLocalRecipeRepos(false) .setFallback(gav -> { + if ("8.34.0.Final".equals(gav.getVersion())) { + throw new IllegalArgumentException(gav.toString()); + } + var pomArtifact = new DefaultArtifact(gav.getGroupId(), gav.getArtifactId(), ArtifactCoords.TYPE_POM, gav.getVersion()); @@ -985,15 +990,13 @@ public ScmRevision detectReleaseId(ScmRevisionResolver releaseResolver, Artifact } }; final ScmRevisionResolver releaseResolver = new ScmRevisionResolver(artifactResolver, - List.of(new PncReleaseIdDetector(new PncBuildInfoProvider()), - hacbsScmLocator), - log, config.isValidateCodeRepoTags()); + List.of(new PncReleaseIdDetector(new PncBuildInfoProvider()), hacbsScmLocator), + log); ref.set(releaseResolver); return releaseResolver; } - private static ScmRevisionResolver getLegacyReleaseIdResolver(MavenArtifactResolver artifactResolver, MessageWriter log, - boolean validateCodeRepoTags) { + private static ScmRevisionResolver getLegacyReleaseIdResolver(MavenArtifactResolver artifactResolver, MessageWriter log) { final List releaseDetectors = new ArrayList<>(); releaseDetectors.add(new PncReleaseIdDetector(new PncBuildInfoProvider())); releaseDetectors.add( @@ -1084,7 +1087,7 @@ public ScmRevision detectReleaseId(ScmRevisionResolver releaseResolver, Artifact .addAll(ServiceLoader.load(ReleaseIdDetector.class).stream().map(ServiceLoader.Provider::get) .collect(Collectors.toList())); - return new ScmRevisionResolver(artifactResolver, releaseDetectors, log, validateCodeRepoTags); + return new ScmRevisionResolver(artifactResolver, releaseDetectors, log); } private void logReleaseRepoDep(ReleaseRepo repo, int depth) { diff --git a/domino/app/src/main/java/io/quarkus/domino/cli/BaseDepsToBuildCommand.java b/domino/app/src/main/java/io/quarkus/domino/cli/BaseDepsToBuildCommand.java index ea2d6418..9fd9bd54 100644 --- a/domino/app/src/main/java/io/quarkus/domino/cli/BaseDepsToBuildCommand.java +++ b/domino/app/src/main/java/io/quarkus/domino/cli/BaseDepsToBuildCommand.java @@ -114,10 +114,6 @@ public abstract class BaseDepsToBuildCommand implements Callable { "--recipe-repos" }, description = "Build recipe repository URLs, the default one is https://github.com/redhat-appstudio/jvm-build-data", split = ",") public List recipeRepos; - @CommandLine.Option(names = { - "--validate-code-repo-tags" }, description = "Whether to validate the discovered code repo and tags that are included in the report") - public Boolean validateCodeRepoTags; - @CommandLine.Option(names = { "--legacy-scm-locator" }, description = "Whether to use the legacy SCM locator") public Boolean legacyScmLocator; @@ -290,9 +286,6 @@ protected void initConfig(ProjectDependencyConfig.Mutable config) { if (level != null) { config.setLevel(level); } - if (validateCodeRepoTags != null) { - config.setValidateCodeRepoTags(validateCodeRepoTags); - } if (legacyScmLocator != null) { config.setLegacyScmLocator(legacyScmLocator); } diff --git a/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/DependenciesToBuildMojo.java b/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/DependenciesToBuildMojo.java index 432df1e5..2f3086c5 100644 --- a/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/DependenciesToBuildMojo.java +++ b/maven-plugin/src/main/java/io/quarkus/bom/decomposer/maven/DependenciesToBuildMojo.java @@ -168,13 +168,6 @@ public class DependenciesToBuildMojo extends AbstractMojo { @Parameter(required = false) ProjectDependencyFilterConfig dependenciesToBuild; - /** - * @deprecated Deprecated in favor of the HACBS SCM locator that performs validation - */ - @Deprecated(since = "0.0.78") - @Parameter(required = false, property = "validateCodeRepoTags") - boolean validateCodeRepoTags; - @Parameter(required = false, property = "legacyScmLocator") boolean legacyScmLocator; @@ -328,7 +321,6 @@ public void execute() throws MojoExecutionException, MojoFailureException { .setLogTrees(logTrees) .setLogTreesFor(logTreesFor) .setIncludeAlreadyBuilt(includeAlreadyBuilt) - .setValidateCodeRepoTags(validateCodeRepoTags) .setLegacyScmLocator(legacyScmLocator) .setRecipeRepos(recipeRepos) .setWarnOnMissingScm(warnOnMissingScm);