You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/02/09 20:47:55 UTC
[maven-jdeprscan-plugin] branch MJDEPRSCAN-5 updated (4ca6143 -> be23b29)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MJDEPRSCAN-5
in repository https://gitbox.apache.org/repos/asf/maven-jdeprscan-plugin.git
discard 4ca6143 [MJDEPRSCAN-5] Require Java 8
new be23b29 [MJDEPRSCAN-5] Require Java 8
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4ca6143)
\
N -- N -- N refs/heads/MJDEPRSCAN-5 (be23b29)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/maven/plugins/jdeprscan/consumers/JDeprScanConsumer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-jdeprscan-plugin] 01/01: [MJDEPRSCAN-5] Require Java 8
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MJDEPRSCAN-5
in repository https://gitbox.apache.org/repos/asf/maven-jdeprscan-plugin.git
commit be23b29728d091ea0b32b58407691522235eb41f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Feb 9 21:37:02 2023 +0100
[MJDEPRSCAN-5] Require Java 8
---
pom.xml | 2 +-
.../apache/maven/plugins/jdeprscan/AbstractJDeprScanMojo.java | 10 +---------
.../org/apache/maven/plugins/jdeprscan/BaseJDeprScanMojo.java | 2 +-
.../maven/plugins/jdeprscan/consumers/JDeprScanConsumer.java | 7 +------
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3bb07b0..8a73f3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<properties>
<mavenVersion>3.0</mavenVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
diff --git a/src/main/java/org/apache/maven/plugins/jdeprscan/AbstractJDeprScanMojo.java b/src/main/java/org/apache/maven/plugins/jdeprscan/AbstractJDeprScanMojo.java
index a40977c..ae46027 100644
--- a/src/main/java/org/apache/maven/plugins/jdeprscan/AbstractJDeprScanMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jdeprscan/AbstractJDeprScanMojo.java
@@ -269,15 +269,7 @@ public abstract class AbstractJDeprScanMojo
tc = tcs.get( tcs.size() - 1 );
}
}
- catch ( ReflectiveOperationException e )
- {
- // ignore
- }
- catch ( SecurityException e )
- {
- // ignore
- }
- catch ( IllegalArgumentException e )
+ catch ( ReflectiveOperationException | SecurityException | IllegalArgumentException e )
{
// ignore
}
diff --git a/src/main/java/org/apache/maven/plugins/jdeprscan/BaseJDeprScanMojo.java b/src/main/java/org/apache/maven/plugins/jdeprscan/BaseJDeprScanMojo.java
index f9fa9d7..b1fffda 100644
--- a/src/main/java/org/apache/maven/plugins/jdeprscan/BaseJDeprScanMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jdeprscan/BaseJDeprScanMojo.java
@@ -66,7 +66,7 @@ public abstract class BaseJDeprScanMojo extends AbstractJDeprScanMojo
@Parameter
private String release;
- private JDeprScanConsumer consumer = new JDeprScanConsumer();
+ private final JDeprScanConsumer consumer = new JDeprScanConsumer();
@Override
public void execute()
diff --git a/src/main/java/org/apache/maven/plugins/jdeprscan/consumers/JDeprScanConsumer.java b/src/main/java/org/apache/maven/plugins/jdeprscan/consumers/JDeprScanConsumer.java
index 188b6b8..5c20e43 100644
--- a/src/main/java/org/apache/maven/plugins/jdeprscan/consumers/JDeprScanConsumer.java
+++ b/src/main/java/org/apache/maven/plugins/jdeprscan/consumers/JDeprScanConsumer.java
@@ -78,12 +78,7 @@ public class JDeprScanConsumer
return;
}
- Set<String> dm = deprecatedMethods.get( matcher.group( 1 ) );
- if ( dm == null )
- {
- dm = new HashSet<>();
- deprecatedMethods.put( matcher.group( 1 ), dm );
- }
+ Set<String> dm = deprecatedMethods.computeIfAbsent( matcher.group( 1 ), k -> new HashSet<>() );
dm.add( matcher.group( 2 ) );
}
}