Merge branch '2.1.x'

Closes gh-17194
2019-06-14 15:40:23 +01:00
parent 887e39f2fe 71214e7ef4
commit dfd7499506
1 changed files with 0 additions and 6 deletions
--- a/.bomr/bomr.yaml
+++ b/.bomr/bomr.yaml
@@ -8,12 +8,6 @@ bomr:
        - 'type: dependency-upgrade'
    policy: same-major-version
    prohibited:
-      - project: couchbase-client
-        versions:
-          # Jar contains dependencies' classes resulting in duplicates
-          - '[2.7.3]'
-          # Artifacts published as .bundle files rather than .jar files
-          - '[2.7.5]'
      - project: maven-invoker-plugin
        versions:
          # NPE in InstallMojo.installProjectPom (InstallMojo.java:387)