Author: schor Date: Tue Jul 23 12:20:58 2019 New Revision: 1863631 URL: http://svn.apache.org/viewvc?rev=1863631&view=rev Log: no Jira, merging update from uv3 to stop using deprecated @Component
Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml uima/uimaj/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java uima/uimaj/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml?rev=1863631&r1=1863630&r2=1863631&view=diff ============================================================================== --- uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml (original) +++ uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml Tue Jul 23 12:20:58 2019 @@ -64,7 +64,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.0.3</version> + <version>3.1.0</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java?rev=1863631&r1=1863630&r2=1863631&view=diff ============================================================================== --- uima/uimaj/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java (original) +++ uima/uimaj/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java Tue Jul 23 12:20:58 2019 @@ -94,7 +94,7 @@ public class PearPackagingMojo extends A /** * The maven project. */ - @Component + @Parameter( defaultValue = "${project}", readonly = true ) private MavenProject project; // the PEAR packaging directory contains all the stuff that is added to @@ -180,8 +180,8 @@ public class PearPackagingMojo extends A // 2) remove duplicates // 3) paths that are generated are in form $main_root/lib/jar-name - classpathsInOrder = new ArrayList<String>(); - classpathsDefined = new HashSet<String>(); + classpathsInOrder = new ArrayList<>(); + classpathsDefined = new HashSet<>(); String pathToLib = String.format("$main_root/%s", InstallationController.PACKAGE_LIB_DIR); log.debug("pear pathToLib = " + pathToLib); Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java?rev=1863631&r1=1863630&r2=1863631&view=diff ============================================================================== --- uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java (original) +++ uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java Tue Jul 23 12:20:58 2019 @@ -69,7 +69,8 @@ import org.xml.sax.SAXException; */ @Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) public class JCasGenMojo extends AbstractMojo { - @Component + + @Parameter( defaultValue = "${project}", readonly = true ) private MavenProject project; @Component @@ -156,7 +157,7 @@ public class JCasGenMojo extends Abstrac // Create a merged type system and check if any of the files has a delta TypeSystemDescription typeSystem = new TypeSystemDescription_impl(); - List<Import> imports = new ArrayList<Import>(); + List<Import> imports = new ArrayList<>(); boolean contextDelta = false; for (String descriptorLocation : ds.getIncludedFiles()) { File descriptorFile = new File(ds.getBasedir(), descriptorLocation); @@ -203,7 +204,7 @@ public class JCasGenMojo extends Abstrac return; } - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); if (limitToProject) { File limitToDirectory = project.getBasedir().getAbsoluteFile(); getLog().info("JCasGen: Limiting generation to descriptors in '" + limitToDirectory + "'"); @@ -301,7 +302,7 @@ public class JCasGenMojo extends Abstrac File buildOutputDirectory = new File(this.project.getBuild().getOutputDirectory()); // map each resource from its target location to its source location - Map<File, File> targetToSource = new HashMap<File, File>(); + Map<File, File> targetToSource = new HashMap<>(); for (Resource resource : this.project.getResources()) { File resourceDir = new File(resource.getDirectory()); if (resourceDir.exists()) { Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java?rev=1863631&r1=1863630&r2=1863631&view=diff ============================================================================== --- uima/uimaj/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java (original) +++ uima/uimaj/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java Tue Jul 23 12:20:58 2019 @@ -105,7 +105,7 @@ public class JCasGenMojoTest extends Abs ds.setBasedir(jCasGenDirectory); ds.setIncludes(new String[] { "**/*.java" }); ds.scan(); - List<File> files = new ArrayList<File>(); + List<File> files = new ArrayList<>(); for (String scannedFile : ds.getIncludedFiles()) { files.add(new File(ds.getBasedir(), scannedFile)); }