This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 7c0c02f6bfa466cb05adf1e47e8aaed1a39b0d13 Author: juanpablo <[email protected]> AuthorDate: Sun Sep 30 01:55:18 2018 +0200 switch to servlet 3.1 - jsp 2.3 - updating portable build (VI): recreate and update MacOs launcher with tomcat 8.5 libraries --- .../launchers/tomcat/woas.app/Contents/Info.plist | 42 ++++++++++----------- .../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 28710 -> 34990 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 38712 -> 49336 bytes .../tomcat/woas.app/Contents/MacOS/JavaAppLauncher | Bin 18604 -> 101900 bytes .../tomcat/woas.app/Contents/Resources/.none | 1 + 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist index 00e2669..0a9a284 100644 --- a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist +++ b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist @@ -1,22 +1,4 @@ <?xml version="1.0" ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";> <plist version="1.0"> <dict> @@ -37,17 +19,32 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> -<string>2.10.1-SNAPSHOT</string> +<string>2.11.0</string> +<key>CFBundleVersion</key> +<string>1.0</string> <key>CFBundleSignature</key> <string>????</string> -<key>CFBundleVersion</key> -<string>1</string> <key>NSHumanReadableCopyright</key> <string>Apache Software Licence 2.0</string> <key>LSApplicationCategoryType</key> <string>public.app-category.developer-tools</string> +<key>NSHighResolutionCapable</key> +<true/> +<key>NSSupportsAutomaticGraphicsSwitching</key> +<true/> <key>JVMMainClassName</key> <string>org.apache.catalina.startup.Bootstrap</string> +<key>CFBundleDocumentTypes</key> +<array> +</array> +<key>LSArchitecturePriority</key> +<array> +</array> +<key>LSEnvironment</key> +<dict> +<key>LC_CTYPE</key> +<string>UTF-8</string> +</dict> <key>JVMOptions</key> <array> <string>-Xmx96m</string> @@ -56,6 +53,9 @@ <string>-Dcatalina.base=$APP_ROOT/..</string> <string>-Djava.io.tmpdir=$APP_ROOT/../temp</string> </array> +<key>JVMDefaultOptions</key> +<dict> +</dict> <key>JVMArguments</key> <array> </array> diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar index 098a0ad..8c32be6 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar index 5976a53..d04d917 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher index 7bddebe..363f9de 100755 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/MacOS/JavaAppLauncher differ diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/.none b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/.none new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/.none @@ -0,0 +1 @@ +
