You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/12/07 14:31:46 UTC

[jspwiki] branch master updated (99525df -> b4a9000)

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.


    from 99525df  add --allow-script-in-comments option on javadocs - should fix build now
     new 695faa4  change download urls for launch4j, it is no longer reachable through datapacket.dl
     new b4a9000  update portable binaries so they use jspwiki's tomcat version

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 jspwiki-portable/build.xml                         |   4 ++--
 .../tomcat/woas.app/Contents/Java/bootstrap.jar    | Bin 35109 -> 35165 bytes
 .../tomcat/woas.app/Contents/Java/tomcat-juli.jar  | Bin 49935 -> 49901 bytes
 .../src/overlay/launchers/tomcat/woas.exe          | Bin 3459557 -> 3475006 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)


[jspwiki] 01/02: change download urls for launch4j, it is no longer reachable through datapacket.dl

Posted by ju...@apache.org.
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 695faa4106db01ce737bac921d4d76f76efa98da
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Dec 7 15:29:31 2019 +0100

    change download urls for launch4j, it is no longer reachable through datapacket.dl
---
 jspwiki-portable/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index cd396f4..be9b056 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -216,7 +216,7 @@
     <target name="woas:download-launch4j-for-win" description="Download the Win32 launch4j distribution">
         <delete dir="${jspwiki.launch4j.install.dir}"/>
         <mkdir dir="${jspwiki.launch4j.install.dir}"/>
-        <get src="https://datapacket.dl.sourceforge.net/project/launch4j/launch4j-3/3.12/launch4j-3.12-win32.zip" dest="${jspwiki.launch4j.install.dir}"/>
+        <get src="https://netcologne.dl.sourceforge.net/project/launch4j/launch4j-3/3.12/launch4j-3.12-win32.zip" dest="${jspwiki.launch4j.install.dir}"/>
         <unzip src="${jspwiki.launch4j.install.dir}/launch4j-3.12-win32.zip" dest="${jspwiki.launch4j.install.dir}/.."/>
         <delete file="${jspwiki.launch4j.install.dir}/launch4j-3.12-win32.zip"/>
     </target>
@@ -224,7 +224,7 @@
     <target name="woas:download-launch4j-for-mac" description="Download the Mac OS X launch4j distribution">
         <delete dir="${jspwiki.launch4j.install.dir}"/>
         <mkdir dir="${jspwiki.launch4j.install.dir}"/>
-        <get src="https://datapacket.dl.sourceforge.net/project/launch4j/launch4j-3/3.12/launch4j-3.12-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}"/>
+        <get src="https://netcologne.dl.sourceforge.net/project/launch4j/launch4j-3/3.12/launch4j-3.12-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}"/>
         <untar src="${jspwiki.launch4j.install.dir}/launch4j-3.12-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}/.." compression="gzip"/>
         <delete file="${jspwiki.launch4j.install.dir}/launch4j-3.12-macosx-x86.tgz"/>
         <chmod dir="${jspwiki.launch4j.install.dir}/bin" includes="*" perm="ugo+x"/>


[jspwiki] 02/02: update portable binaries so they use jspwiki's tomcat version

Posted by ju...@apache.org.
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 b4a900093d095295273ed38fa995b3ab84b5765e
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Dec 7 15:31:03 2019 +0100

    update portable binaries so they use jspwiki's tomcat version
---
 .../tomcat/woas.app/Contents/Java/bootstrap.jar    | Bin 35109 -> 35165 bytes
 .../tomcat/woas.app/Contents/Java/tomcat-juli.jar  | Bin 49935 -> 49901 bytes
 .../src/overlay/launchers/tomcat/woas.exe          | Bin 3459557 -> 3475006 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

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 e722aa6..f25d02d 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 509cded..c409af1 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.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index fb7f5e2..75bcdd5 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ