Skip to content

Commit 746f0dd

Browse files
gselzerctrueden
gselzer
authored and
ctrueden
committed
Place ignored duplicate classes on a single line
Otherwise it messes with the output in the build
1 parent a00c198 commit 746f0dd

9 files changed

Lines changed: 9 additions & 30 deletions

File tree

‎imagej/imagej-ops2/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,7 @@
210210
<license.projectName>ImageJ software for multidimensional image processing and analysis.</license.projectName>
211211

212212
<!-- NB While we depend on old scijava-common -->
213-
<imagej-ops2.allowedDuplicateClasses>
214-
${scijava.allowedDuplicateClasses},
215-
org.scijava.*,
216-
com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*
217-
</imagej-ops2.allowedDuplicateClasses>
213+
<imagej-ops2.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},org.scijava.*,com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</imagej-ops2.allowedDuplicateClasses>
218214
<allowedDuplicateClasses>${imagej-ops2.allowedDuplicateClasses}</allowedDuplicateClasses>
219215

220216
<!-- NB: Deploy releases to the ImageJ Maven repository. -->

‎scijava/scijava-discovery-plugin/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@
8686

8787
<license.licenseName>bsd_2</license.licenseName>
8888
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
89-
<scijava-discovery-plugin.allowedDuplicateClasses>
90-
${scijava.allowedDuplicateClasses}
91-
</scijava-discovery-plugin.allowedDuplicateClasses>
89+
<scijava-discovery-plugin.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-discovery-plugin.allowedDuplicateClasses>
9290
<allowedDuplicateClasses>${scijava-discovery-plugin.allowedDuplicateClasses}</allowedDuplicateClasses>
9391
<therapi.packages></therapi.packages>
9492
</properties>

‎scijava/scijava-discovery-test/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@
101101

102102
<license.licenseName>bsd_2</license.licenseName>
103103
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
104-
<scijava-discovery-test.allowedDuplicateClasses>
105-
${scijava.allowedDuplicateClasses}
106-
</scijava-discovery-test.allowedDuplicateClasses>
104+
<scijava-discovery-test.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-discovery-test.allowedDuplicateClasses>
107105
<allowedDuplicateClasses>${scijava-discovery-test.allowedDuplicateClasses}</allowedDuplicateClasses>
108106
</properties>
109107
<dependencies>

‎scijava/scijava-discovery-therapi/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@
8686

8787
<license.licenseName>bsd_2</license.licenseName>
8888
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
89-
<scijava-discovery-therapi.allowedDuplicateClasses>
90-
${scijava.allowedDuplicateClasses}
91-
</scijava-discovery-therapi.allowedDuplicateClasses>
89+
<scijava-discovery-therapi.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-discovery-therapi.allowedDuplicateClasses>
9290
<allowedDuplicateClasses>${scijava-discovery-therapi.allowedDuplicateClasses}</allowedDuplicateClasses>
9391
<therapi.packages></therapi.packages>
9492
</properties>

‎scijava/scijava-discovery/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@
101101

102102
<license.licenseName>bsd_2</license.licenseName>
103103
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
104-
<scijava-discovery.allowedDuplicateClasses>
105-
${scijava.allowedDuplicateClasses}
106-
</scijava-discovery.allowedDuplicateClasses>
104+
<scijava-discovery.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-discovery.allowedDuplicateClasses>
107105
<allowedDuplicateClasses>${scijava-discovery.allowedDuplicateClasses}</allowedDuplicateClasses>
108106
</properties>
109107
<dependencies>

‎scijava/scijava-log2/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@
8686

8787
<license.licenseName>bsd_2</license.licenseName>
8888
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
89-
<scijava-log2.allowedDuplicateClasses>
90-
${scijava.allowedDuplicateClasses}
91-
</scijava-log2.allowedDuplicateClasses>
89+
<scijava-log2.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-log2.allowedDuplicateClasses>
9290
<allowedDuplicateClasses>${scijava-log2.allowedDuplicateClasses}</allowedDuplicateClasses>
9391
</properties>
9492
<dependencies>

‎scijava/scijava-ops-engine/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@
101101

102102
<license.licenseName>bsd_2</license.licenseName>
103103
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
104-
<scijava-ops-engine.allowedDuplicateClasses>
105-
${scijava.allowedDuplicateClasses},
106-
com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*
107-
</scijava-ops-engine.allowedDuplicateClasses>
104+
<scijava-ops-engine.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-engine.allowedDuplicateClasses>
108105
<allowedDuplicateClasses>${scijava-ops-engine.allowedDuplicateClasses}</allowedDuplicateClasses>
109106
<therapi.packages></therapi.packages>
110107
</properties>

‎scijava/scijava-ops-spi/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@
101101

102102
<license.licenseName>bsd_2</license.licenseName>
103103
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
104-
<scijava-ops-spi.allowedDuplicateClasses>
105-
${scijava.allowedDuplicateClasses}
106-
</scijava-ops-spi.allowedDuplicateClasses>
104+
<scijava-ops-spi.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-ops-spi.allowedDuplicateClasses>
107105
<allowedDuplicateClasses>${scijava-ops-spi.allowedDuplicateClasses}</allowedDuplicateClasses>
108106
</properties>
109107
<dependencies>

‎scijava/scijava-parse2/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@
8686

8787
<license.licenseName>bsd_2</license.licenseName>
8888
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
89-
<scijava-parse2.allowedDuplicateClasses>
90-
${scijava.allowedDuplicateClasses}
91-
</scijava-parse2.allowedDuplicateClasses>
89+
<scijava-parse2.allowedDuplicateClasses>${scijava.allowedDuplicateClasses}</scijava-parse2.allowedDuplicateClasses>
9290
<allowedDuplicateClasses>${scijava-parse2.allowedDuplicateClasses}</allowedDuplicateClasses>
9391
</properties>
9492
<dependencies>

0 commit comments

Comments
 (0)