Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update server4j to v5.3.0 #13716

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update server4j to v5.3.0 #13716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc08db3
Update server4j to v5.3.0
elrodro83 Aug 9, 2024
b9ca71d
sadf
elrodro83 Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/artifact-activation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

<javaModuleName>org.mule.runtime.artifact.activation</javaModuleName>
<skipExportTests>false</skipExportTests>
<semver4jVersion>2.0.3</semver4jVersion>
<formatterConfigPath>../../formatter.xml</formatterConfigPath>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion modules/artifact-activation/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ule/runtime/module/artifact/activation/internal/classloader/model/utils/VersionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...ime/module/artifact/activation/internal/deployable/MuleDeployableProjectModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ntime/module/artifact/activation/internal/maven/AdditionalPluginDependenciesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;


Expand Down
2 changes: 1 addition & 1 deletion ...e/runtime/module/artifact/activation/internal/plugin/PluginLocalDependenciesDenylist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion modules/artifact/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
<groupId>org.semver4j</groupId>
<artifactId>semver4j</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion modules/artifact/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/org/mule/runtime/module/artifact/api/descriptor/BundleDescriptorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion modules/deployment-model-impl/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...me/module/deployment/impl/internal/maven/AbstractMavenClassLoaderConfigurationLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...ime/module/deployment/impl/internal/maven/HeavyweightClassLoaderConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/mule/runtime/module/deployment/impl/internal/builder/DeployableFileBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<T extends DeployableFileBuilder<T>> extends AbstractArtifactFileBuilder<T> {

Expand Down
2 changes: 1 addition & 1 deletion tests/runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<artifactId>mule-maven-client-impl</artifactId>
<exclusions>
<exclusion>
<groupId>com.vdurmont</groupId>
<groupId>org.semver4j</groupId>
<artifactId>semver4j</artifactId>
</exclusion>
</exclusions>
Expand Down
2 changes: 1 addition & 1 deletion tests/runner/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions tests/runner/src/main/java/org/mule/test/runner/api/AetherClassPathClassifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down