From c7f945d93bf8e3c33f4dbb8786c739876dd4b0b4 Mon Sep 17 00:00:00 2001 From: Henrik Nyman Date: Wed, 4 Nov 2015 14:44:05 +0100 Subject: [PATCH] Update Cypher third party library dependencies --- advanced/neo4j-advanced/LICENSES.txt | 1 - advanced/neo4j-advanced/NOTICE.txt | 1 - advanced/server-advanced/LICENSES.txt | 1 - advanced/server-advanced/NOTICE.txt | 1 - community/bolt/LICENSES.txt | 1 - community/bolt/NOTICE.txt | 1 - community/cypher/acceptance/pom.xml | 2 +- community/cypher/compatibility-suite/pom.xml | 6 +++--- community/cypher/cypher/LICENSES.txt | 1 - community/cypher/cypher/NOTICE.txt | 1 - community/cypher/cypher/pom.xml | 7 +------ community/cypher/pom.xml | 8 +------- community/embedded-examples/LICENSES.txt | 1 - community/embedded-examples/NOTICE.txt | 1 - community/neo4j-harness/LICENSES.txt | 1 - community/neo4j-harness/NOTICE.txt | 1 - community/neo4j/LICENSES.txt | 1 - community/neo4j/NOTICE.txt | 1 - community/server/LICENSES.txt | 1 - community/server/NOTICE.txt | 1 - enterprise/enterprise-performance-tests/LICENSES.txt | 1 - enterprise/enterprise-performance-tests/NOTICE.txt | 1 - enterprise/neo4j-enterprise/LICENSES.txt | 1 - enterprise/neo4j-enterprise/NOTICE.txt | 1 - enterprise/server-enterprise/LICENSES.txt | 1 - enterprise/server-enterprise/NOTICE.txt | 1 - manual/cypher/LICENSES.txt | 1 - manual/cypher/NOTICE.txt | 1 - manual/cypher/cypher-docs/LICENSES.txt | 1 - manual/cypher/cypher-docs/NOTICE.txt | 1 - manual/cypher/graphgist/LICENSES.txt | 1 - manual/cypher/graphgist/NOTICE.txt | 1 - manual/manual/LICENSES.txt | 1 - .../src/main/distribution/text/community/LICENSES.txt | 1 - .../src/main/distribution/text/community/NOTICE.txt | 1 - .../src/main/distribution/text/advanced/LICENSES.txt | 1 - .../src/main/distribution/text/advanced/NOTICE.txt | 1 - .../src/main/distribution/text/community/LICENSES.txt | 1 - .../src/main/distribution/text/community/NOTICE.txt | 1 - .../src/main/distribution/text/enterprise/LICENSES.txt | 1 - .../src/main/distribution/text/enterprise/NOTICE.txt | 1 - 41 files changed, 6 insertions(+), 54 deletions(-) diff --git a/advanced/neo4j-advanced/LICENSES.txt b/advanced/neo4j-advanced/LICENSES.txt index 1e6889ca82f62..8ff9fcd3810ec 100644 --- a/advanced/neo4j-advanced/LICENSES.txt +++ b/advanced/neo4j-advanced/LICENSES.txt @@ -260,7 +260,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/advanced/neo4j-advanced/NOTICE.txt b/advanced/neo4j-advanced/NOTICE.txt index 6035f6f0f4058..cda62facd9093 100644 --- a/advanced/neo4j-advanced/NOTICE.txt +++ b/advanced/neo4j-advanced/NOTICE.txt @@ -38,5 +38,4 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators diff --git a/advanced/server-advanced/LICENSES.txt b/advanced/server-advanced/LICENSES.txt index 4df4594899c5e..3d2f0533f40e9 100644 --- a/advanced/server-advanced/LICENSES.txt +++ b/advanced/server-advanced/LICENSES.txt @@ -279,7 +279,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/advanced/server-advanced/NOTICE.txt b/advanced/server-advanced/NOTICE.txt index f2ac0b647ec1f..aa0b5f945c503 100644 --- a/advanced/server-advanced/NOTICE.txt +++ b/advanced/server-advanced/NOTICE.txt @@ -57,7 +57,6 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/community/bolt/LICENSES.txt b/community/bolt/LICENSES.txt index 974c6a8ddaa61..5f824f7a3f75a 100644 --- a/community/bolt/LICENSES.txt +++ b/community/bolt/LICENSES.txt @@ -261,7 +261,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/community/bolt/NOTICE.txt b/community/bolt/NOTICE.txt index 75a3802ded5e3..c20c2a7e75998 100644 --- a/community/bolt/NOTICE.txt +++ b/community/bolt/NOTICE.txt @@ -40,5 +40,4 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators diff --git a/community/cypher/acceptance/pom.xml b/community/cypher/acceptance/pom.xml index 0e2fdc97d3b7d..3b077516e1cf5 100644 --- a/community/cypher/acceptance/pom.xml +++ b/community/cypher/acceptance/pom.xml @@ -219,7 +219,7 @@ com.novus salat-core_2.11 - 1.9.8 + 1.9.9 org.scala-lang diff --git a/community/cypher/compatibility-suite/pom.xml b/community/cypher/compatibility-suite/pom.xml index 0723da4da22cc..804ccebc98c5d 100644 --- a/community/cypher/compatibility-suite/pom.xml +++ b/community/cypher/compatibility-suite/pom.xml @@ -78,12 +78,12 @@ info.cukes cucumber-scala_2.11 - 1.2.2 + 1.2.4 info.cukes cucumber-junit - 1.2.2 + 1.2.4 @@ -206,7 +206,7 @@ com.novus salat-core_2.11 - 1.9.8 + 1.9.9 test diff --git a/community/cypher/cypher/LICENSES.txt b/community/cypher/cypher/LICENSES.txt index 417753a3c06eb..1c03dcbf26a95 100644 --- a/community/cypher/cypher/LICENSES.txt +++ b/community/cypher/cypher/LICENSES.txt @@ -259,7 +259,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/community/cypher/cypher/NOTICE.txt b/community/cypher/cypher/NOTICE.txt index 8566a72ad3902..ecd53e035cc33 100644 --- a/community/cypher/cypher/NOTICE.txt +++ b/community/cypher/cypher/NOTICE.txt @@ -38,5 +38,4 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml index 5ac6c98b45de2..0c477bbaeb9b1 100644 --- a/community/cypher/cypher/pom.xml +++ b/community/cypher/cypher/pom.xml @@ -49,7 +49,7 @@ 2.11 false none - 9.2.4.v20141103 + 9.3.5.v20151012 @@ -89,11 +89,6 @@ ${scala.version} - - scala-parser-combinators_2.11 - org.scala-lang.modules - - diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml index c79c63987b589..73dbce2d598f2 100644 --- a/community/cypher/pom.xml +++ b/community/cypher/pom.xml @@ -250,7 +250,7 @@ org.scalacheck scalacheck_2.11 - 1.12.4 + 1.12.5 test @@ -299,12 +299,6 @@ - - scala-parser-combinators_2.11 - org.scala-lang.modules - 1.0.4 - - org.parboiled parboiled-scala_2.11 diff --git a/community/embedded-examples/LICENSES.txt b/community/embedded-examples/LICENSES.txt index 70279c01fc0cf..6211c5e740b60 100644 --- a/community/embedded-examples/LICENSES.txt +++ b/community/embedded-examples/LICENSES.txt @@ -261,7 +261,6 @@ BSD License ASM Core JLine Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/community/embedded-examples/NOTICE.txt b/community/embedded-examples/NOTICE.txt index d641cd030fec5..ddc179413bcda 100644 --- a/community/embedded-examples/NOTICE.txt +++ b/community/embedded-examples/NOTICE.txt @@ -40,7 +40,6 @@ BSD License ASM Core JLine Scala Compiler - scala-parser-combinators MIT License SLF4J API Module diff --git a/community/neo4j-harness/LICENSES.txt b/community/neo4j-harness/LICENSES.txt index bacfc1d9220f4..abdd20056306c 100644 --- a/community/neo4j-harness/LICENSES.txt +++ b/community/neo4j-harness/LICENSES.txt @@ -280,7 +280,6 @@ BSD License ASM Core JLine Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/community/neo4j-harness/NOTICE.txt b/community/neo4j-harness/NOTICE.txt index 88e2d366d9931..659c8b6421bd3 100644 --- a/community/neo4j-harness/NOTICE.txt +++ b/community/neo4j-harness/NOTICE.txt @@ -59,7 +59,6 @@ BSD License ASM Core JLine Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/community/neo4j/LICENSES.txt b/community/neo4j/LICENSES.txt index 1e6889ca82f62..8ff9fcd3810ec 100644 --- a/community/neo4j/LICENSES.txt +++ b/community/neo4j/LICENSES.txt @@ -260,7 +260,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/community/neo4j/NOTICE.txt b/community/neo4j/NOTICE.txt index e893f6231200c..73b0380e0a570 100644 --- a/community/neo4j/NOTICE.txt +++ b/community/neo4j/NOTICE.txt @@ -39,5 +39,4 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators diff --git a/community/server/LICENSES.txt b/community/server/LICENSES.txt index 145d0d68bb384..b0a6a6b863460 100644 --- a/community/server/LICENSES.txt +++ b/community/server/LICENSES.txt @@ -280,7 +280,6 @@ BSD License ASM Core JLine Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/community/server/NOTICE.txt b/community/server/NOTICE.txt index 0e5351d0a6604..2d882c10c4aa0 100644 --- a/community/server/NOTICE.txt +++ b/community/server/NOTICE.txt @@ -59,7 +59,6 @@ BSD License ASM Core JLine Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/enterprise/enterprise-performance-tests/LICENSES.txt b/enterprise/enterprise-performance-tests/LICENSES.txt index 5397dbdf87658..e2cb167466af3 100644 --- a/enterprise/enterprise-performance-tests/LICENSES.txt +++ b/enterprise/enterprise-performance-tests/LICENSES.txt @@ -265,7 +265,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/enterprise/enterprise-performance-tests/NOTICE.txt b/enterprise/enterprise-performance-tests/NOTICE.txt index 4b313a9711e64..30d46806e317c 100644 --- a/enterprise/enterprise-performance-tests/NOTICE.txt +++ b/enterprise/enterprise-performance-tests/NOTICE.txt @@ -43,7 +43,6 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators GNU Lesser General Public License, Version 2.1 Remote Tea Runtime diff --git a/enterprise/neo4j-enterprise/LICENSES.txt b/enterprise/neo4j-enterprise/LICENSES.txt index 56b2f1245af13..5f7f65512a1ef 100644 --- a/enterprise/neo4j-enterprise/LICENSES.txt +++ b/enterprise/neo4j-enterprise/LICENSES.txt @@ -264,7 +264,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/enterprise/neo4j-enterprise/NOTICE.txt b/enterprise/neo4j-enterprise/NOTICE.txt index 5cb968bc4de30..7c62dec16f0de 100644 --- a/enterprise/neo4j-enterprise/NOTICE.txt +++ b/enterprise/neo4j-enterprise/NOTICE.txt @@ -42,7 +42,6 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators GNU Lesser General Public License, Version 2.1 Remote Tea Runtime diff --git a/enterprise/server-enterprise/LICENSES.txt b/enterprise/server-enterprise/LICENSES.txt index b0e2c251be8aa..74b9100e306e2 100644 --- a/enterprise/server-enterprise/LICENSES.txt +++ b/enterprise/server-enterprise/LICENSES.txt @@ -283,7 +283,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/enterprise/server-enterprise/NOTICE.txt b/enterprise/server-enterprise/NOTICE.txt index 989c060519d08..cf255a4844817 100644 --- a/enterprise/server-enterprise/NOTICE.txt +++ b/enterprise/server-enterprise/NOTICE.txt @@ -61,7 +61,6 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/manual/cypher/LICENSES.txt b/manual/cypher/LICENSES.txt index 7b4210342abf3..9ca765b5b1555 100644 --- a/manual/cypher/LICENSES.txt +++ b/manual/cypher/LICENSES.txt @@ -263,7 +263,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/manual/cypher/NOTICE.txt b/manual/cypher/NOTICE.txt index 8ebaacd2bcff2..a31e065bf28c3 100644 --- a/manual/cypher/NOTICE.txt +++ b/manual/cypher/NOTICE.txt @@ -42,7 +42,6 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators HSQLDB License, a BSD open source license HyperSQL Database diff --git a/manual/cypher/cypher-docs/LICENSES.txt b/manual/cypher/cypher-docs/LICENSES.txt index 1e6889ca82f62..8ff9fcd3810ec 100644 --- a/manual/cypher/cypher-docs/LICENSES.txt +++ b/manual/cypher/cypher-docs/LICENSES.txt @@ -260,7 +260,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/manual/cypher/cypher-docs/NOTICE.txt b/manual/cypher/cypher-docs/NOTICE.txt index e893f6231200c..73b0380e0a570 100644 --- a/manual/cypher/cypher-docs/NOTICE.txt +++ b/manual/cypher/cypher-docs/NOTICE.txt @@ -39,5 +39,4 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators diff --git a/manual/cypher/graphgist/LICENSES.txt b/manual/cypher/graphgist/LICENSES.txt index 7b4210342abf3..9ca765b5b1555 100644 --- a/manual/cypher/graphgist/LICENSES.txt +++ b/manual/cypher/graphgist/LICENSES.txt @@ -263,7 +263,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/manual/cypher/graphgist/NOTICE.txt b/manual/cypher/graphgist/NOTICE.txt index 8ebaacd2bcff2..a31e065bf28c3 100644 --- a/manual/cypher/graphgist/NOTICE.txt +++ b/manual/cypher/graphgist/NOTICE.txt @@ -42,7 +42,6 @@ BSD - Scala License BSD License ASM Core Scala Compiler - scala-parser-combinators HSQLDB License, a BSD open source license HyperSQL Database diff --git a/manual/manual/LICENSES.txt b/manual/manual/LICENSES.txt index 7b4210342abf3..9ca765b5b1555 100644 --- a/manual/manual/LICENSES.txt +++ b/manual/manual/LICENSES.txt @@ -263,7 +263,6 @@ SUCH DAMAGE. BSD License ASM Core Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt b/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt index 0f062ba385f19..20165a68cddd8 100644 --- a/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt +++ b/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt @@ -321,7 +321,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt b/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt index 359fa304df9ed..032ee01cbd6da 100644 --- a/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt +++ b/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt @@ -67,7 +67,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/LICENSES.txt b/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/LICENSES.txt index 724394382b7d8..45419ace29d64 100644 --- a/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/LICENSES.txt +++ b/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/LICENSES.txt @@ -321,7 +321,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/NOTICE.txt b/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/NOTICE.txt index b608c84126b6f..d66fe03fe112e 100644 --- a/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/NOTICE.txt +++ b/packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/NOTICE.txt @@ -66,7 +66,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt b/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt index 724394382b7d8..45419ace29d64 100644 --- a/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt +++ b/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt @@ -321,7 +321,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt b/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt index 129d16d58d8cc..cd52cd6bc90f6 100644 --- a/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt +++ b/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt @@ -67,7 +67,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs diff --git a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt index d05f0b08985a3..2a78d878c9abf 100644 --- a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt +++ b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt @@ -325,7 +325,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators ------------------------------------------------------------------------------ Copyright (c) , diff --git a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt index 118a01554a9bb..168c819ff567a 100644 --- a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt +++ b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt @@ -70,7 +70,6 @@ BSD License JLine JQuery Easing Plugin Scala Compiler - scala-parser-combinators Bouncy Castle License Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs