Changeset 5473


Ignore:
Timestamp:
Mar 20, 2020, 9:14:25 PM (10 months ago)
Author:
Christian Schulte
Message:

o Merged changes up to 5472 from 'trunk' into branch 'jomc-pom-1.x'.

See #125,#144

Location:
jomc-pom/branches/jomc-pom-1.x
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • jomc-pom/branches/jomc-pom-1.x

  • jomc-pom/branches/jomc-pom-1.x/pom.xml

    r5449 r5473  
    250250                  </tagletArtifacts>
    251251                  <additionalJOptions>
    252                     <additionalJOption>-J-client</additionalJOption>
    253252                    <additionalJOption>-J-Dfile.encoding=${file.encoding}</additionalJOption>
    254253                  </additionalJOptions>
     
    506505            <maxMemory>${maven.jarsigner.memory}</maxMemory>
    507506            <arguments>
    508               <argument>-J-client</argument>
    509507              <argument>-J-Dfile.encoding=${file.encoding}</argument>
    510508              <argument>-J-Djsse.enableSNIExtension=false</argument>
     
    612610            </tagletArtifacts>
    613611            <additionalJOptions>
    614               <additionalJOption>-J-client</additionalJOption>
    615612              <additionalJOption>-J-Dfile.encoding=${file.encoding}</additionalJOption>
    616613            </additionalJOptions>
     
    13511348    <jaxb2-basics.version>0.11.0</jaxb2-basics.version>
    13521349    <jomc.build.version>1.10</jomc.build.version>
     1350    <wagon.version>2.12</wagon.version>
    13531351    <!-- Plugin versions. -->
    13541352    <maven-compiler-plugin.artifact.version>3.5.1</maven-compiler-plugin.artifact.version>
     
    14181416    <maven.javadoc.maxmemory>${maven.javadoc.memory}</maven.javadoc.maxmemory>
    14191417    <maven.surefire.memory>32m</maven.surefire.memory>
    1420     <maven.surefire.argLine>-client -Xms${maven.surefire.memory} -Xmx${maven.surefire.memory} -Dfile.encoding=${file.encoding}</maven.surefire.argLine>
     1418    <maven.surefire.argLine>-Xms${maven.surefire.memory} -Xmx${maven.surefire.memory} -Dfile.encoding=${file.encoding}</maven.surefire.argLine>
    14211419    <!-- Updated by JaCoCo plugin. Potentionally conflicts with other plugins using that same property. -->
    14221420    <argLine>${maven.surefire.argLine}</argLine>
Note: See TracChangeset for help on using the changeset viewer.