Skip to content

Commit 71cb2a2

Browse files
committed
Update to pom-scijava 40.0.0
As a temporary hack, we pin imglib2-mesh to 1.0.0 to avoid Op clashes, because imglib2-mesh 1.1.0 now integrates the geom Ops, resulting in Op matching clashes until #267 is merged.
1 parent 943971e commit 71cb2a2

File tree

25 files changed

+26
-105
lines changed

25 files changed

+26
-105
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

scijava-collections/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -108,9 +108,6 @@
108108
-->
109109
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
110110
<scijava.jvm.version>11</scijava.jvm.version>
111-
112-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
113-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
114111
</properties>
115112

116113
<dependencies>

scijava-common3/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -108,9 +108,6 @@
108108
-->
109109
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
110110
<scijava.jvm.version>11</scijava.jvm.version>
111-
112-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
113-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
114111
</properties>
115112

116113
<dependencies>

scijava-concurrent/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -100,9 +100,6 @@
100100
-->
101101
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
102102
<scijava.jvm.version>11</scijava.jvm.version>
103-
104-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
105-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
106103
</properties>
107104

108105
<dependencies>

scijava-discovery-test/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -103,9 +103,6 @@
103103
-->
104104
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
105105
<scijava.jvm.version>11</scijava.jvm.version>
106-
107-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
108-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
109106
</properties>
110107

111108
<dependencies>

scijava-discovery/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -99,9 +99,6 @@
9999
-->
100100
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
101101
<scijava.jvm.version>11</scijava.jvm.version>
102-
103-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
104-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
105102
</properties>
106103

107104
<build>

scijava-function/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -103,9 +103,6 @@
103103
-->
104104
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
105105
<scijava.jvm.version>11</scijava.jvm.version>
106-
107-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
108-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
109106
</properties>
110107

111108
<build>

scijava-legacy/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -98,10 +98,6 @@
9898
-->
9999
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
100100
<scijava.jvm.version>11</scijava.jvm.version>
101-
102-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
103-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
104-
<scijava-common.version>2.98.0</scijava-common.version>
105101
</properties>
106102

107103
<dependencies>

scijava-meta/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -107,9 +107,6 @@
107107
-->
108108
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
109109
<scijava.jvm.version>11</scijava.jvm.version>
110-
111-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
112-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
113110
</properties>
114111

115112
<dependencies>

scijava-ops-api/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>37.0.0</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -108,9 +108,6 @@
108108
-->
109109
<scijava.jvm.build.version>[11.0.17,)</scijava.jvm.build.version>
110110
<scijava.jvm.version>11</scijava.jvm.version>
111-
112-
<!-- TEMP: Until pom-scijava 38.0.0 is released. -->
113-
<scijava-maven-plugin.version>3.0.0</scijava-maven-plugin.version>
114111
</properties>
115112

116113
<dependencies>

0 commit comments

Comments
 (0)