diff options
13 files changed, 40 insertions, 28 deletions
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 @@ <unpack>false</unpack> <scope>provided</scope> </dependencySet> - <!-- Java Service Wrapper --> - <dependencySet> - <outputDirectory>bin</outputDirectory> - <includes> - <include>org.sonatype.jsw-binaries:jsw-binaries</include> - </includes> - <unpack>true</unpack> - <scope>provided</scope> - <unpackOptions> - <excludes> - <exclude>**/app</exclude> - <exclude>**/*.bat</exclude> - <exclude>**/sample*/**</exclude> - <exclude>**/macosx-universal-32/**</exclude> - <exclude>**/solaris*/**</exclude> - <!-- SONAR-6110 - Drop support files for Linux PPC 64 --> - <exclude>**/linux-ppc-64/**</exclude> - </excludes> - </unpackOptions> - <fileMode>0755</fileMode> - </dependencySet> </dependencySets> <fileSets> + <!-- wrapper binaries --> + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>bin/*/lib/*.so</include> + <include>bin/*/lib/*.jnilib</include> + <include>bin/*/lib/*.dll</include> + <include>bin/*/wrapper</include> + <include>bin/*/wrapper.exe</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> <!-- Configuration Files --> <fileSet> <directory>src/main/assembly</directory> 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 @@ -122,13 +122,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.sonatype.jsw-binaries</groupId> - <artifactId>jsw-binaries</artifactId> - <version>3.2.3.6</version> - <type>tar.gz</type> - <scope>provided</scope> - </dependency> - <dependency> <!-- do not upgrade because of licensing change --> <groupId>tanukisoft</groupId> <artifactId>wrapper</artifactId> 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 Binary files differnew file mode 100755 index 00000000000..2cc4ab3cebe --- /dev/null +++ b/sonar-application/src/main/assembly/bin/linux-x86-32/lib/libwrapper.so diff --git a/sonar-application/src/main/assembly/bin/linux-x86-32/wrapper b/sonar-application/src/main/assembly/bin/linux-x86-32/wrapper Binary files differnew file mode 100755 index 00000000000..7e0064596e2 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/linux-x86-32/wrapper 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 Binary files differnew file mode 100755 index 00000000000..24197bf6e20 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/linux-x86-64/lib/libwrapper.so diff --git a/sonar-application/src/main/assembly/bin/linux-x86-64/wrapper b/sonar-application/src/main/assembly/bin/linux-x86-64/wrapper Binary files differnew file mode 100755 index 00000000000..3128b95b491 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/linux-x86-64/wrapper 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 Binary files differnew file mode 100755 index 00000000000..6a1a7679c39 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/macosx-universal-64/lib/libwrapper.jnilib diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper b/sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper Binary files differnew file mode 100755 index 00000000000..a82f50d0396 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/macosx-universal-64/wrapper 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 Binary files differnew file mode 100755 index 00000000000..cb553c12340 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/windows-x86-32/lib/wrapper.dll 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 Binary files differnew file mode 100755 index 00000000000..b4cfc557c06 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/windows-x86-32/wrapper.exe 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 Binary files differnew file mode 100755 index 00000000000..f07fc9e582b --- /dev/null +++ b/sonar-application/src/main/assembly/bin/windows-x86-64/lib/wrapper.dll 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 Binary files differnew file mode 100755 index 00000000000..db2dddae8c4 --- /dev/null +++ b/sonar-application/src/main/assembly/bin/windows-x86-64/wrapper.exe |