This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch remove-commons-lang in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2611fa5849a14d426e67ecde54c451bdae5a44f7 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Sep 16 19:26:16 2018 +0200 [MNG-XXXX] Remove lang3 --- maven-artifact/pom.xml | 4 -- .../org/apache/maven/artifact/ArtifactUtils.java | 58 +++++++++++++++++++--- maven-core/pom.xml | 4 -- .../DefaultBeanConfigurationRequest.java | 20 ++++++-- .../rtinfo/internal/DefaultRuntimeInformation.java | 17 +++++-- maven-embedder/pom.xml | 4 -- .../org/apache/maven/cli/CLIReportingUtils.java | 2 +- .../transfer/AbstractMavenTransferListener.java | 24 ++++++--- .../cli/transfer/ConsoleMavenTransferListener.java | 4 +- .../maven/cli/transfer/FileSizeFormatTest.java | 8 ++- pom.xml | 6 --- 11 files changed, 107 insertions(+), 44 deletions(-) diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 089f4ac..cdcfe3e 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -37,10 +37,6 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> </dependencies> <build> diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java index cf7d27d..ac461b2 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; -import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.versioning.VersionRange; /** @@ -54,7 +53,14 @@ public final class ArtifactUtils public static String toSnapshotVersion( String version ) { - Validate.notBlank( version, "version can neither be null, empty nor blank" ); + if ( version == null ) + { + throw new NullPointerException( "version can neither be null, empty nor blank" ); + } + if ( version.length() == 0 || version.trim().length() == 0 ) + { + throw new IllegalArgumentException( "version can neither be null, empty nor blank" ); + } Matcher m = Artifact.VERSION_FILE_PATTERN.matcher( version ); if ( m.matches() ) @@ -74,8 +80,23 @@ public final class ArtifactUtils public static String versionlessKey( String groupId, String artifactId ) { - Validate.notBlank( groupId, "groupId can neither be null, empty nor blank" ); - Validate.notBlank( artifactId, "artifactId can neither be null, empty nor blank" ); + if ( groupId == null ) + { + throw new NullPointerException( "groupId can neither be null, empty nor blank" ); + } + if ( groupId.length() == 0 || groupId.trim().length() == 0 ) + { + throw new IllegalArgumentException( "groupId can neither be null, empty nor blank" ); + } + + if ( artifactId == null ) + { + throw new NullPointerException( "artifactId can neither be null, empty nor blank" ); + } + if ( artifactId.length() == 0 || artifactId.trim().length() == 0 ) + { + throw new IllegalArgumentException( "artifactId can neither be null, empty nor blank" ); + } return groupId + ":" + artifactId; } @@ -87,9 +108,32 @@ public final class ArtifactUtils public static String key( String groupId, String artifactId, String version ) { - Validate.notBlank( groupId, "groupId can neither be null, empty nor blank" ); - Validate.notBlank( artifactId, "artifactId can neither be null, empty nor blank" ); - Validate.notBlank( version, "version can neither be null, empty nor blank" ); + if ( groupId == null ) + { + throw new NullPointerException( "groupId can neither be null, empty nor blank" ); + } + if ( groupId.length() == 0 || groupId.trim().length() == 0 ) + { + throw new IllegalArgumentException( "groupId can neither be null, empty nor blank" ); + } + + if ( artifactId == null ) + { + throw new NullPointerException( "artifactId can neither be null, empty nor blank" ); + } + if ( artifactId.length() == 0 || artifactId.trim().length() == 0 ) + { + throw new IllegalArgumentException( "artifactId can neither be null, empty nor blank" ); + } + + if ( version == null ) + { + throw new NullPointerException( "version can neither be null, empty nor blank" ); + } + if ( version.length() == 0 || version.trim().length() == 0 ) + { + throw new IllegalArgumentException( "version can neither be null, empty nor blank" ); + } return groupId + ":" + artifactId + ":" + version; } diff --git a/maven-core/pom.xml b/maven-core/pom.xml index c34b761..5efd979 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -123,10 +123,6 @@ under the License. <artifactId>plexus-component-annotations</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> <scope>test</scope> diff --git a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java index 5ec69f5..0026e7b 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java @@ -19,7 +19,6 @@ package org.apache.maven.configuration; * under the License. */ -import org.apache.commons.lang3.Validate; import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; @@ -121,8 +120,23 @@ public class DefaultBeanConfigurationRequest private Plugin findPlugin( Model model, String groupId, String artifactId ) { - Validate.notBlank( groupId, "groupId can neither be null, empty nor blank" ); - Validate.notBlank( artifactId, "artifactId can neither be null, empty nor blank" ); + if ( groupId == null ) + { + throw new NullPointerException( "groupId can neither be null, empty nor blank" ); + } + if ( groupId.length() == 0 || groupId.trim().length() == 0 ) + { + throw new IllegalArgumentException( "groupId can neither be null, empty nor blank" ); + } + + if ( artifactId == null ) + { + throw new NullPointerException( "artifactId can neither be null, empty nor blank" ); + } + if ( artifactId.length() == 0 || artifactId.trim().length() == 0 ) + { + throw new IllegalArgumentException( "artifactId can neither be null, empty nor blank" ); + } if ( model != null ) { diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java index 12a6b6f..49b739c 100644 --- a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java +++ b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java @@ -19,8 +19,6 @@ package org.apache.maven.rtinfo.internal; * under the License. */ -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Validate; import org.apache.maven.rtinfo.RuntimeInformation; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; @@ -99,8 +97,14 @@ public class DefaultRuntimeInformation public boolean isMavenVersion( String versionRange ) { VersionScheme versionScheme = new GenericVersionScheme(); - - Validate.notBlank( versionRange, "versionRange can neither be null, empty nor blank" ); + if ( versionRange == null ) + { + throw new NullPointerException( "versionRange can neither be null, empty nor blank" ); + } + if ( versionRange.length() == 0 || versionRange.trim().length() == 0 ) + { + throw new IllegalArgumentException( "versionRange can neither be null, empty nor blank" ); + } VersionConstraint constraint; try @@ -116,7 +120,10 @@ public class DefaultRuntimeInformation try { String mavenVersion = getMavenVersion(); - Validate.validState( StringUtils.isNotEmpty( mavenVersion ), "Could not determine current Maven version" ); + if ( mavenVersion == null || mavenVersion.length() == 0 || mavenVersion.trim().length() == 0 ) + { + throw new NullPointerException( "Could not determine current Maven version" ); + } current = versionScheme.parseVersion( mavenVersion ); } diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 8f1799c..6683f85 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -131,10 +131,6 @@ under the License. <artifactId>commons-cli</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java index e1a4c2f..bd93820 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java @@ -28,8 +28,8 @@ import java.util.Date; import java.util.Locale; import java.util.Properties; -import org.apache.commons.lang3.StringUtils; import org.codehaus.plexus.util.Os; +import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; /** diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java index 984902e..1d281ac 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java @@ -24,7 +24,6 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; -import org.apache.commons.lang3.Validate; import org.eclipse.aether.transfer.AbstractTransferListener; import org.eclipse.aether.transfer.TransferCancelledException; import org.eclipse.aether.transfer.TransferEvent; @@ -116,7 +115,10 @@ public abstract class AbstractMavenTransferListener public static ScaleUnit getScaleUnit( long size ) { - Validate.isTrue( size >= 0L, "file size cannot be negative: %s", size ); + if ( size < 0L ) + { + throw new IllegalStateException( "file size cannot be negative: " + size ); + } if ( size >= GIGABYTE.bytes() ) { @@ -159,7 +161,10 @@ public abstract class AbstractMavenTransferListener @SuppressWarnings( "checkstyle:magicnumber" ) public String format( long size, ScaleUnit unit, boolean omitSymbol ) { - Validate.isTrue( size >= 0L, "file size cannot be negative: %s", size ); + if ( size < 0L ) + { + throw new IllegalArgumentException( "file size cannot be negative: " + size ); + } if ( unit == null ) { @@ -191,9 +196,16 @@ public abstract class AbstractMavenTransferListener public String formatProgress( long progressedSize, long size ) { - Validate.isTrue( progressedSize >= 0L, "progressed file size cannot be negative: %s", progressedSize ); - Validate.isTrue( size >= 0L && progressedSize <= size || size < 0L, - "progressed file size cannot be greater than size: %s > %s", progressedSize, size ); + if ( progressedSize < 0L ) + { + throw new IllegalArgumentException( "progressed file size cannot be negative: " + progressedSize ); + } + + if ( !( size < 0L || progressedSize <= size ) ) + { + throw new IllegalArgumentException( + "progressed file size cannot be greater than size: " + progressedSize + " > " + size ); + } if ( size >= 0L && progressedSize != size ) { diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java index 1ad943b..a2168a2 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java @@ -26,7 +26,6 @@ import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang3.StringUtils; import org.eclipse.aether.transfer.TransferCancelledException; import org.eclipse.aether.transfer.TransferEvent; import org.eclipse.aether.transfer.TransferResource; @@ -110,7 +109,8 @@ public class ConsoleMavenTransferListener if ( printResourceNames ) { - status.append( StringUtils.substringAfterLast( resourceName, "/" ) ); + // TODO StringUtils.substringAfterLast( resourceName, "/" ) ); + status.append( resourceName ); status.append( " (" ); } diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java index a870411..ac3e426 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java @@ -21,8 +21,6 @@ package org.apache.maven.cli.transfer; import java.util.Locale; -import org.apache.commons.lang3.JavaVersion; -import org.apache.commons.lang3.SystemUtils; import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat; import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat.ScaleUnit; @@ -136,10 +134,12 @@ public class FileSizeFormatTest { long _50_bytes = 50L; assertEquals( "50 B", format.format( _50_bytes ) ); assertEquals( "50 B", format.format( _50_bytes, ScaleUnit.BYTE ) ); +/* Disabled to compile with Java 11 if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) ) { assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) ); } +*/ assertEquals( "0 MB", format.format( _50_bytes, ScaleUnit.MEGABYTE ) ); assertEquals( "0 GB", format.format( _50_bytes, ScaleUnit.GIGABYTE ) ); @@ -168,10 +168,12 @@ public class FileSizeFormatTest { assertEquals( "50 kB", format.format( _50_kilobytes ) ); assertEquals( "50000 B", format.format( _50_kilobytes, ScaleUnit.BYTE ) ); assertEquals( "50 kB", format.format( _50_kilobytes, ScaleUnit.KILOBYTE ) ); +/* if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) ) { assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) ); } +*/ assertEquals( "0 GB", format.format( _50_kilobytes, ScaleUnit.GIGABYTE ) ); long _999_kilobytes = 999L * 1000L; @@ -200,10 +202,12 @@ public class FileSizeFormatTest { assertEquals( "50000000 B", format.format( _50_megabytes, ScaleUnit.BYTE ) ); assertEquals( "50000 kB", format.format( _50_megabytes, ScaleUnit.KILOBYTE ) ); assertEquals( "50 MB", format.format( _50_megabytes, ScaleUnit.MEGABYTE ) ); +/* if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) ) { assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) ); } +*/ long _999_megabytes = 999L * 1000L * 1000L; assertEquals( "999 MB", format.format( _999_megabytes ) ); diff --git a/pom.xml b/pom.xml index 4e370c0..19b7f87 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,6 @@ under the License. <maven.compiler.target>1.7</maven.compiler.target> <classWorldsVersion>2.5.2</classWorldsVersion> <commonsCliVersion>1.4</commonsCliVersion> - <commonsLangVersion>3.5</commonsLangVersion> <junitVersion>4.12</junitVersion> <mockitoVersion>2.21.0</mockitoVersion> <plexusVersion>1.7.1</plexusVersion> @@ -381,11 +380,6 @@ under the License. <version>${jxpathVersion}</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commonsLangVersion}</version> - </dependency> - <dependency> <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> <version>${securityDispatcherVersion}</version>
