From 1511b9d96b1690428bd794d13209183e56e26f15 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 17 Nov 2016 20:49:06 +0100 Subject: SONAR-7959 Remove ppc64 arch from wrapper --- sonar-application/assembly.xml | 34 ++++++++------------- sonar-application/pom.xml | 7 ----- .../src/main/assembly/bin/jsw-license/LICENSE.txt | 27 ++++++++++++++++ .../assembly/bin/linux-x86-32/lib/libwrapper.so | Bin 0 -> 11887 bytes .../src/main/assembly/bin/linux-x86-32/wrapper | Bin 0 -> 99401 bytes .../assembly/bin/linux-x86-64/lib/libwrapper.so | Bin 0 -> 15248 bytes .../src/main/assembly/bin/linux-x86-64/wrapper | Bin 0 -> 111027 bytes .../bin/macosx-universal-64/lib/libwrapper.jnilib | Bin 0 -> 14488 bytes .../main/assembly/bin/macosx-universal-64/wrapper | Bin 0 -> 126456 bytes .../assembly/bin/windows-x86-32/lib/wrapper.dll | Bin 0 -> 81920 bytes .../main/assembly/bin/windows-x86-32/wrapper.exe | Bin 0 -> 204800 bytes .../assembly/bin/windows-x86-64/lib/wrapper.dll | Bin 0 -> 76800 bytes .../main/assembly/bin/windows-x86-64/wrapper.exe | Bin 0 -> 220672 bytes 13 files changed, 40 insertions(+), 28 deletions(-) create mode 100755 sonar-application/src/main/assembly/bin/jsw-license/LICENSE.txt create mode 100755 sonar-application/src/main/assembly/bin/linux-x86-32/lib/libwrapper.so create mode 100755 sonar-application/src/main/assembly/bin/linux-x86-32/wrapper create mode 100755 sonar-application/src/main/assembly/bin/linux-x86-64/lib/libwrapper.so create mode 100755 sonar-application/src/main/assembly/bin/linux-x86-64/wrapper create mode 100755 sonar-application/src/main/assembly/bin/macosx-universal-64/lib/libwrapper.jnilib create mode 100755 sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper create mode 100755 sonar-application/src/main/assembly/bin/windows-x86-32/lib/wrapper.dll create mode 100755 sonar-application/src/main/assembly/bin/windows-x86-32/wrapper.exe create mode 100755 sonar-application/src/main/assembly/bin/windows-x86-64/lib/wrapper.dll create mode 100755 sonar-application/src/main/assembly/bin/windows-x86-64/wrapper.exe (limited to 'sonar-application') diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index a860949142d..e4f951c2858 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -132,30 +132,22 @@ false provided - - - bin - - org.sonatype.jsw-binaries:jsw-binaries - - true - provided - - - **/app - **/*.bat - **/sample*/** - **/macosx-universal-32/** - **/solaris*/** - - **/linux-ppc-64/** - - - 0755 - + + + src/main/assembly + / + + bin/*/lib/*.so + bin/*/lib/*.jnilib + bin/*/lib/*.dll + bin/*/wrapper + bin/*/wrapper.exe + + 0755 + src/main/assembly diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index c5f6fe98360..d050696f4d7 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -121,13 +121,6 @@ sonar-plugin provided - - org.sonatype.jsw-binaries - jsw-binaries - 3.2.3.6 - tar.gz - provided - tanukisoft diff --git a/sonar-application/src/main/assembly/bin/jsw-license/LICENSE.txt b/sonar-application/src/main/assembly/bin/jsw-license/LICENSE.txt new file mode 100755 index 00000000000..9cd452732c0 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/jsw-license/LICENSE.txt @@ -0,0 +1,27 @@ +This bundle contains Java Service Wrapper scripts and binaries version 3.2.3 from Tanukisoftware published +under the following license: + + Copyright (c) 2001 Silver Egg Technology + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sub-license, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + http://web.archive.org/web/20070622164715/wrapper.tanukisoftware.org/doc/english/license.html diff --git a/sonar-application/src/main/assembly/bin/linux-x86-32/lib/libwrapper.so b/sonar-application/src/main/assembly/bin/linux-x86-32/lib/libwrapper.so new file mode 100755 index 00000000000..2cc4ab3cebe Binary files /dev/null and b/sonar-application/src/main/assembly/bin/linux-x86-32/lib/libwrapper.so differ diff --git a/sonar-application/src/main/assembly/bin/linux-x86-32/wrapper b/sonar-application/src/main/assembly/bin/linux-x86-32/wrapper new file mode 100755 index 00000000000..7e0064596e2 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/linux-x86-32/wrapper differ diff --git a/sonar-application/src/main/assembly/bin/linux-x86-64/lib/libwrapper.so b/sonar-application/src/main/assembly/bin/linux-x86-64/lib/libwrapper.so new file mode 100755 index 00000000000..24197bf6e20 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/linux-x86-64/lib/libwrapper.so differ diff --git a/sonar-application/src/main/assembly/bin/linux-x86-64/wrapper b/sonar-application/src/main/assembly/bin/linux-x86-64/wrapper new file mode 100755 index 00000000000..3128b95b491 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/linux-x86-64/wrapper differ diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/lib/libwrapper.jnilib b/sonar-application/src/main/assembly/bin/macosx-universal-64/lib/libwrapper.jnilib new file mode 100755 index 00000000000..6a1a7679c39 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/macosx-universal-64/lib/libwrapper.jnilib differ diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper b/sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper new file mode 100755 index 00000000000..a82f50d0396 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper differ diff --git a/sonar-application/src/main/assembly/bin/windows-x86-32/lib/wrapper.dll b/sonar-application/src/main/assembly/bin/windows-x86-32/lib/wrapper.dll new file mode 100755 index 00000000000..cb553c12340 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/windows-x86-32/lib/wrapper.dll differ diff --git a/sonar-application/src/main/assembly/bin/windows-x86-32/wrapper.exe b/sonar-application/src/main/assembly/bin/windows-x86-32/wrapper.exe new file mode 100755 index 00000000000..b4cfc557c06 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/windows-x86-32/wrapper.exe differ diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/lib/wrapper.dll b/sonar-application/src/main/assembly/bin/windows-x86-64/lib/wrapper.dll new file mode 100755 index 00000000000..f07fc9e582b Binary files /dev/null and b/sonar-application/src/main/assembly/bin/windows-x86-64/lib/wrapper.dll differ diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/wrapper.exe b/sonar-application/src/main/assembly/bin/windows-x86-64/wrapper.exe new file mode 100755 index 00000000000..db2dddae8c4 Binary files /dev/null and b/sonar-application/src/main/assembly/bin/windows-x86-64/wrapper.exe differ -- cgit v1.2.3