Skip to content

Commit 1be10f7

Browse files
ctruedenctrueden
committed
Manage shared components
* google-http-client * jackson * jcodings The google-http-client dependencies are shared between: * Bio-Formats (ome-common via minio) * N5 (n5-google-cloud via google-cloud-storage) The jackson dependencies are shared between: * Bio-Formats - formats-gpl via cdm - ome-common via minio * N5 - n5-aws-s3 via aws-java-sdk - n5-google-cloud via google-cloud-* via google-http-client-jackson2 The jcodings dependency is shared between: * N5 (n5-ij vai jackson-iq via joni) * scripting-jruby (jruby-core) Without managing these versions, older versions of them win in the Fiji dependency tree (and probably other dependency trees).
1 parent a6b793e commit 1be10f7

1 file changed

Lines changed: 59 additions & 2 deletions

File tree

‎pom.xml‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@
946946

947947
<!-- Byte Code Generation Library - https://github.com/cglib/cglib -->
948948
<cglib.version>3.3.0</cglib.version>
949-
949+
950950
<!-- Eclipse Collections - https://www.eclipse.org/collections/ -->
951951
<eclipse-collections.version>10.4.0</eclipse-collections.version>
952952
<eclipse-collections-api.version>${eclipse-collections.version}</eclipse-collections-api.version>
@@ -976,6 +976,12 @@
976976
<google-cloud-resourcemanager.version>0.117.2-alpha</google-cloud-resourcemanager.version>
977977
<google-cloud-storage.version>1.108.0</google-cloud-storage.version>
978978

979+
<!-- Google HTTP Client Library for Java - https://github.com/googleapis/google-http-java-client -->
980+
<google-http-client.version>1.40.0</google-http-client.version>
981+
<google-http-client-appengine.version>${google-http-client.version}</google-http-client-appengine.version>
982+
<google-http-client-jackson2.version>${google-http-client.version}</google-http-client-jackson2.version>
983+
<google-http-client-xml.version>${google-http-client.version}</google-http-client-xml.version>
984+
979985
<!-- Gson - https://code.google.com/p/google-gson/ -->
980986
<gson.version>2.8.6</gson.version>
981987

@@ -992,7 +998,11 @@
992998
<jackrabbit-webdav.version>2.21.1</jackrabbit-webdav.version>
993999

9941000
<!-- Jackson - https://github.com/FasterXML/jackson -->
995-
<jackson-databind.version>2.11.0</jackson-databind.version>
1001+
<jackson.version>2.12.5</jackson.version>
1002+
<jackson-annotations.version>${jackson.version}</jackson-annotations.version>
1003+
<jackson-core.version>${jackson.version}</jackson-core.version>
1004+
<jackson-databind.version>${jackson.version}</jackson-databind.version>
1005+
<jackson-dataformat-cbor.version>${jackson.version}</jackson-dataformat-cbor.version>
9961006

9971007
<!-- Java Advanced Imaging - https://java.net/projects/jai-core -->
9981008
<jai.version>1.1.3</jai.version>
@@ -1011,6 +1021,9 @@
10111021
<!-- Javassist - https://www.javassist.org/ -->
10121022
<javassist.version>3.27.0-GA</javassist.version>
10131023

1024+
<!-- JCodings - https://github.com/jruby/jcodings -->
1025+
<jcodings.version>1.0.55</jcodings.version>
1026+
10141027
<!-- JDOM - http://www.jdom.org/ -->
10151028
<jdom2.version>2.0.6</jdom2.version>
10161029

@@ -3510,6 +3523,28 @@
35103523
<version>${google-cloud-storage.version}</version>
35113524
</dependency>
35123525

3526+
<!-- Google HTTP Client Library for Java - https://github.com/googleapis/google-http-java-client -->
3527+
<dependency>
3528+
<groupId>com.google.http-client</groupId>
3529+
<artifactId>google-http-client</artifactId>
3530+
<version>${google-http-client.version}</version>
3531+
</dependency>
3532+
<dependency>
3533+
<groupId>com.google.http-client</groupId>
3534+
<artifactId>google-http-client-appengine</artifactId>
3535+
<version>${google-http-client-appengine.version}</version>
3536+
</dependency>
3537+
<dependency>
3538+
<groupId>com.google.http-client</groupId>
3539+
<artifactId>google-http-client-jackson2</artifactId>
3540+
<version>${google-http-client-jackson2.version}</version>
3541+
</dependency>
3542+
<dependency>
3543+
<groupId>com.google.http-client</groupId>
3544+
<artifactId>google-http-client-xml</artifactId>
3545+
<version>${google-http-client-xml.version}</version>
3546+
</dependency>
3547+
35133548
<!-- Gson - https://code.google.com/p/google-gson/ -->
35143549
<dependency>
35153550
<groupId>com.google.code.gson</groupId>
@@ -3558,11 +3593,26 @@
35583593
</dependency>
35593594

35603595
<!-- Jackson - https://github.com/FasterXML/jackson -->
3596+
<dependency>
3597+
<groupId>com.fasterxml.jackson.core</groupId>
3598+
<artifactId>jackson-annotations</artifactId>
3599+
<version>${jackson-annotations.version}</version>
3600+
</dependency>
3601+
<dependency>
3602+
<groupId>com.fasterxml.jackson.core</groupId>
3603+
<artifactId>jackson-core</artifactId>
3604+
<version>${jackson-core.version}</version>
3605+
</dependency>
35613606
<dependency>
35623607
<groupId>com.fasterxml.jackson.core</groupId>
35633608
<artifactId>jackson-databind</artifactId>
35643609
<version>${jackson-databind.version}</version>
35653610
</dependency>
3611+
<dependency>
3612+
<groupId>com.fasterxml.jackson.dataformat</groupId>
3613+
<artifactId>jackson-dataformat-cbor</artifactId>
3614+
<version>${jackson-dataformat-cbor.version}</version>
3615+
</dependency>
35663616

35673617
<!-- Java Advanced Imaging - https://java.net/projects/jai-core -->
35683618
<dependency>
@@ -3607,6 +3657,13 @@
36073657
<version>${javassist.version}</version>
36083658
</dependency>
36093659

3660+
<!-- JCodings - https://github.com/jruby/jcodings -->
3661+
<dependency>
3662+
<groupId>org.jruby.jcodings</groupId>
3663+
<artifactId>jcodings</artifactId>
3664+
<version>${jcodings.version}</version>
3665+
</dependency>
3666+
36103667
<!-- JDOM - http://www.jdom.org/ -->
36113668
<dependency>
36123669
<groupId>org.jdom</groupId>

0 commit comments

Comments
 (0)