Upgrade to modernizer-maven-plugin 1.8.0

Notably this adds support for inline suppressions.  Release notes:

https://github.com/gaul/modernizer-maven-plugin/releases
This commit is contained in:
Andrew Gaul 2019-02-01 11:51:30 -08:00
parent e15077ea78
commit d14276d9a5
6 changed files with 28 additions and 3 deletions

View File

@ -106,6 +106,11 @@
<artifactId>auto-service</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-annotations</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>

View File

@ -29,6 +29,8 @@ import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Maps;
import org.gaul.modernizer_maven_annotations.SuppressModernizer;
/**
* Resolves the values of the properties so they can be inferred from other
* properties.
@ -82,6 +84,7 @@ public class ExpandProperties implements Function<Properties, Properties> {
});
}
@SuppressModernizer // for Matcher.appendReplacement(StringBuffer, String)
private boolean resolveProperties(Map<String, String> properties, Map<String, String> variables) {
boolean anyReplacementDone = false;
for (Map.Entry<String, String> entry : properties.entrySet()) {

View File

@ -110,6 +110,13 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
@ -294,6 +301,11 @@
<artifactId>mockwebserver</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-annotations</artifactId>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@ -941,7 +953,7 @@
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<version>1.6.0</version>
<version>1.8.0</version>
<!-- configuration and dependencies set via profiles -->
<executions>
<execution>

View File

@ -19,5 +19,3 @@ com/google/common/primitives/Ints.compare:(II)I
com/google/common/primitives/Longs.compare:(JJ)I
com/google/inject/Inject
com/google/inject/Provider
java/lang/StringBuffer."<init>":()V
java/util/Hashtable."<init>":(I)V

View File

@ -56,6 +56,11 @@
<artifactId>jclouds-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-annotations</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>

View File

@ -22,6 +22,7 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import org.gaul.modernizer_maven_annotations.SuppressModernizer;
import org.jclouds.scriptbuilder.domain.OsFamily;
import org.jclouds.scriptbuilder.domain.ShellToken;
import org.jclouds.scriptbuilder.functionloader.FunctionLoader;
@ -98,6 +99,7 @@ public class BundleFunctionLoader implements FunctionLoader {
}
}
@SuppressModernizer // for BundleContext.registerService(String, Object, Dictionary)
private void registerFunction(String functions) {
String[] className = { FunctionLoader.class.getName() };
Dictionary<String, Object> dictionary = new Hashtable<String, Object>(1);