Merge branch 'fix-everything'

This fixes version and classifier detection, improves the behavior of
appSubdirectory, adds support for custom subdirectory pattern, and fixes
a crash bug with the EclipseHelper.

It also renames and generalizes the copy-jars mojo to populate-app,
a backwards incompatible change. Therefore, we bump the major digit.

Author: ctrueden

LICENSE.txt

@@ -1,6 +1,4 @@
-Copyright (c) 2014 - 2018, Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+Copyright (c) 2014 - 2020, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -20,15 +20,15 @@ This plugin has 7 goals:
 scijava:bump
   Bumps dependency and parent versions in SciJava projects.
 
-scijava:copy-jars
+scijava:populate-app
   Copies .jar artifacts and their dependencies into a SciJava application
   directory structure. ImageJ 1.x plugins (identified by containing a
   plugins.config file) get copied to the plugins/ subdirectory and all other
   .jar files to jars/. However, you can override this decision by setting the
   scijava.app.subdirectory property to a specific subdirectory. It expects the
   location of the SciJava application directory to be specified in the
   scijava.app.directory property (which can be set on the Maven command-line).
-  If said property is not set, the copy-jars goal is skipped.
+  If said property is not set, the populate-app goal is skipped.
 
 scijava:eclipse-helper
   Runs the annotation processor of the scijava-common artifact even inside
@@ -68,7 +68,7 @@ scijava:verify-no-snapshots
 Usage
 -----
 
-It is recommended to enable the _set-rootdir_ as well as the _copy-jars_
+It is recommended to enable the _set-rootdir_ as well as the _populate-app_
 goal by making the [SciJava POM](http://github.com/scijava/pom-scijava)
 the parent project:
 
@@ -101,10 +101,10 @@ Alternatively, you can include the plugin explicitly in the life cycle:
         </goals>
       </execution>
       <execution>
-        <id>copy-jars</id>
+        <id>populate-app</id>
         <phase>install</phase>
         <goals>
-          <goal>copy-jars</goal>
+          <goal>populate-app</goal>
         </goals>
       </execution>
     </executions>

pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>26.0.0</version>
+		<version>28.0.0</version>
 		<relativePath />
 	</parent>
 
 	<artifactId>scijava-maven-plugin</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>SciJava plugin for Maven</name>
@@ -95,16 +95,19 @@
 		<package-name>org.scijava.maven</package-name>
 
 		<license.licenseName>bsd_2</license.licenseName>
-		<license.copyrightOwners>Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.</license.copyrightOwners>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
 		<license.projectName>A plugin for managing SciJava-based projects.</license.projectName>
 
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.6</maven.compiler.target>
 		<maven.version>3.0</maven.version>
 		<maven2.version>2.2.1</maven2.version>
 		<maven-tree.version>2.2</maven-tree.version>
+		<maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
+		<maven-artifact-transfer.version>0.9.1</maven-artifact-transfer.version>
+		<maven-common-artifact-filters.version>3.0.1</maven-common-artifact-filters.version>
+		<plexus-interpolation.version>1.24</plexus-interpolation.version>
+		<plexus-utils.version>3.1.0</plexus-utils.version>
 	</properties>
 
 	<dependencies>
@@ -165,7 +168,7 @@ Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.</license.copyr
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.5</version>
+			<version>${maven-plugin-annotations.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -192,29 +195,28 @@ Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.</license.copyr
 		<dependency>
 			<groupId>org.apache.maven.shared</groupId>
 			<artifactId>maven-artifact-transfer</artifactId>
-			<version>0.9.1</version>
+			<version>${maven-artifact-transfer.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.shared</groupId>
 			<artifactId>maven-common-artifact-filters</artifactId>
-			<version>3.0.1</version>
+			<version>${maven-common-artifact-filters.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-interpolation</artifactId>
-			<version>1.24</version>
+			<version>${plexus-interpolation.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
-			<version>3.1.0</version>
+			<version>${plexus-utils.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
-			<version>${scijava-common.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -248,18 +250,6 @@ Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.</license.copyr
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.0</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>extra-enforcer-rules</artifactId>
-							<version>1.0-beta-9</version>
-						</dependency>
-					</dependencies>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>

src/it/copy-to-subdirectory/pom.xml

@@ -2,9 +2,7 @@
   #%L
   A plugin for managing SciJava-based projects.
   %%
-  Copyright (C) 2014 - 2018 Board of Regents of the University of
-  Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-  Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+  Copyright (C) 2014 - 2020 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
@@ -36,7 +34,7 @@
 	<artifactId>Example_PlugIn</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
+	<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's PopulateAppMojo</name>
 
 	<dependencies>
 		<dependency>
@@ -60,10 +58,10 @@
 				<version>${scijava-maven.version}</version>
 				<executions>
 					<execution>
-						<id>copy-jars</id>
+						<id>populate-app</id>
 						<phase>install</phase>
 						<goals>
-							<goal>copy-jars</goal>
+							<goal>populate-app</goal>
 						</goals>
 					</execution>
 					<execution>

src/it/copy-to-subdirectory/setup.bsh

@@ -2,9 +2,7 @@
  * #%L
  * A plugin for managing SciJava-based projects.
  * %%
- * Copyright (C) 2014 - 2018 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+ * Copyright (C) 2014 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/it/copy-to-subdirectory/src/main/resources/plugins.config

@@ -2,9 +2,7 @@
 # #%L
 # A plugin for managing SciJava-based projects.
 # %%
-# Copyright (C) 2014 - 2018 Board of Regents of the University of
-# Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-# Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+# Copyright (C) 2014 - 2020 SciJava developers.
 # %%
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

src/it/copy-to-subdirectory/verify.bsh

@@ -2,9 +2,7 @@
  * #%L
  * A plugin for managing SciJava-based projects.
  * %%
- * Copyright (C) 2014 - 2018 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+ * Copyright (C) 2014 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/it/delete-other-versions-configuration/pom.xml

@@ -2,9 +2,7 @@
   #%L
   A plugin for managing SciJava-based projects.
   %%
-  Copyright (C) 2014 - 2018 Board of Regents of the University of
-  Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-  Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+  Copyright (C) 2014 - 2020 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
@@ -36,7 +34,7 @@
 	<artifactId>Example_PlugIn</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
+	<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's PopulateAppMojo</name>
 
 	<properties>
 		<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
@@ -51,10 +49,10 @@
 				<version>${scijava-maven.version}</version>
 				<executions>
 					<execution>
-						<id>copy-jars</id>
+						<id>populate-app</id>
 						<phase>install</phase>
 						<goals>
-							<goal>copy-jars</goal>
+							<goal>populate-app</goal>
 						</goals>
 						<configuration>
 							<deleteOtherVersions>false</deleteOtherVersions>

src/it/delete-other-versions-configuration/setup.bsh

@@ -2,9 +2,7 @@
  * #%L
  * A plugin for managing SciJava-based projects.
  * %%
- * Copyright (C) 2014 - 2018 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+ * Copyright (C) 2014 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/it/delete-other-versions-configuration/src/main/resources/plugins.config

@@ -2,9 +2,7 @@
 # #%L
 # A plugin for managing SciJava-based projects.
 # %%
-# Copyright (C) 2014 - 2018 Board of Regents of the University of
-# Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-# Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.
+# Copyright (C) 2014 - 2020 SciJava developers.
 # %%
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met: