Changeset cb7032fe


Ignore:
Timestamp:
03/19/2018 09:22:16 PM (4 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
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:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • general/prog/junit.xml

    r7fc15d9 rcb7032fe  
    55  %general-entities;
    66
    7   <!ENTITY junit-download-http "https://launchpad.net/debian/+archive/primary/+files/junit4_&junit-version;.orig.tar.gz">
     7  <!ENTITY junit-download-http "https://github.com/junit-team/junit&junit-major;/archive/r&junit-version;/junit-&junit-version;.tar.gz">
    88  <!ENTITY junit-download-ftp  " ">
    9   <!ENTITY junit-md5sum        "b4d163832583dcec8bedb5427c795cc4">
    10   <!ENTITY junit-size          "1.7 MB">
    11   <!ENTITY junit-buildsize     "34 MB">
    12   <!ENTITY junit-time          "0.1 SBU">
     9  <!ENTITY junit-md5sum        "22578a9b35cbb71d556a2e625c576c81">
     10  <!ENTITY junit-size          "433 KB">
     11  <!ENTITY junit-buildsize     "27 MB">
     12  <!ENTITY junit-time          "0.2 SBU (with dicumentation, using 4 cores; add maven <quote>crates</quote> download time)">
    1313]>
    1414
     
    6161      </listitem>
    6262    </itemizedlist>
    63 
     63<!-- maven downloads this for us:
    6464    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    6565    <itemizedlist spacing="compact">
     
    7777      </listitem>
    7878    </itemizedlist>
    79 
     79-->
    8080    <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
    8181
    8282    <bridgehead renderas="sect4">Required</bridgehead>
    8383    <para role="required">
    84       <xref linkend="apache-ant"/> and
     84      <xref linkend="maven"/> and
    8585      <xref linkend="unzip"/>
    8686    </para>
     
    9393  <sect2 role="installation">
    9494    <title>Installation of JUnit</title>
     95    <para>
     96      First remove a test, which fails with <application>Java 9</application>.
     97    </para>
     98
     99<screen><userinput>sed -e '/MethodsSorted/i    @Ignore' \
     100    -i src/test/java/org/junit/runners/model/TestClassTest.java</userinput></screen>
    95101
    96102    <para>
    97       The <command>javadoc</command> command coming with OpenJDK 8 has become
    98       much stricter than before regarding the conformance of the Javadoc
    99       comments in source code to HTML. The <application>Junit</application>
    100       documentation does not meet that standard, so the conformance checks
    101       have to be disabled. This can be done with the following command:
     103      Install <application>Junit</application> by running the following
     104      commands:
    102105    </para>
    103106
    104 <screen><userinput>sed -i '\@/docs/@a&lt;arg value="-Xdoclint:none"/&gt;' build.xml</userinput></screen>
     107<screen><userinput>mvn -DjdkVersion=1.6 install</userinput></screen>
    105108
    106109    <para>
    107       With <application>Java 9</application>, the minimum accepted code version
    108       is 1.6. However, the build system passes <option>-source 1.5</option>,
    109       while the junit code can perfectly be compiled for a Java 8 JVM. Change
    110       that by issuing the following command:
     110      The tests are run as part of the command above.
    111111    </para>
    112112
    113 <screen><userinput>sed -i 's/1\.5/1.8/' build.xml</userinput></screen>
    114 
    115113    <para>
    116       Now place the required hamcrest jar files where needed and build the
    117       package:
     114      If you wish to generate the documentation, issue:
    118115    </para>
    119116
    120 <screen><userinput>cp -v ../hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ &amp;&amp;
    121 ant populate-dist</userinput></screen>
    122 
    123     <para>
    124       Test the package by issuing <command>ant dist</command>. One test fails
    125       for unknown reason.
    126     </para>
     117<screen><userinput>mvn site</userinput></screen>
    127118
    128119    <para>
     
    131122    </para>
    132123
    133 <screen role="root"><userinput>install -v -m755 -d /usr/share/{doc,java}/junit-&junit-version; &amp;&amp;
    134 chown -R root:root .                                 &amp;&amp;
     124<screen role="root"><userinput>install -v -m755 -d             /usr/share/java/junit-&junit-version; &amp;&amp;
     125cp -v target/junit-&junit-version;.jar     /usr/share/java/junit-&junit-version; &amp;&amp;
     126cp -v lib/hamcrest-core-1.3.jar /usr/share/java/junit-&junit-version;</userinput></screen>
    135127
    136 cp -v -R junit*/javadoc/*             /usr/share/doc/junit-&junit-version;  &amp;&amp;
    137 cp -v junit*/junit*.jar               /usr/share/java/junit-&junit-version;</userinput></screen>
     128    <para>
     129      if the documentation was built, install it as the
     130      <systemitem class="username">root</systemitem> user:
     131    </para>
     132<screen role="root"><userinput>install -v -m755 -d    /usr/share/doc/junit-&junit-version; &amp;&amp;
     133cp -v -R target/site/* /usr/share/doc/junit-&junit-version;</userinput></screen>
     134
    138135
    139136    <para>
     
    167164
    168165      <varlistentry id="junit.jar">
    169         <term><filename class='libraryfile'>junit jar files</filename></term>
     166        <term><filename class='libraryfile'>junit-&junit-version;.jar</filename></term>
    170167        <listitem>
    171168          <para>contains java classes to support the xUnit framework testing
     
    177174      </varlistentry>
    178175
     176      <varlistentry id="hamcrest-core">
     177        <term><filename class='libraryfile'>hamcrest-core-1.3.jar</filename></term>
     178        <listitem>
     179          <para>contains java classes to support matchers used in xUnit
     180          tests.</para>
     181          <indexterm zone="junit hamcrest-core">
     182            <primary sortas="c-hamcrest-core">hamcrest-core-1.3.jar</primary>
     183          </indexterm>
     184        </listitem>
     185      </varlistentry>
     186
    179187    </variablelist>
    180188
  • general/prog/prog.xml

    r7fc15d9 rcb7032fe  
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
    7272  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ojdk-conf.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maven.xml"/>
    7374  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
    7475  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
  • introduction/welcome/changelog.xml

    r7fc15d9 rcb7032fe  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[pierre] - Update to Junit-4.12 (using maven for building).
     49          Fixes <ulink url="&blfs-ticket-root;10422">#10422</ulink>.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[pierre] - Add Apache-Maven-3.5.3. Part of
     53          <ulink url="&blfs-ticket-root;10422">#10422</ulink>.</para>
     54        </listitem>
     55        <listitem>
    4856          <para>[ken] - Update to firefox-59.0.1 (security fix). Fixes
    4957          <ulink url="&blfs-ticket-root;10557">#10557</ulink>.</para>
  • packages.ent

    r7fc15d9 rcb7032fe  
    346346
    347347<!ENTITY apache-ant-version           "1.10.2">
    348 <!ENTITY junit-version                "4.11">
     348<!ENTITY maven-version                "3.5.3">
     349<!ENTITY junit-major                  "4">
     350<!ENTITY junit-version                "4.12">
    349351<!ENTITY hamcrest-version             "1.3">
    350352<!ENTITY openjdk-version              "9.0.4">
  • pst/ps/fop.xml

    r7fc15d9 rcb7032fe  
    103103      <xref linkend="junit"/> (to run tests),
    104104      <xref linkend="x-window-system"/> (to run tests),
    105       <ulink url="https://maven.apache.org/">Maven</ulink>,
     105      <xref linkend="maven"/> (an alternate build system),
    106106      <ulink url="https://java.net/projects/jai-imageio">JAI Image I/O Tools</ulink>, and
    107107      <ulink url="http://jeuclid.sourceforge.net/">JEuclid</ulink>
Note: See TracChangeset for help on using the changeset viewer.