diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml index 97dfb418..165c96a4 100644 --- a/modules/cli-module/pom.xml +++ b/modules/cli-module/pom.xml @@ -101,12 +101,6 @@ compile - - com.github.tony19 - named-regexp - 0.2.6 - - org.apache.logging.log4j diff --git a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapper.java b/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapper.java index b30e901e..5e35a643 100644 --- a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapper.java +++ b/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapper.java @@ -1,7 +1,5 @@ package org.simplejavamail.internal.clisupport; -import com.google.code.regexp.Matcher; -import com.google.code.regexp.Pattern; import jakarta.activation.DataSource; import jakarta.mail.internet.MimeMessage; import org.bbottema.javareflection.BeanUtils; @@ -47,12 +45,14 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import static com.google.code.regexp.Pattern.compile; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.EnumSet.allOf; import static java.util.EnumSet.of; +import static java.util.regex.Pattern.compile; import static org.bbottema.javareflection.TypeUtils.containsAnnotation; import static org.simplejavamail.internal.util.Preconditions.assumeTrue; import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument; diff --git a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/therapijavadoc/TherapiJavadocHelper.java b/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/therapijavadoc/TherapiJavadocHelper.java index d2f2fc84..74460a68 100644 --- a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/therapijavadoc/TherapiJavadocHelper.java +++ b/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/therapijavadoc/TherapiJavadocHelper.java @@ -7,7 +7,6 @@ import com.github.therapi.runtimejavadoc.RuntimeJavadoc; import com.github.therapi.runtimejavadoc.SeeAlsoJavadoc; import com.github.therapi.runtimejavadoc.Value; -import com.google.code.regexp.Matcher; import org.bbottema.javareflection.ClassUtils; import org.bbottema.javareflection.MethodUtils; import org.jetbrains.annotations.NotNull; @@ -24,11 +23,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; -import static com.google.code.regexp.Pattern.compile; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; +import static java.util.regex.Pattern.compile; import static org.simplejavamail.internal.clisupport.BuilderApiToPicocliCommandsMapper.colorizeDescriptions; import static org.simplejavamail.internal.util.ListUtil.getFirst; import static org.simplejavamail.internal.util.StringUtil.padRight; @@ -185,4 +185,4 @@ public static class DocumentedMethodParam { @NotNull public String getName() { return name; } @NotNull public String getJavadoc() { return javadoc; } } -} \ No newline at end of file +} diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml index 61665c46..f73c1cf4 100644 --- a/modules/core-module/pom.xml +++ b/modules/core-module/pom.xml @@ -47,11 +47,5 @@ 0.13.0 provided - - - com.github.tony19 - named-regexp - 0.2.6 - diff --git a/modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java b/modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java index 31080058..9c57762a 100644 --- a/modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java +++ b/modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java @@ -1,6 +1,5 @@ package org.simplejavamail.api.email; -import com.google.code.regexp.Pattern; import jakarta.activation.DataSource; import jakarta.mail.Message; import jakarta.mail.internet.InternetAddress; @@ -21,8 +20,9 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; -import static com.google.code.regexp.Pattern.compile; +import static java.util.regex.Pattern.compile; /** @@ -1658,4 +1658,4 @@ public interface EmailPopulatingBuilder { */ @Nullable Date getSentDate(); -} \ No newline at end of file +} diff --git a/modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java b/modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java index 9fbf8a3a..a4ea676b 100644 --- a/modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java +++ b/modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java @@ -1,7 +1,5 @@ package org.simplejavamail.config; -import com.google.code.regexp.Matcher; -import com.google.code.regexp.Pattern; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.simplejavamail.api.mailer.config.LoadBalancingStrategy; @@ -19,9 +17,11 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import static com.google.code.regexp.Pattern.compile; import static java.util.Collections.unmodifiableMap; +import static java.util.regex.Pattern.compile; import static org.simplejavamail.internal.util.MiscUtil.checkArgumentNotEmpty; import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty; import static org.simplejavamail.internal.util.Preconditions.assumeTrue; @@ -455,4 +455,4 @@ static Object parsePropertyValue(final @Nullable String propertyValue) { // return value as is (which should be string) return propertyValue; } -} \ No newline at end of file +} diff --git a/modules/core-module/src/main/java/org/simplejavamail/internal/util/StringUtil.java b/modules/core-module/src/main/java/org/simplejavamail/internal/util/StringUtil.java index c5eea2c1..c196cdf0 100644 --- a/modules/core-module/src/main/java/org/simplejavamail/internal/util/StringUtil.java +++ b/modules/core-module/src/main/java/org/simplejavamail/internal/util/StringUtil.java @@ -1,11 +1,12 @@ package org.simplejavamail.internal.util; -import com.google.code.regexp.Matcher; -import com.google.code.regexp.Pattern; import org.jetbrains.annotations.NotNull; -import static com.google.code.regexp.Pattern.compile; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import static java.lang.String.format; +import static java.util.regex.Pattern.compile; import static java.util.regex.Pattern.quote; import static org.simplejavamail.internal.util.Preconditions.assumeTrue; diff --git a/modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java b/modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java index 4fac0a0e..142565ca 100644 --- a/modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java +++ b/modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java @@ -1,6 +1,5 @@ package org.simplejavamail.email.internal; -import com.google.code.regexp.Matcher; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import jakarta.activation.DataSource; import jakarta.mail.Message.RecipientType; @@ -41,6 +40,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; import static jakarta.mail.Message.RecipientType.BCC; import static jakarta.mail.Message.RecipientType.CC; @@ -2475,4 +2475,4 @@ public X509Certificate getX509CertificateForSmimeEncryption() { public Date getSentDate() { return sentDate != null ? new Date(sentDate.getTime()) : null; } -} \ No newline at end of file +} diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl1Test.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl1Test.java index a374b547..54972dda 100644 --- a/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl1Test.java +++ b/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl1Test.java @@ -1,7 +1,5 @@ package org.simplejavamail.email.internal; -import com.google.code.regexp.Matcher; -import com.google.code.regexp.Pattern; import jakarta.activation.DataSource; import jakarta.mail.Message; import jakarta.mail.internet.InternetAddress; @@ -34,6 +32,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static demo.ResourceFolderHelper.determineResourceFolder; import static jakarta.mail.Message.RecipientType.BCC; @@ -1405,4 +1405,4 @@ public String getName() { return "dummy"; } } -} \ No newline at end of file +}