Author: pierre
Date: Fri Jan 18 13:10:31 2019
New Revision: 20994

Log:
Archive maven, archive junit, update to ant-1.10.5

Added:
   trunk/BOOK/archive/junit.xml
      - copied unchanged from r20993, trunk/BOOK/general/prog/junit.xml
   trunk/BOOK/archive/maven.xml
      - copied unchanged from r20993, trunk/BOOK/general/prog/maven.xml
Deleted:
   trunk/BOOK/general/prog/junit.xml
   trunk/BOOK/general/prog/maven.xml
Modified:
   trunk/BOOK/general/prog/apache-ant.xml
   trunk/BOOK/general/prog/prog.xml
   trunk/BOOK/general/prog/subversion.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/pst/ps/fop.xml
   trunk/BOOK/xsoft/office/libreoffice.xml

Copied: trunk/BOOK/archive/junit.xml (from r20993, 
trunk/BOOK/general/prog/junit.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/BOOK/archive/junit.xml        Fri Jan 18 13:10:31 2019        
(r20994, copy of r20993, trunk/BOOK/general/prog/junit.xml)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY junit-download-http 
"https://github.com/junit-team/junit&junit-major;/archive/r&junit-version;/junit&junit-major;-r&junit-version;.tar.gz";>
+  <!ENTITY junit-download-ftp  " ">
+  <!ENTITY junit-md5sum        "22578a9b35cbb71d556a2e625c576c81">
+  <!ENTITY junit-size          "433 KB">
+  <!ENTITY junit-buildsize     "27 MB">
+  <!ENTITY junit-time          "0.2 SBU (with documentation, using 4 cores; 
add maven <quote>artifacts</quote> download time)">
+]>
+
+<sect1 id="junit" xreflabel="JUnit-&junit-version;">
+  <?dbhtml filename="junit.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>JUnit-&junit-version;</title>
+
+  <indexterm zone="junit">
+    <primary sortas="a-JUnit">JUnit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JUnit</title>
+
+    <para>
+      The <application>JUnit</application> package contains a simple, open
+      source framework to write and run repeatable tests. It is an instance of
+      the xUnit architecture for unit testing frameworks. JUnit features 
include
+      assertions for testing expected results, test fixtures for sharing common
+      test data, and test runners for running tests.
+    </para>
+
+    &lfs83_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&junit-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&junit-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &junit-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &junit-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &junit-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &junit-time;</para>
+      </listitem>
+    </itemizedlist>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch: <ulink
+             
url="&patch-root;/junit&junit-major;-r&junit-version;-simplify_NoExitSecurityManager-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="maven"/> and
+      <xref linkend="unzip"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/junit"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JUnit</title>
+    <para>
+      First remove a test, which fails with <application>Java 10</application>.
+    </para>
+
+<screen><userinput>sed -e '/MethodsSorted/i    @Ignore' \
+    -i 
src/test/java/org/junit/runners/model/TestClassTest.java</userinput></screen>
+
+    <para>
+      Replace deprecated SecurityManager code:
+    </para>
+
+<screen><userinput>patch -Np1 -i 
../junit4-r&junit-version;-simplify_NoExitSecurityManager-1.patch</userinput></screen>
+
+    <para>
+      Install <application>Junit</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mvn -DjdkVersion=1.6 install</userinput></screen>
+
+    <para>
+      The tests are run as part of the command above.
+    </para>
+
+    <para>
+      If you wish to generate the documentation, issue:
+    </para>
+
+<screen><userinput>mvn site</userinput></screen>
+
+    <para>
+      Install the files in the final location as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 -d             
/usr/share/java/junit-&junit-version; &amp;&amp;
+cp -v target/junit-&junit-version;.jar     
/usr/share/java/junit-&junit-version; &amp;&amp;
+cp -v lib/hamcrest-core-1.3.jar 
/usr/share/java/junit-&junit-version;</userinput></screen>
+
+    <para>
+      if the documentation was built, install it as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+<screen role="root"><userinput>install -v -m755 -d    
/usr/share/doc/junit-&junit-version; &amp;&amp;
+cp -v -R target/site/* 
/usr/share/doc/junit-&junit-version;</userinput></screen>
+
+
+    <para>
+      If you have followed the instructions in <xref linkend="ojdk-conf"/>,
+      there is nothing more to do: the <envar>CLASSPATH</envar> variable
+      would be automatically updated.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>hamcrest-core and junit jar files</seg>
+        <seg>/usr/share/doc/junit-&junit-version; and
+             /usr/share/java/junit-&junit-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="junit.jar">
+        <term><filename 
class='libraryfile'>junit-&junit-version;.jar</filename></term>
+        <listitem>
+          <para>contains java classes to support the xUnit framework testing
+          architecture.</para>
+          <indexterm zone="junit junit.jar">
+            <primary sortas="c-junit.jar">junit-&junit-version;.jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hamcrest-core">
+        <term><filename 
class='libraryfile'>hamcrest-core-1.3.jar</filename></term>
+        <listitem>
+          <para>contains java classes to support matchers used in xUnit
+          tests.</para>
+          <indexterm zone="junit hamcrest-core">
+            <primary sortas="c-hamcrest-core">hamcrest-core-1.3.jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: trunk/BOOK/archive/maven.xml (from r20993, 
trunk/BOOK/general/prog/maven.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/BOOK/archive/maven.xml        Fri Jan 18 13:10:31 2019        
(r20994, copy of r20993, trunk/BOOK/general/prog/maven.xml)
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY maven-download-http 
"https://archive.apache.org/dist/maven/maven-3/&maven-version;/source/apache-maven-&maven-version;-src.tar.gz";>
+  <!ENTITY maven-download-ftp  " ">
+  <!ENTITY maven-md5sum        "a4346b6cb557266677dc9541526e2548">
+  <!ENTITY maven-size          "2.6 MB">
+  <!ENTITY maven-buildsize     "92 MB">
+  <!ENTITY maven-time          "0.4 SBU">
+
+  <!ENTITY maven-binary-http 
"https://archive.apache.org/dist/maven/maven-3/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz";>
+]>
+
+<sect1 id="maven" xreflabel="Apache-Maven-&maven-version;">
+  <?dbhtml filename="maven.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: pierre $</othername>
+    <date>$Date: 2017-09-11 12:14:03 +0200 (lun. 11 sept. 2017) $</date>
+  </sect1info>
+
+  <title>Apache-Maven-&maven-version;</title>
+
+  <indexterm zone="maven">
+    <primary sortas="a-apache-maven">Apache-Maven</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Apache-Maven</title>
+
+    <para>
+      <application>Apache-Maven</application> is a tool that can be used for
+      building and managing any Java-based project. Based on the concept of a
+      project object model (POM), <application>Apache-Maven</application> can
+      manage a project's build, reporting and documentation from a central
+      piece of information.
+    </para>
+
+    &lfs83_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&maven-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&maven-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &maven-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &maven-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &maven-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &maven-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          <application>Appache-Maven</application> needs to be built with
+          itself, so a binary is needed:
+          <ulink url="&maven-binary-http;"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+
+    <bridgehead renderas="sect3">Apache-Maven Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      A JDK (<xref linkend="java-bin"/> or <xref linkend="openjdk"/>)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/ApacheMaven"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Apache-Maven</title>
+
+    <para>
+      First fix two issues which prevent building with Java 10:
+    </para>
+
+<screen><userinput>sed -e '/-surefire-/a&lt;version&gt;2.21.0&lt;/version&gt;' 
\
+    -e '/&lt;commonsLang/s/3\.5/3.7/'              \
+    -i pom.xml</userinput></screen>
+
+    <para>
+      Install <application>Apache-Maven</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>install -vdm 755 ../apache-maven-bin     &amp;&amp;
+tar -xf ../apache-maven-&maven-version;-bin.tar.gz \
+    --strip-components=1                 \
+    --directory ../apache-maven-bin      &amp;&amp;
+
+SAVEPATH=$PATH   &amp;&amp;
+PATH=../apache-maven-bin/bin:$PATH &amp;&amp;
+
+mvn -DdistributionTargetDir=build \
+    package</userinput></screen>
+
+    <para>
+      The test are run as part of the compilation above.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -vdm 755            
/opt/maven-&maven-version; &amp;&amp;
+cp -Rv apache-maven/build/* /opt/maven-&maven-version; &amp;&amp;
+ln -sfvn maven-&maven-version; /opt/maven</userinput></screen>
+
+    <para>
+      You can know reset the <envar>PATH</envar> variable and clean
+      the source directory:
+    </para>
+
+<screen><userinput>PATH=$SAVEPATH &amp;&amp;
+rm -rf ../apache-maven-bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>tar ../apache-maven-&maven-version;-bin.tar.gz ...
+               PATH=.../bin:$PATH</command>: Extracts the
+      <application>Apache-Maven</application> binary and let the system know
+      about the binary location.
+    </para>
+
+    <para>
+      <command>mvn ... package</command>: Compiles and tests the package, and
+      packages it to its final format.
+    </para>
+
+    <para>
+      <parameter>-DdistributionTargetDir=build</parameter>: Specifies
+      the location where the built binary should be packaged. The content of
+      this directory is ready to be copied to its final location.
+    </para>
+
+    <para>
+      <command>ln -sfvn maven-&maven-version; /opt/maven</command>: Creates
+      a convenience symlink.
+    </para>
+
+    <para>
+      <option>-Dmaven.repo.local=...</option>: Specifies a maven local
+      repository for this build, instead of the default <filename
+      class="directory">~/.m2/repository</filename>. You may want to use this
+      if several users are to use <application>Apache-Maven</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Apache-Maven</title>
+
+    <sect3 id="maven-config">
+      <title>Config Files</title>
+      <para>
+        The user settings file <filename>~/.m2/settings.xml</filename> and
+        the global settings file
+        <filename>/opt/maven/conf/settings.xml</filename>
+      </para>
+
+      <indexterm zone="maven maven-config">
+        <primary sortas="e-AA.m2-settings.xml">~/.m2-settings.xml</primary>
+      </indexterm>
+
+      <indexterm zone="maven maven-config">
+        <primary
+        
sortas="e-opt-maven-conf-settings.xml">/opt/maven/conf/settings.xml</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3><title>Configuration Information</title>
+
+      <para>
+        The default configuration file shipped with
+        <application>Apache-Maven</application> should be sufficent for
+        common tasks. You may want to copy the global settings file to
+        your user one and modify it to suit your needs.
+      </para>
+
+      <para>
+        You should add the <command>mvn</command> command to
+        <envar>PATH</envar>. For example:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/maven.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/maven.sh
+
+pathappend /opt/maven/bin
+
+# End /etc/profile.d/maven.sh</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          mvn, mvnDebug, and mvnyjp
+        </seg>
+        <seg>
+          libjansi.so in <filename
+          class="directory">/opt/maven/lib/jansi-native</filename>
+        </seg>
+        <seg>
+          /opt/maven-&maven-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mvn">
+        <term><command>mvn</command></term>
+        <listitem>
+          <para>
+            is the <application>Apache-Maven</application> Java-based project
+            builder and manager
+          </para>
+          <indexterm zone="maven mvn">
+            <primary sortas="b-mvn">mvn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mvnDebug">
+        <term><command>mvnDebug</command></term>
+        <listitem>
+          <para>
+            turns on <command>mvn</command> debug mode
+          </para>
+          <indexterm zone="maven mvnDebug">
+            <primary sortas="b-mvnDebug">mvnDebug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mvnyjp">
+        <term><command>mvnyjp</command></term>
+        <listitem>
+          <para>
+            runs <command>mvn</command>under the supervision of the
+            <ulink url="https://www.yourkit.com/java/profiler/";>YourKit Java
+            Profiler</ulink>
+          </para>
+          <indexterm zone="maven mvnyjp">
+            <primary sortas="b-mvnyjp">mvnyjp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </sect2>
+</sect1>

Modified: trunk/BOOK/general/prog/apache-ant.xml
==============================================================================
--- trunk/BOOK/general/prog/apache-ant.xml      Fri Jan 18 12:36:19 2019        
(r20993)
+++ trunk/BOOK/general/prog/apache-ant.xml      Fri Jan 18 13:10:31 2019        
(r20994)
@@ -6,10 +6,10 @@
 
   <!ENTITY apache-ant-download-http 
"https://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.xz";>
   <!ENTITY apache-ant-download-ftp  " ">
-  <!ENTITY apache-ant-md5sum        "a8297467f7d13873897ff4418ff1e932">
+  <!ENTITY apache-ant-md5sum        "0e52ab84fdfae1c3a675d2746409a52c">
   <!ENTITY apache-ant-size          "4.0 MB">
-  <!ENTITY apache-ant-buildsize     "264 MB">
-  <!ENTITY apache-ant-time          "0.2 SBU (excluding download time)">
+  <!ENTITY apache-ant-buildsize     "186 MB">
+  <!ENTITY apache-ant-time          "0.4 SBU (excluding download time)">
 ]>
 
 <sect1 id="apache-ant" xreflabel="apache-ant-&apache-ant-version;">
@@ -111,17 +111,15 @@
 
   <sect2 role="installation">
     <title>Installation of Apache Ant</title>
-<!--
-    <note><para>Several dependent packages have moved since the packaging of
-    <application>Ant</application> requiring download of the above extra files.
-    Copy those files into the source tree with the following
-    commands:</para></note>
-
-<screen><userinput>cp -v ../jai-core-1.1.3.jar  \
-      ../jai-codec-1.1.3.jar \
-      ../xz-1.0.jar  lib     &amp;&amp;
-unzip -p ../NetRexx-3.06-GA.zip lib/NetRexxC.jar > 
lib/NetRexxC.jar</userinput></screen>
--->
+
+    <para>
+      First fix an incompatibility issue between the documentation standard
+      used in the build tree, and the one expected by <xref
+      linkend="openjdk"/>:
+    </para>
+
+<screen><userinput>sed -i 's/--add-modules java.activation/-html4/' 
build.xml</userinput></screen>
+
     <para>
       Build a limited bootstrap version of <application>Apache
       Ant</application> using the following command:
@@ -134,8 +132,7 @@
       <filename>fetch.xml</filename> ant build script:
     </para>
 
-<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=system &amp;&amp;
-cp -v lib/*.jar lib/optional/</userinput></screen>
+<screen><userinput>bootstrap/bin/ant -f fetch.xml 
-Ddest=optional</userinput></screen>
 
     <para>
       Build <application>Apache Ant</application> by running the following
@@ -158,15 +155,10 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>bootstrap/bin/ant -f fetch.xml -Ddest=system</command>:
+      <command>bootstrap/bin/ant -f fetch.xml -Ddest=optional</command>:
       Downloads the missing dependencies to user's home directory, and copy
-      them into the source tree (in the <filename>lib/</filename> directory).
-    </para>
-
-    <para>
-      <command>cp -v ... lib/optional</command>: This command copies the
-      previously downloaded jar files to the expected place in the source
-      tree so that <command>ant</command> picks them up at buld time.
+      them into the source tree (in the <filename>lib/optional</filename>
+      directory, where <command>ant</command> picks them up at build time).
     </para>
 
     <para>

Modified: trunk/BOOK/general/prog/prog.xml
==============================================================================
--- trunk/BOOK/general/prog/prog.xml    Fri Jan 18 12:36:19 2019        (r20993)
+++ trunk/BOOK/general/prog/prog.xml    Fri Jan 18 13:10:31 2019        (r20994)
@@ -72,8 +72,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="java.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="openjdk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="ojdk-conf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="maven.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="apache-ant.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="junit.xml"/>
 
 </chapter>

Modified: trunk/BOOK/general/prog/subversion.xml
==============================================================================
--- trunk/BOOK/general/prog/subversion.xml      Fri Jan 18 12:36:19 2019        
(r20993)
+++ trunk/BOOK/general/prog/subversion.xml      Fri Jan 18 13:10:31 2019        
(r20994)
@@ -125,7 +125,8 @@
       One of <xref linkend="openjdk"/>,
       <ulink url="http://www.inet.no/dante/";>Dante</ulink> or
       <ulink url="http://jikes.sourceforge.net/";>Jikes</ulink>,
-      and <xref linkend="junit"/> (to test the Java bindings)
+      and <ulink url="https://junit.org/junit4/";>JUnit 4</ulink>
+      (to test the Java bindings).
     </para>
 
     <para condition="html" role="usernotes">
@@ -195,7 +196,10 @@
       <application>JUnit</application> testing framework must be installed,
       and the location of the JUnit jar has to be specified by passing the
       <option>--with-junit=&lt;path to junit jar&gt;</option> parameter to
-      <command>configure</command>.
+      <command>configure</command>. Note that <application>JUnit</application>
+      is included in <xref linkend="apache-ant"/>, and can be accessed by
+      passing <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
+      to <command>configure</command>.
     </para>
 
     <para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Fri Jan 18 12:36:19 
2019        (r20993)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Fri Jan 18 13:10:31 
2019        (r20994)
@@ -45,6 +45,14 @@
       <para>January 18th, 2019</para>
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Archive maven and junit. Fixes
+          <ulink url="&blfs-ticket-root;10548">#10548</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to apache-ant-1.10.5. Fixes
+          <ulink url="&blfs-ticket-root;11067">#11067</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbbs] - Update to inkscape-0.92.4. Fixes
           <ulink url="&blfs-ticket-root;11558">#11558</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Fri Jan 18 12:36:19 2019        (r20993)
+++ trunk/BOOK/packages.ent     Fri Jan 18 13:10:31 2019        (r20994)
@@ -350,11 +350,13 @@
 <!ENTITY valgrind-version             "3.14.0">
 <!ENTITY yasm-version                 "1.3.0">
 
-<!ENTITY apache-ant-version           "1.10.4">
-<!ENTITY maven-version                "3.5.4">
+<!ENTITY apache-ant-version           "1.10.5">
+<!--
+<!ENTITY maven-version                "3.6.0">
 <!ENTITY junit-major                  "4">
 <!ENTITY junit-version                "4.12">
 <!ENTITY hamcrest-version             "1.3">
+-->
 <!ENTITY openjdk-version              "11.0.2">
 <!ENTITY openjdk-build                "7">
 

Modified: trunk/BOOK/pst/ps/fop.xml
==============================================================================
--- trunk/BOOK/pst/ps/fop.xml   Fri Jan 18 12:36:19 2019        (r20993)
+++ trunk/BOOK/pst/ps/fop.xml   Fri Jan 18 13:10:31 2019        (r20994)
@@ -121,9 +121,10 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="junit"/> (to run tests),
+<!-- Included into ant      <xref linkend="junit"/> (to run tests),-->
       <xref linkend="x-window-system"/> (to run tests),
-      <xref linkend="maven"/> (an alternate build system),
+<!--      <xref linkend="maven"/> (an alternate build system), not funcional
+      with fop-2.3          -->
       <ulink url="https://java.net/projects/jai-imageio";>JAI Image I/O 
Tools</ulink>, and
       <ulink url="http://jeuclid.sourceforge.net/";>JEuclid</ulink>
 <!-- [pierre 2017-04-29] Note to devs: there are a lot of bundled dependencies.

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml     Fri Jan 18 12:36:19 2019        
(r20993)
+++ trunk/BOOK/xsoft/office/libreoffice.xml     Fri Jan 18 13:10:31 2019        
(r20994)
@@ -219,7 +219,8 @@
       <xref linkend="doxygen"/> (not relevant if using --disable-odk),
       <xref linkend="gdb"/>,
       <xref linkend="gnutls"/>,
-      <xref linkend="junit"/>,
+<!-- not anymore in the book, but included in apache-ant
+     <xref linkend="junit"/>, -->
 <!--      <xref linkend="kdelibs"/>, -->
       <xref linkend="mariadb"/> or <ulink 
url="http://www.mysql.com/";>MySQL</ulink>,
       <xref linkend="mitkrb"/>,
@@ -631,9 +632,9 @@
       deprecated HSQLDB driver, which allows reading databases created by
       other programs or in earlier versions of libreoffice
       <application>base</application>. You may also need to add:
-      <option>--with-junit=/opt/ant/lib/junit-&junit-version;.jar</option>
+      <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
       <option>--with-jdk-home=/opt/jdk</option>
-      
<option>--with-hamcrest=/opt/ant/lib/hamcrest-core-&hamcrest-version;.jar</option>
+      <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>
     </para>
 
     <para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to