Changeset fbd186f

Timestamp:

08/26/2018 04:52:45 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

bba3fd3

Parents:

d31272d3

Message:

Update to Apache-Ant-1.10.4. Fixes #10896.
Update to Apache-Maven-3.5.4. Fixes #11062.
Fix build issue with junit-4.12. Fixes #10777.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20401 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/apache-ant.xml (modified) (2 diffs)
• general/prog/junit.xml (modified) (3 diffs)
• general/prog/maven.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/prog/apache-ant.xml

@@ -7 +7 @@
   <!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        "9db4b8ebdf3ee3a50aceb96ee6d54e6a">
+  <!ENTITY apache-ant-md5sum        "a8297467f7d13873897ff4418ff1e932">
   <!ENTITY apache-ant-size          "4.0 MB">
-  <!ENTITY apache-ant-buildsize     "262 MB (not including downloaded files)">
-  <!ENTITY apache-ant-time          "0.3 SBU (with 4 cores; add download time)">
+  <!ENTITY apache-ant-buildsize     "264 MB">
+  <!ENTITY apache-ant-time          "0.2 SBU (excluding download time)">
 ]>
 
@@ -40 +40 @@
     that implements a particular task interface.</para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/prog/junit.xml

@@ -38 +38 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61 +61 @@
       </listitem>
     </itemizedlist>
-<!-- maven downloads this for us:
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required file: <ulink
-             url="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/&hamcrest-version;/hamcrest-core-&hamcrest-version;-sources.jar"/>
+          Required patch: <ulink
+             url="&patch-root;/junit/junit4-&junit-version;-simplify_NoExitSecurityManager-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
 
@@ -94 +87 @@
     <title>Installation of JUnit</title>
     <para>
-      First remove a test, which fails with <application>Java 9</application>.
+      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-&junit-version;-simplify_NoExitSecurityManager-1.patch</userinput></screen>
 
     <para>

general/prog/maven.xml

@@ -7 +7 @@
   <!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        "240b880cd7294665d7228f74f6453984">
+  <!ENTITY maven-md5sum        "a4346b6cb557266677dc9541526e2548">
   <!ENTITY maven-size          "2.6 MB">
-  <!ENTITY maven-buildsize     "?? MB">
-  <!ENTITY maven-time          "?? SBU">
+  <!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">
 ]>
 
-<!-- Try to keep the indentation used in this file-->
 <sect1 id="maven" xreflabel="Apache-Maven-&maven-version;">
   <?dbhtml filename="maven.html"?>
 
   <sect1info>
-    <!-- this part gets updated when you commit, IFF you set the properties:
-      first, svn add path/to/thisfile.xml and then
-      svn propset svn:mime-type text/plain path/to/thisfile.xml and
-      svn propset svn:keywords "Date LastChangedBy" path/to/thisfile.xml -->
     <othername>$LastChangedBy: pierre $</othername>
     <date>$Date: 2017-09-11 12:14:03 +0200 (lun. 11 sept. 2017) $</date>
@@ -45 +40 @@
     </para>
 
-    &lfs82_checked;
+    &lfs83_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>August 26th, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix build issue with junit-4.12. Fixes
+          <ulink url="&blfs-ticket-root;10777">#10777</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to Apache-Maven-3.5.4. Fixes
+          <ulink url="&blfs-ticket-root;11062">#11062</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to Apache-Ant-1.10.4. Fixes
+          <ulink url="&blfs-ticket-root;10896">#10896</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Update to OpenJDK-10.0.2. Fixes

packages.ent

@@ -347 +347 @@
 <!ENTITY yasm-version                 "1.3.0">
 
-<!ENTITY apache-ant-version           "1.10.3">
-<!ENTITY maven-version                "3.5.3">
+<!ENTITY apache-ant-version           "1.10.4">
+<!ENTITY maven-version                "3.5.4">
 <!ENTITY junit-major                  "4">
 <!ENTITY junit-version                "4.12">