From cc08db3999801ebe38132dd119cd7dee05313144 Mon Sep 17 00:00:00 2001 From: elrodro83 Date: Fri, 9 Aug 2024 12:25:27 -0300 Subject: [PATCH 1/2] Update server4j to v5.3.0 --- modules/artifact-activation/pom.xml | 1 - modules/artifact/pom.xml | 2 +- tests/runner/pom.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/artifact-activation/pom.xml b/modules/artifact-activation/pom.xml index 32cce3c07a4..1446ebe80a5 100644 --- a/modules/artifact-activation/pom.xml +++ b/modules/artifact-activation/pom.xml @@ -24,7 +24,6 @@ org.mule.runtime.artifact.activation false - 2.0.3 ../../formatter.xml diff --git a/modules/artifact/pom.xml b/modules/artifact/pom.xml index 788a52bd25f..2ff37c59af5 100644 --- a/modules/artifact/pom.xml +++ b/modules/artifact/pom.xml @@ -67,7 +67,7 @@ ${project.version} - com.vdurmont + org.semver4j semver4j diff --git a/tests/runner/pom.xml b/tests/runner/pom.xml index 1b57df8f95b..fdd16224e72 100644 --- a/tests/runner/pom.xml +++ b/tests/runner/pom.xml @@ -70,7 +70,7 @@ mule-maven-client-impl - com.vdurmont + org.semver4j semver4j From b9ca71dab0b2abb2e21c53020551692b90999b46 Mon Sep 17 00:00:00 2001 From: elrodro83 Date: Fri, 9 Aug 2024 13:09:24 -0300 Subject: [PATCH 2/2] sadf --- modules/artifact-activation/src/main/java/module-info.java | 2 +- .../internal/classloader/model/utils/VersionUtils.java | 2 +- .../deployable/MuleDeployableProjectModelBuilder.java | 4 ++-- .../maven/AdditionalPluginDependenciesResolver.java | 4 ++-- .../internal/plugin/PluginLocalDependenciesDenylist.java | 2 +- modules/artifact/src/main/java/module-info.java | 2 +- .../artifact/api/descriptor/BundleDescriptorUtils.java | 6 +++--- .../deployment-model-impl/src/main/java/module-info.java | 2 +- .../maven/AbstractMavenClassLoaderConfigurationLoader.java | 4 ++-- .../maven/HeavyweightClassLoaderConfigurationBuilder.java | 4 ++-- .../impl/internal/builder/DeployableFileBuilder.java | 4 ++-- tests/runner/src/main/java/module-info.java | 2 +- .../org/mule/test/runner/api/AetherClassPathClassifier.java | 6 +++--- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/artifact-activation/src/main/java/module-info.java b/modules/artifact-activation/src/main/java/module-info.java index 80f44e0fc8b..6366b0fbf13 100644 --- a/modules/artifact-activation/src/main/java/module-info.java +++ b/modules/artifact-activation/src/main/java/module-info.java @@ -35,7 +35,7 @@ requires org.apache.commons.io; requires org.apache.commons.lang3; requires org.jgrapht.core; - requires semver4j; + requires org.semver4j; requires java.xml; diff --git a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/classloader/model/utils/VersionUtils.java b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/classloader/model/utils/VersionUtils.java index 112dc653970..e304b64c6fc 100644 --- a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/classloader/model/utils/VersionUtils.java +++ b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/classloader/model/utils/VersionUtils.java @@ -6,7 +6,7 @@ */ package org.mule.runtime.module.artifact.activation.internal.classloader.model.utils; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; /** * Helper methods to work with semantic versioning. diff --git a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/deployable/MuleDeployableProjectModelBuilder.java b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/deployable/MuleDeployableProjectModelBuilder.java index 91ad363140a..48f65941ef6 100644 --- a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/deployable/MuleDeployableProjectModelBuilder.java +++ b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/deployable/MuleDeployableProjectModelBuilder.java @@ -30,7 +30,7 @@ import static java.util.stream.Collectors.toSet; import static com.google.common.collect.Sets.newHashSet; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import static org.slf4j.LoggerFactory.getLogger; import org.mule.runtime.api.deployment.meta.MuleDeployableModel; @@ -59,7 +59,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/maven/AdditionalPluginDependenciesResolver.java b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/maven/AdditionalPluginDependenciesResolver.java index 6e0bc2a627e..0fab8384343 100644 --- a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/maven/AdditionalPluginDependenciesResolver.java +++ b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/maven/AdditionalPluginDependenciesResolver.java @@ -15,7 +15,7 @@ import static java.util.Optional.of; import static java.util.stream.Collectors.toList; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import org.mule.maven.client.api.MavenClient; import org.mule.maven.pom.parser.api.MavenPomParser; @@ -38,7 +38,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; import org.apache.commons.lang3.StringUtils; diff --git a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/plugin/PluginLocalDependenciesDenylist.java b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/plugin/PluginLocalDependenciesDenylist.java index 7f5d6c79c9b..ccedf33eda0 100644 --- a/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/plugin/PluginLocalDependenciesDenylist.java +++ b/modules/artifact-activation/src/main/java/org/mule/runtime/module/artifact/activation/internal/plugin/PluginLocalDependenciesDenylist.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/artifact/src/main/java/module-info.java b/modules/artifact/src/main/java/module-info.java index f40cd5947de..ee68d1a5b68 100644 --- a/modules/artifact/src/main/java/module-info.java +++ b/modules/artifact/src/main/java/module-info.java @@ -26,7 +26,7 @@ requires com.google.common; requires org.apache.commons.io; requires org.apache.commons.lang3; - requires semver4j; + requires org.semver4j; exports org.mule.runtime.module.artifact.api; exports org.mule.runtime.module.artifact.api.classloader; diff --git a/modules/artifact/src/main/java/org/mule/runtime/module/artifact/api/descriptor/BundleDescriptorUtils.java b/modules/artifact/src/main/java/org/mule/runtime/module/artifact/api/descriptor/BundleDescriptorUtils.java index e3ebbd5cdd7..0c9e5da55c9 100644 --- a/modules/artifact/src/main/java/org/mule/runtime/module/artifact/api/descriptor/BundleDescriptorUtils.java +++ b/modules/artifact/src/main/java/org/mule/runtime/module/artifact/api/descriptor/BundleDescriptorUtils.java @@ -6,13 +6,13 @@ */ package org.mule.runtime.module.artifact.api.descriptor; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import static java.lang.String.format; import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.mule.runtime.api.util.Preconditions.checkArgument; -import com.vdurmont.semver4j.Semver; -import com.vdurmont.semver4j.SemverException; +import org.semver4j.Semver; +import org.semver4j.SemverException; /** * Utilities to work with {@link BundleDescriptor} diff --git a/modules/deployment-model-impl/src/main/java/module-info.java b/modules/deployment-model-impl/src/main/java/module-info.java index 00decab9fdd..e20ec10d92b 100644 --- a/modules/deployment-model-impl/src/main/java/module-info.java +++ b/modules/deployment-model-impl/src/main/java/module-info.java @@ -38,7 +38,7 @@ requires org.apache.commons.io; requires org.apache.commons.lang3; requires mule.classloader.model; - requires semver4j; + requires org.semver4j; exports org.mule.runtime.module.deployment.impl.internal to org.mule.runtime.deployment, diff --git a/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/AbstractMavenClassLoaderConfigurationLoader.java b/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/AbstractMavenClassLoaderConfigurationLoader.java index 0cc54302e6d..2e0aaefd28e 100644 --- a/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/AbstractMavenClassLoaderConfigurationLoader.java +++ b/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/AbstractMavenClassLoaderConfigurationLoader.java @@ -31,7 +31,7 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import static org.apache.commons.io.FileUtils.deleteQuietly; import static org.slf4j.LoggerFactory.getLogger; @@ -74,7 +74,7 @@ import java.util.function.Supplier; import com.google.common.collect.ImmutableSet; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; import org.slf4j.Logger; diff --git a/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/HeavyweightClassLoaderConfigurationBuilder.java b/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/HeavyweightClassLoaderConfigurationBuilder.java index 45a43b49b2c..7bc563ddde7 100644 --- a/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/HeavyweightClassLoaderConfigurationBuilder.java +++ b/modules/deployment-model-impl/src/main/java/org/mule/runtime/module/deployment/impl/internal/maven/HeavyweightClassLoaderConfigurationBuilder.java @@ -14,7 +14,7 @@ import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toList; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import org.mule.maven.pom.parser.api.MavenPomParser; import org.mule.maven.pom.parser.api.model.AdditionalPluginDependencies; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; import org.apache.commons.lang3.StringUtils; /** diff --git a/modules/deployment-model-impl/src/test/java/org/mule/runtime/module/deployment/impl/internal/builder/DeployableFileBuilder.java b/modules/deployment-model-impl/src/test/java/org/mule/runtime/module/deployment/impl/internal/builder/DeployableFileBuilder.java index cff7ed0ebe5..b22f1e1ab8e 100644 --- a/modules/deployment-model-impl/src/test/java/org/mule/runtime/module/deployment/impl/internal/builder/DeployableFileBuilder.java +++ b/modules/deployment-model-impl/src/test/java/org/mule/runtime/module/deployment/impl/internal/builder/DeployableFileBuilder.java @@ -19,7 +19,7 @@ import static org.mule.tools.api.classloader.ClassLoaderModelJsonSerializer.serializeToFile; import static com.google.common.base.Preconditions.checkArgument; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -48,7 +48,7 @@ import java.util.Map; import java.util.Properties; -import com.vdurmont.semver4j.Semver; +import org.semver4j.Semver; public abstract class DeployableFileBuilder> extends AbstractArtifactFileBuilder { diff --git a/tests/runner/src/main/java/module-info.java b/tests/runner/src/main/java/module-info.java index 6cfd0fff5ea..76292d94103 100644 --- a/tests/runner/src/main/java/module-info.java +++ b/tests/runner/src/main/java/module-info.java @@ -38,7 +38,7 @@ requires org.apache.commons.collections4; requires org.apache.commons.io; requires org.apache.commons.lang3; - requires semver4j; + requires org.semver4j; requires org.reflections; // TODO: MULE-19762 remove once forward compatibility is finished requires org.apache.maven.resolver; diff --git a/tests/runner/src/main/java/org/mule/test/runner/api/AetherClassPathClassifier.java b/tests/runner/src/main/java/org/mule/test/runner/api/AetherClassPathClassifier.java index a694fbbcb00..036060f6ea9 100644 --- a/tests/runner/src/main/java/org/mule/test/runner/api/AetherClassPathClassifier.java +++ b/tests/runner/src/main/java/org/mule/test/runner/api/AetherClassPathClassifier.java @@ -32,7 +32,7 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; import static com.google.common.collect.Maps.newLinkedHashMap; -import static com.vdurmont.semver4j.Semver.SemverType.LOOSE; +import static org.semver4j.Semver.SemverType.LOOSE; import static org.apache.commons.io.FileUtils.toFile; import static org.apache.commons.lang3.StringUtils.endsWithIgnoreCase; import static org.eclipse.aether.util.artifact.ArtifactIdUtils.toId; @@ -76,8 +76,8 @@ import java.util.stream.Collectors; import com.google.common.collect.Lists; -import com.vdurmont.semver4j.Semver; -import com.vdurmont.semver4j.SemverException; +import org.semver4j.Semver; +import org.semver4j.SemverException; import org.apache.commons.io.filefilter.WildcardFileFilter; import org.eclipse.aether.artifact.Artifact;