Skip to content

Commit 667ce7b

Browse files
committed
Update property names in integration tests
1 parent 54d3593 commit 667ce7b

File tree

14 files changed

+24
-24
lines changed

14 files changed

+24
-24
lines changed

src/it/copy-jars/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</dependencies>
5454

5555
<properties>
56-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
56+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
5757
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5858
</properties>
5959

@@ -78,7 +78,7 @@
7878
<goal>install-artifact</goal>
7979
</goals>
8080
<configuration>
81-
<imagejDirectory>${project.basedir}/target/Other.app/</imagejDirectory>
81+
<appDirectory>${project.basedir}/target/Other.app/</appDirectory>
8282
<artifact>${project.groupId}:${project.artifactId}:${project.version}</artifact>
8383
</configuration>
8484
</execution>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</dependencies>
4848

4949
<properties>
50-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
51-
<imagej.app.subdirectory>plugins/Test/Directory/</imagej.app.subdirectory>
50+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
51+
<scijava.app.subdirectory>plugins/Test/Directory/</scijava.app.subdirectory>
5252
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5353
</properties>
5454

@@ -73,8 +73,8 @@
7373
<goal>install-artifact</goal>
7474
</goals>
7575
<configuration>
76-
<imagejDirectory>${project.basedir}/target/Other.app/</imagejDirectory>
77-
<imagejSubdirectory>jars/Subdirectory/</imagejSubdirectory>
76+
<appDirectory>${project.basedir}/target/Other.app/</appDirectory>
77+
<appSubdirectory>jars/Subdirectory/</appSubdirectory>
7878
<artifact>${project.groupId}:${project.artifactId}:${project.version}</artifact>
7979
</configuration>
8080
</execution>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
4040

4141
<properties>
42-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
42+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
</properties>
4545

src/it/delete-other-versions-in-subdirectory/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
4040

4141
<properties>
42-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
43-
<imagej.app.subdirectory>plugins/Test2/</imagej.app.subdirectory>
42+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
43+
<scijava.app.subdirectory>plugins/Test2/</scijava.app.subdirectory>
4444
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4545
</properties>
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
4040

4141
<properties>
42-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
42+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
44-
<imagej.deleteOtherVersions>always</imagej.deleteOtherVersions>
44+
<scijava.deleteOtherVersions>always</scijava.deleteOtherVersions>
4545
</properties>
4646

4747
<build>
@@ -65,7 +65,7 @@
6565
<goal>install-artifact</goal>
6666
</goals>
6767
<configuration>
68-
<imagejDirectory>${project.basedir}/target/Other.app/</imagejDirectory>
68+
<appDirectory>${project.basedir}/target/Other.app/</appDirectory>
6969
<artifact>${project.groupId}:${project.artifactId}:${project.version}</artifact>
7070
<deleteOtherVersionsPolicy>older</deleteOtherVersionsPolicy>
7171
</configuration>

src/it/delete-other-versions-property-false/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
4040

4141
<properties>
42-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
42+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
<delete.other.versions>false</delete.other.versions>
4545
</properties>

src/it/delete-other-versions-property-true/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<name>An example ImageJ 1.x plugin to test scijava-maven-plugin's CopyJarsMojo</name>
4040

4141
<properties>
42-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
42+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
<delete.other.versions>true</delete.other.versions>
4545
</properties>

src/it/do-not-delete-natives/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<name>An example ImageJ 1.x plugin to test if LWJGL natives-* files are kept</name>
4040

4141
<properties>
42-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
42+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
</properties>
4545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<name>An example artifact to test support for &lt;exclusions&gt;</name>
4141

4242
<properties>
43-
<imagej.app.directory>${project.basedir}/../target/ImageJ.app/</imagej.app.directory>
43+
<scijava.app.directory>${project.basedir}/../target/ImageJ.app/</scijava.app.directory>
4444
</properties>
4545

4646
<dependencies>

src/it/handle-missing-version-numbers/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<name>An example artifact to test support for missing version numbers</name>
4141

4242
<properties>
43-
<imagej.app.directory>${project.basedir}/target/ImageJ.app/</imagej.app.directory>
44-
<imagej.deleteOtherVersions>older</imagej.deleteOtherVersions>
43+
<scijava.app.directory>${project.basedir}/target/ImageJ.app/</scijava.app.directory>
44+
<scijava.deleteOtherVersions>older</scijava.deleteOtherVersions>
4545
</properties>
4646

4747
<build>

0 commit comments

Comments
 (0)