You are viewing a plain text version of this content. The canonical link for it is here.
Posted to odf-commits@incubator.apache.org by sv...@apache.org on 2017/04/11 20:23:17 UTC
svn commit: r1791024 - in /incubator/odf/trunk: generator/pom.xml
generator/schema2template/pom.xml
generator/schema2template/src/test/java/schema2template/example/ExampleGenerationTest.java
odfdom/pom.xml pom.xml simple/pom.xml validator/pom.xml
Author: svanteschubert
Date: Tue Apr 11 20:23:17 2017
New Revision: 1791024
URL: http://svn.apache.org/viewvc?rev=1791024&view=rev
Log:
Minor pom.xml updates related to JDK8
Modified:
incubator/odf/trunk/generator/pom.xml
incubator/odf/trunk/generator/schema2template/pom.xml
incubator/odf/trunk/generator/schema2template/src/test/java/schema2template/example/ExampleGenerationTest.java
incubator/odf/trunk/odfdom/pom.xml
incubator/odf/trunk/pom.xml
incubator/odf/trunk/simple/pom.xml
incubator/odf/trunk/validator/pom.xml
Modified: incubator/odf/trunk/generator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/pom.xml?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/generator/pom.xml (original)
+++ incubator/odf/trunk/generator/pom.xml Tue Apr 11 20:23:17 2017
@@ -30,8 +30,6 @@
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
<target>${jdk.version}</target>
- <meminitial>512m</meminitial>
- <maxmem>1024m</maxmem>
</configuration>
</plugin>
<plugin>
@@ -62,12 +60,10 @@
<version>2.10.4</version>
<configuration>
<doctitle>Schema2template</doctitle>
- <minmemory>512m</minmemory>
- <maxmemory>1024m</maxmemory>
<splitindex>true</splitindex>
<windowtitle>Schema2template v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
<links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://download.oracle.com/javase/8/docs/api/</link>
</links>
<encoding>${project.build.sourceEncoding}</encoding>
<attach>true</attach>
Modified: incubator/odf/trunk/generator/schema2template/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/pom.xml?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/pom.xml (original)
+++ incubator/odf/trunk/generator/schema2template/pom.xml Tue Apr 11 20:23:17 2017
@@ -62,13 +62,13 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-7</version>
+ <version>1.0</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<index>true</index>
@@ -96,7 +96,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Explizit version required for fix on systemPropertyVariables -->
- <version>2.6</version>
+ <version>2.19.1</version>
<configuration>
<systemPropertyVariables>
<odfdom.version>${project.version}</odfdom.version>
@@ -110,7 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.6.1</version>
<configuration>
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
@@ -238,13 +238,11 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.4</version>
<configuration>
<doctitle>Schema2template</doctitle>
- <minmemory>512m</minmemory>
- <maxmemory>1024m</maxmemory>
<links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://docs.oracle.com/javase/8/docs/api/</link>
</links>
<splitindex>true</splitindex>
<windowtitle>Schema2template v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
@@ -256,7 +254,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
<configuration>
<instrumentation>
<excludes>
Modified: incubator/odf/trunk/generator/schema2template/src/test/java/schema2template/example/ExampleGenerationTest.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/test/java/schema2template/example/ExampleGenerationTest.java?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/test/java/schema2template/example/ExampleGenerationTest.java (original)
+++ incubator/odf/trunk/generator/schema2template/src/test/java/schema2template/example/ExampleGenerationTest.java Tue Apr 11 20:23:17 2017
@@ -25,8 +25,8 @@ package schema2template.example;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.junit.Test;
import org.junit.Assert;
+import org.junit.Test;
import schema2template.example.odf.OdfHelper;
public class ExampleGenerationTest {
@@ -39,8 +39,9 @@ public class ExampleGenerationTest {
try {
OdfHelper.main(null);
} catch (Exception ex) {
- Logger.getLogger(ExampleGenerationTest.class.getName()).log(Level.SEVERE, null, ex);
+ LOG.log(Level.SEVERE, null, ex);
Assert.fail(ex.toString());
}
}
+ private static final Logger LOG = Logger.getLogger(ExampleGenerationTest.class.getName());
}
Modified: incubator/odf/trunk/odfdom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/pom.xml?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/pom.xml (original)
+++ incubator/odf/trunk/odfdom/pom.xml Tue Apr 11 20:23:17 2017
@@ -92,9 +92,6 @@
<!-- defined in the parent pom.xml -->
<source>${jdk.version}</source>
<target>${jdk.version}</target>
- <meminitial>512m</meminitial>
- <maxmem>1024m</maxmem>
- <showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
@@ -140,7 +137,6 @@
<version>2.19.1</version>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>-Xms512m -Xmx512m</argLine>
<systemPropertyVariables>
<odfdom.version>${project.version}</odfdom.version>
<odfdom.timestamp>${build.timestamp}</odfdom.timestamp>
@@ -154,8 +150,6 @@
<version>2.10.4</version>
<configuration>
<doctitle>ODFDOM</doctitle>
- <minmemory>1024m</minmemory>
- <maxmemory>1024m</maxmemory>
<links>
<link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>http://xerces.apache.org/xerces-j/apiDocs/</link>
@@ -247,7 +241,7 @@
<minmemory>512m</minmemory>
<maxmemory>1024m</maxmemory>
<links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://download.oracle.com/javase/8/docs/api/</link>
<link>http://xerces.apache.org/xerces-j/apiDocs/</link>
</links>
<splitindex>true</splitindex>
@@ -452,7 +446,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <version>2.19.1</version>
<executions>
<execution>
<id>failsafe-it</id>
Modified: incubator/odf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/pom.xml?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/pom.xml (original)
+++ incubator/odf/trunk/pom.xml Tue Apr 11 20:23:17 2017
@@ -437,7 +437,7 @@
<include name="*.tar.bz2" />
</fileset>
</checksum>
- <checksum file="target/odftoolkit-${project.version}-src.zip" algorithm="SHA512" property="checksum" />
+ <checksum file="target/odftoolkit-${project.version}-src.zip" algorithm="SHA-512" property="checksum" />
<copy todir="${basedir}/target/release/${project.version}/">
<fileset dir="${basedir}/target">
<include name="*-source-release.*" />
@@ -466,7 +466,7 @@
https://svn.apache.org/repos/asf/incubator/odf/tags/${project.version}/
- The SHA512 checksum of the archive is ${checksum}.
+ The SHA-512 checksum of the archive is ${checksum}.
Please vote on releasing this package as Apache ODF Toolkit ${project.version}.
The vote is open for the next 72 hours and passes if a majority
Modified: incubator/odf/trunk/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/simple/pom.xml?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/simple/pom.xml (original)
+++ incubator/odf/trunk/simple/pom.xml Tue Apr 11 20:23:17 2017
@@ -114,10 +114,8 @@
<version>2.10.4</version>
<configuration>
<doctitle>Simple Java API for ODF(Simple ODF)</doctitle>
- <minmemory>512m</minmemory>
- <maxmemory>1024m</maxmemory>
<links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://download.oracle.com/javase/8/docs/api/</link>
<link>http://xerces.apache.org/xerces-j/apiDocs/</link>
</links>
<splitindex>true</splitindex>
Modified: incubator/odf/trunk/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/pom.xml?rev=1791024&r1=1791023&r2=1791024&view=diff
==============================================================================
--- incubator/odf/trunk/validator/pom.xml (original)
+++ incubator/odf/trunk/validator/pom.xml Tue Apr 11 20:23:17 2017
@@ -400,15 +400,13 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
- <doctitle>ODFDOM</doctitle>
- <minmemory>512m</minmemory>
- <maxmemory>1024m</maxmemory>
+ <doctitle>Validator</doctitle>
<links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://download.oracle.com/javase/8/docs/api/</link>
<link>http://xerces.apache.org/xerces-j/apiDocs/</link>
</links>
<splitindex>true</splitindex>
- <windowtitle>ODFDOM Validator API v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
+ <windowtitle>Validator API v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
</configuration>
</plugin>
<!-- Reporting integration test results -->