From 35bcbbffa8f6e063a2f9314d364a26da4964943e Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Thu, 17 Oct 2019 14:23:25 +0200
Subject: [PATCH 1/2] DISPATCH-1363 - Move RAT licence check from travis builds
 into a sub build

---
 .travis.yml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f7d0170e8d..54335c29ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,23 @@ matrix:
   allow_failures:
     - os: osx
   include:
+  - name: "apache-rat:check"
+    os: linux
+    sudo: false
+    env: []
+    language: java
+    addons:
+      apt:
+        packages: []
+    cache:
+      directories:
+        - $HOME/.m2/repository
+      before_cache:
+        - rm -rf $HOME/.m2/repository/org/apache/qpid/*
+    install: []
+    before_script: []
+    script:
+    - mvn apache-rat:check
   # prepending /usr/bin to PATH to avoid mismatched python interpreters in /opt
   - os: linux
     env:
@@ -61,8 +78,6 @@ addons:
     - python2.7-dev
     - sasl2-bin
     - swig
-    # For apache RAT tool
-    - maven
     # documentation
     - asciidoc
     - asciidoctor
@@ -98,15 +113,7 @@ script:
 # Workaround on macOS for PROTON-808 Binaries have their library locations stripped
 - if [[ "${OSTYPE}" == "darwin"* ]]; then install_name_tool -add_rpath $PREFIX/lib/. $PREFIX/lib/proton/bindings/python/_cproton.so; fi
 - ctest -V && if [ "$BUILD_TYPE" = "Coverage" ]; then cmake --build . --target coverage; fi
-- popd
-- mvn apache-rat:check
 
 after_success:
-- pushd build
+- cd ${TRAVIS_BUILD_DIR}/build
 - if [ "$BUILD_TYPE" = "Coverage" ]; then bash <(curl -s https://codecov.io/bash); fi
-
-cache:
-  directories:
-  - $HOME/.m2/repository
-  before_cache:
-  - rm -rf $HOME/.m2/repository/org/apache/qpid/*

From d2930ea264b22bb918dd0f9228841e2b69224d73 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Mon, 21 Oct 2019 16:58:04 +0200
Subject: [PATCH 2/2] NO-JIRA - Fix unittest2 package name in comment

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f4f4c1cb0..edfb3ff1a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,8 +73,8 @@ endif()
 enable_testing()
 
 # python unittest
-# For versions < 2.7 the developer needs to install the python-unittest2
-# module (available via 'pip install python-unittest2'
+# For versions < 2.7 the developer needs to install the unittest2
+# module (available via 'yum install python-unittest2' or 'pip install unittest2'
 #
 if(PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR LESS 7)
   set(PYTHON_TEST_COMMAND "unit2")