SEARCH-2928 Updating yourkit location (#1194)

* SEARCH-2928 Updating yourkit location

* SEARCH-2928 Updating yourkit location

* SEARCH 2928 updating Yourkit URL version to 2021.3

* SEARCH-2928 changing version of yourkit

* SEARCH-2928 Use license from YourKit archive, rather than supplying a copy that may get out of date.

This also means we're no longer supplying the YourKit license in the zip, which seems right given it isn't included.

Co-authored-by: Tom Page <thomas.page@alfresco.com>

search-services/packaging/src/docker/Dockerfile

@@ -15,7 +15,7 @@ ARG USERNAME=solr
 ARG USERID=33007
 
 # YourKit Java Profiler
-ARG JAVA_PROFILER=YourKit-JavaProfiler-2019.8-docker
+ARG JAVA_PROFILER=YourKit-JavaProfiler-2019.8-b142-docker
 
 COPY "$SOLR_ZIP" .
 
@@ -62,9 +62,10 @@ EXPOSE 8983
 #    "
 #    ports:
 #        - 10001:10001
-RUN wget https://www.yourkit.com/download/docker/${JAVA_PROFILER}.zip -P /tmp/ && \
+RUN wget https://download.yourkit.com/yjp/2019.8/${JAVA_PROFILER}.zip -P /tmp/ && \
   unzip /tmp/${JAVA_PROFILER}.zip -d /usr/local && \
-  rm /tmp/${JAVA_PROFILER}.zip
+  rm /tmp/${JAVA_PROFILER}.zip && \
+  cp /usr/local/YourKit-JavaProfiler*/license-redist.txt /licenses/3rd-party/YourKit-license-redist.txt
 
 # YourKit Profiling Port
 EXPOSE 10001

search-services/packaging/src/main/resources/licenses/3rd-party/YourKit-license-redist.txt

@@ -1,36 +0,0 @@
-The following files can be redistributed under the license below:
-
-yjpagent.dll
-libyjpagent.so
-libyjpagent.jnilib
-yjp-controller-api-redist.jar
-
--------------------------------------------------------------------
-
-Copyright (c) 2003-2020, YourKit
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-* Neither the name of YourKit nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY YOURKIT "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL YOURKIT BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.