From: Patrick Plitzner Date: Wed, 20 Jan 2016 16:23:41 +0000 (+0100) Subject: Update dependencies X-Git-Tag: 4.0.0^2~180 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/8df68afdbf82c8c6cd347a6ee0f97eaba37f919d Update dependencies --- diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 8ee99d5d8..469a075bb 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,251 +1,251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 161e5639b..2a74196b2 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -477,8 +477,8 @@ Bundle-ClassPath: ., lib/antlr-2.7.7.jar, lib/aopalliance-1.0.jar, lib/apache-log4j-extras-1.2.17.jar, - lib/aspectjrt-1.8.7.jar, - lib/aspectjweaver-1.8.7.jar, + lib/aspectjrt-1.8.8.jar, + lib/aspectjweaver-1.8.8.jar, lib/avro-1.6.3.jar, lib/batik-anim-1.7.jar, lib/batik-awt-util-1.7.jar, @@ -505,6 +505,7 @@ Bundle-ClassPath: ., lib/cdmlib-print-3.13.0-SNAPSHOT.jar, lib/cdmlib-remote-3.13.0-SNAPSHOT.jar, lib/cdmlib-services-3.13.0-SNAPSHOT.jar, + lib/cdmlib-test-3.13.0-SNAPSHOT.jar, lib/cglib-3.2.0.jar, lib/cglib-nodep-3.2.0.jar, lib/classmate-1.3.1.jar, @@ -542,13 +543,13 @@ Bundle-ClassPath: ., lib/h2-1.4.190.jar, lib/h2mig_pagestore_addon.jar, lib/hamcrest-core-1.3.jar, - lib/hibernate-c3p0-5.0.6.Final.jar, + lib/hibernate-c3p0-5.0.7.Final.jar, lib/hibernate-cglib-repack-2.1_3.jar, lib/hibernate-commons-annotations-5.0.1.Final.jar, - lib/hibernate-core-5.0.6.Final.jar, - lib/hibernate-ehcache-5.0.6.Final.jar, - lib/hibernate-entitymanager-5.0.6.Final.jar, - lib/hibernate-envers-5.0.6.Final.jar, + lib/hibernate-core-5.0.7.Final.jar, + lib/hibernate-ehcache-5.0.7.Final.jar, + lib/hibernate-entitymanager-5.0.7.Final.jar, + lib/hibernate-envers-5.0.7.Final.jar, lib/hibernate-jpa-2.1-api-1.0.0.Final.jar, lib/hibernate-search-4.2.0.Final.jar, lib/hibernate-search-analyzers-4.2.0.Final.jar, @@ -562,14 +563,14 @@ Bundle-ClassPath: ., lib/httpcore-4.4.4.jar, lib/httpmime-4.5.1.jar, lib/icu4j-2.6.1.jar, - lib/identificationKeyAPI-1.0-SNAPSHOT.jar, + lib/identificationKeyAPI-1.0.jar, lib/istack-commons-runtime-2.21.jar, lib/istack-commons-tools-2.21.jar, lib/itextpdf-5.5.8.jar, - lib/jackson-annotations-2.6.4.jar, - lib/jackson-core-2.6.4.jar, + lib/jackson-annotations-2.6.5.jar, + lib/jackson-core-2.6.5.jar, lib/jackson-core-asl-1.8.8.jar, - lib/jackson-databind-2.6.4.jar, + lib/jackson-databind-2.6.5.jar, lib/jackson-mapper-asl-1.8.8.jar, lib/jakarta-regexp-1.4.jar, lib/jandex-2.0.0.Final.jar, @@ -631,7 +632,7 @@ Bundle-ClassPath: ., lib/opencsv-2.3.jar, lib/org.osgi.core-1.0.0.jar, lib/osgi-3.6.0.jar, - lib/p6spy-2.1.3.jar, + lib/p6spy-2.1.4.jar, lib/paranamer-2.3.jar, lib/plexus-classworlds-1.2-alpha-9.jar, lib/plexus-component-annotations-1.5.5.jar, @@ -640,11 +641,11 @@ Bundle-ClassPath: ., lib/poi-3.13.jar, lib/poi-ooxml-3.13.jar, lib/poi-ooxml-schemas-3.13.jar, - lib/postgresql-9.4-1205-jdbc42.jar, + lib/postgresql-9.4-1206-jdbc4.jar, lib/relaxngDatatype-20020414.jar, lib/rngom-2.2.11.jar, lib/sanselan-0.97-incubator.jar, - lib/Saxon-HE-9.7.0-1.jar, + lib/Saxon-HE-9.7.0-2.jar, lib/servlet-api-2.5.jar, lib/slf4j-api-1.7.13.jar, lib/slf4j-log4j12-1.7.13.jar, @@ -683,7 +684,7 @@ Bundle-ClassPath: ., lib/stax-1.2.0.jar, lib/stax-api-1.0.1.jar, lib/stax-ex-1.7.7.jar, - lib/swagger-annotations-1.5.5.jar, + lib/swagger-annotations-1.5.6.jar, lib/swagger-models-1.5.5.jar, lib/tools.jar, lib/txw2-2.2.11.jar, @@ -714,6 +715,5 @@ Bundle-ClassPath: ., lib/xpp3-1.1.4c.jar, lib/xsom-20140925.jar, lib/xstream-1.4.8.jar, - lib/yjp-controller-api-redist-9.0.8.jar, - lib/cdmlib-test-3.13.0-SNAPSHOT.jar + lib/yjp-controller-api-redist-9.0.8.jar Import-Package: eu.etaxonomy.cdm.api.application diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index fe5ec2b8e..5926c8d30 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -6,8 +6,8 @@ bin.includes = META-INF/,\ lib/antlr-2.7.7.jar,\ lib/aopalliance-1.0.jar,\ lib/apache-log4j-extras-1.2.17.jar,\ - lib/aspectjrt-1.8.7.jar,\ - lib/aspectjweaver-1.8.7.jar,\ + lib/aspectjrt-1.8.8.jar,\ + lib/aspectjweaver-1.8.8.jar,\ lib/avro-1.6.3.jar,\ lib/batik-anim-1.7.jar,\ lib/batik-awt-util-1.7.jar,\ @@ -34,6 +34,7 @@ bin.includes = META-INF/,\ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,\ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,\ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,\ + lib/cdmlib-test-3.13.0-SNAPSHOT.jar,\ lib/cglib-3.2.0.jar,\ lib/cglib-nodep-3.2.0.jar,\ lib/classmate-1.3.1.jar,\ @@ -71,13 +72,13 @@ bin.includes = META-INF/,\ lib/h2-1.4.190.jar,\ lib/h2mig_pagestore_addon.jar,\ lib/hamcrest-core-1.3.jar,\ - lib/hibernate-c3p0-5.0.6.Final.jar,\ + lib/hibernate-c3p0-5.0.7.Final.jar,\ lib/hibernate-cglib-repack-2.1_3.jar,\ lib/hibernate-commons-annotations-5.0.1.Final.jar,\ - lib/hibernate-core-5.0.6.Final.jar,\ - lib/hibernate-ehcache-5.0.6.Final.jar,\ - lib/hibernate-entitymanager-5.0.6.Final.jar,\ - lib/hibernate-envers-5.0.6.Final.jar,\ + lib/hibernate-core-5.0.7.Final.jar,\ + lib/hibernate-ehcache-5.0.7.Final.jar,\ + lib/hibernate-entitymanager-5.0.7.Final.jar,\ + lib/hibernate-envers-5.0.7.Final.jar,\ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,\ lib/hibernate-search-4.2.0.Final.jar,\ lib/hibernate-search-analyzers-4.2.0.Final.jar,\ @@ -91,14 +92,14 @@ bin.includes = META-INF/,\ lib/httpcore-4.4.4.jar,\ lib/httpmime-4.5.1.jar,\ lib/icu4j-2.6.1.jar,\ - lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\ + lib/identificationKeyAPI-1.0.jar,\ lib/istack-commons-runtime-2.21.jar,\ lib/istack-commons-tools-2.21.jar,\ lib/itextpdf-5.5.8.jar,\ - lib/jackson-annotations-2.6.4.jar,\ - lib/jackson-core-2.6.4.jar,\ + lib/jackson-annotations-2.6.5.jar,\ + lib/jackson-core-2.6.5.jar,\ lib/jackson-core-asl-1.8.8.jar,\ - lib/jackson-databind-2.6.4.jar,\ + lib/jackson-databind-2.6.5.jar,\ lib/jackson-mapper-asl-1.8.8.jar,\ lib/jakarta-regexp-1.4.jar,\ lib/jandex-2.0.0.Final.jar,\ @@ -160,7 +161,7 @@ bin.includes = META-INF/,\ lib/opencsv-2.3.jar,\ lib/org.osgi.core-1.0.0.jar,\ lib/osgi-3.6.0.jar,\ - lib/p6spy-2.1.3.jar,\ + lib/p6spy-2.1.4.jar,\ lib/paranamer-2.3.jar,\ lib/plexus-classworlds-1.2-alpha-9.jar,\ lib/plexus-component-annotations-1.5.5.jar,\ @@ -169,11 +170,11 @@ bin.includes = META-INF/,\ lib/poi-3.13.jar,\ lib/poi-ooxml-3.13.jar,\ lib/poi-ooxml-schemas-3.13.jar,\ - lib/postgresql-9.4-1205-jdbc42.jar,\ + lib/postgresql-9.4-1206-jdbc4.jar,\ lib/relaxngDatatype-20020414.jar,\ lib/rngom-2.2.11.jar,\ lib/sanselan-0.97-incubator.jar,\ - lib/Saxon-HE-9.7.0-1.jar,\ + lib/Saxon-HE-9.7.0-2.jar,\ lib/servlet-api-2.5.jar,\ lib/slf4j-api-1.7.13.jar,\ lib/slf4j-log4j12-1.7.13.jar,\ @@ -212,7 +213,7 @@ bin.includes = META-INF/,\ lib/stax-1.2.0.jar,\ lib/stax-api-1.0.1.jar,\ lib/stax-ex-1.7.7.jar,\ - lib/swagger-annotations-1.5.5.jar,\ + lib/swagger-annotations-1.5.6.jar,\ lib/swagger-models-1.5.5.jar,\ lib/tools.jar,\ lib/txw2-2.2.11.jar,\ @@ -243,8 +244,7 @@ bin.includes = META-INF/,\ lib/xpp3-1.1.4c.jar,\ lib/xsom-20140925.jar,\ lib/xstream-1.4.8.jar,\ - lib/yjp-controller-api-redist-9.0.8.jar,\ - lib/cdmlib-test-3.13.0-SNAPSHOT.jar + lib/yjp-controller-api-redist-9.0.8.jar jars.compile.order = . output.. = bin/ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-2.jar similarity index 77% rename from eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-2.jar index 28045859a..83fc05ab2 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-2.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar deleted file mode 100644 index 26dcea2dd..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.8.jar new file mode 100644 index 000000000..4c6990220 Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.8.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar deleted file mode 100644 index ca1829a58..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.8.jar new file mode 100644 index 000000000..5e5d3ce4c Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.8.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.7.Final.jar similarity index 77% rename from eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.7.Final.jar index f3fedee40..bb6633ee7 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.7.Final.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.7.Final.jar similarity index 85% rename from eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.7.Final.jar index 593d33f57..7265b21f2 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.7.Final.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.7.Final.jar similarity index 69% rename from eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.7.Final.jar index 7f694d00a..a248250f8 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.7.Final.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.7.Final.jar similarity index 81% rename from eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.7.Final.jar index 2e5c7892c..31d1aa4bd 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.7.Final.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.7.Final.jar similarity index 89% rename from eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.7.Final.jar index d533819bf..dd5ed8a51 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.7.Final.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar deleted file mode 100644 index 1955f94e4..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar new file mode 100644 index 000000000..ec253560d Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.5.jar similarity index 72% rename from eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.5.jar index 9efc5bd9b..68b616228 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.5.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar similarity index 92% rename from eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar index 1a31f17c2..5ee8d20cc 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.jar similarity index 88% rename from eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.jar index 5812b4714..feb8bbab9 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.4.jar similarity index 83% rename from eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.4.jar index e15837718..7bf6273e5 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.4.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar deleted file mode 100644 index 0e470f5ea..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1206-jdbc4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1206-jdbc4.jar new file mode 100644 index 000000000..5bae20eeb Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1206-jdbc4.jar differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar similarity index 57% rename from eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar rename to eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar index b1f4405ba..5bea844ad 100644 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar differ