Changeset 5473

Timestamp:

Mar 20, 2020, 9:14:25 PM (2 years 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:

• . (modified) (1 prop)
• pom.xml (modified) (5 diffs)

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

@@ -250 +250 @@
                   </tagletArtifacts>
                   <additionalJOptions>
-                    <additionalJOption>-J-client</additionalJOption>
                     <additionalJOption>-J-Dfile.encoding=${file.encoding}</additionalJOption>
                   </additionalJOptions>
@@ -506 +505 @@
             <maxMemory>${maven.jarsigner.memory}</maxMemory>
             <arguments>
-              <argument>-J-client</argument>
               <argument>-J-Dfile.encoding=${file.encoding}</argument>
               <argument>-J-Djsse.enableSNIExtension=false</argument>
@@ -612 +610 @@
             </tagletArtifacts>
             <additionalJOptions>
-              <additionalJOption>-J-client</additionalJOption>
               <additionalJOption>-J-Dfile.encoding=${file.encoding}</additionalJOption>
             </additionalJOptions>
@@ -1351 +1348 @@
     <jaxb2-basics.version>0.11.0</jaxb2-basics.version>
     <jomc.build.version>1.10</jomc.build.version>
+    <wagon.version>2.12</wagon.version>
     <!-- Plugin versions. -->
     <maven-compiler-plugin.artifact.version>3.5.1</maven-compiler-plugin.artifact.version>
@@ -1418 +1416 @@
     <maven.javadoc.maxmemory>${maven.javadoc.memory}</maven.javadoc.maxmemory>
     <maven.surefire.memory>32m</maven.surefire.memory>
-    <maven.surefire.argLine>-client -Xms${maven.surefire.memory} -Xmx${maven.surefire.memory} -Dfile.encoding=${file.encoding}</maven.surefire.argLine>
+    <maven.surefire.argLine>-Xms${maven.surefire.memory} -Xmx${maven.surefire.memory} -Dfile.encoding=${file.encoding}</maven.surefire.argLine>
     <!-- Updated by JaCoCo plugin. Potentionally conflicts with other plugins using that same property. -->
     <argLine>${maven.surefire.argLine}</argLine>