Changeset cb7032fe

Timestamp:

03/19/2018 09:22:16 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

b1c9a4b

Parents:

7fc15d9

Message:

Add apache-maven and update to junit-4.12

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

Files:

• general/prog/junit.xml (modified) (7 diffs)
• general/prog/maven.xml (added)
• general/prog/prog.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• pst/ps/fop.xml (modified) (1 diff)

general/prog/junit.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_&junit-version;.orig.tar.gz">
+  <!ENTITY junit-download-http "https://github.com/junit-team/junit&junit-major;/archive/r&junit-version;/junit-&junit-version;.tar.gz">
   <!ENTITY junit-download-ftp  " ">
-  <!ENTITY junit-md5sum        "b4d163832583dcec8bedb5427c795cc4">
-  <!ENTITY junit-size          "1.7 MB">
-  <!ENTITY junit-buildsize     "34 MB">
-  <!ENTITY junit-time          "0.1 SBU">
+  <!ENTITY junit-md5sum        "22578a9b35cbb71d556a2e625c576c81">
+  <!ENTITY junit-size          "433 KB">
+  <!ENTITY junit-buildsize     "27 MB">
+  <!ENTITY junit-time          "0.2 SBU (with dicumentation, using 4 cores; add maven <quote>crates</quote> download time)">
 ]>
 
@@ -61 +61 @@
       </listitem>
     </itemizedlist>
-
+<!-- maven downloads this for us:
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -77 +77 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="apache-ant"/> and
+      <xref linkend="maven"/> and
       <xref linkend="unzip"/>
     </para>
@@ -93 +93 @@
   <sect2 role="installation">
     <title>Installation of JUnit</title>
+    <para>
+      First remove a test, which fails with <application>Java 9</application>.
+    </para>
+
+<screen><userinput>sed -e '/MethodsSorted/i    @Ignore' \
+    -i src/test/java/org/junit/runners/model/TestClassTest.java</userinput></screen>
 
     <para>
-      The <command>javadoc</command> command coming with OpenJDK 8 has become
-      much stricter than before regarding the conformance of the Javadoc
-      comments in source code to HTML. The <application>Junit</application>
-      documentation does not meet that standard, so the conformance checks
-      have to be disabled. This can be done with the following command:
+      Install <application>Junit</application> by running the following
+      commands:
     </para>
 
-<screen><userinput>sed -i '\@/docs/@a&lt;arg value="-Xdoclint:none"/&gt;' build.xml</userinput></screen>
+<screen><userinput>mvn -DjdkVersion=1.6 install</userinput></screen>
 
     <para>
-      With <application>Java 9</application>, the minimum accepted code version
-      is 1.6. However, the build system passes <option>-source 1.5</option>,
-      while the junit code can perfectly be compiled for a Java 8 JVM. Change
-      that by issuing the following command:
+      The tests are run as part of the command above.
     </para>
 
-<screen><userinput>sed -i 's/1\.5/1.8/' build.xml</userinput></screen>
-
     <para>
-      Now place the required hamcrest jar files where needed and build the
-      package:
+      If you wish to generate the documentation, issue:
     </para>
 
-<screen><userinput>cp -v ../hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ &amp;&amp;
-ant populate-dist</userinput></screen>
-
-    <para>
-      Test the package by issuing <command>ant dist</command>. One test fails
-      for unknown reason.
-    </para>
+<screen><userinput>mvn site</userinput></screen>
 
     <para>
@@ -131 +122 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/{doc,java}/junit-&junit-version; &amp;&amp;
-chown -R root:root .                                 &amp;&amp;
+<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>
 
-cp -v -R junit*/javadoc/*             /usr/share/doc/junit-&junit-version;  &amp;&amp;
-cp -v junit*/junit*.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>
@@ -167 +164 @@
 
       <varlistentry id="junit.jar">
-        <term><filename class='libraryfile'>junit jar files</filename></term>
+        <term><filename class='libraryfile'>junit-&junit-version;.jar</filename></term>
         <listitem>
           <para>contains java classes to support the xUnit framework testing
@@ -177 +174 @@
       </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>
 

general/prog/prog.xml

@@ -71 +71 @@
   <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"/>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Update to Junit-4.12 (using maven for building).
+          Fixes <ulink url="&blfs-ticket-root;10422">#10422</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Add Apache-Maven-3.5.3. Part of
+          <ulink url="&blfs-ticket-root;10422">#10422</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to firefox-59.0.1 (security fix). Fixes
           <ulink url="&blfs-ticket-root;10557">#10557</ulink>.</para>

packages.ent

@@ -346 +346 @@
 
 <!ENTITY apache-ant-version           "1.10.2">
-<!ENTITY junit-version                "4.11">
+<!ENTITY maven-version                "3.5.3">
+<!ENTITY junit-major                  "4">
+<!ENTITY junit-version                "4.12">
 <!ENTITY hamcrest-version             "1.3">
 <!ENTITY openjdk-version              "9.0.4">

pst/ps/fop.xml

@@ -103 +103 @@
       <xref linkend="junit"/> (to run tests),
       <xref linkend="x-window-system"/> (to run tests),
-      <ulink url="https://maven.apache.org/">Maven</ulink>,
+      <xref linkend="maven"/> (an alternate build system),
       <ulink url="https://java.net/projects/jai-imageio">JAI Image I/O Tools</ulink>, and
       <ulink url="http://jeuclid.sourceforge.net/">JEuclid</ulink>