Skip to content

Bump LibreOffice library odfdom-java to 0.12.0, require JDK 11+ for generating Calc file ODS #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slawekjaranowski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump LibreOffice library odfdom-java to 0.12.0, require JDK 11+ for generating Calc file ODS #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 52 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@

<version.httpcomponents.httpclient>4.5.14</version.httpcomponents.httpclient>
<version.httpcomponents.httpcore>4.4.16</version.httpcomponents.httpcore>
<version.odfdom-java>0.12.0</version.odfdom-java>

<!-- license configuration -->
<license.useMissingFile>true</license.useMissingFile>
Expand Down Expand Up @@ -307,8 +308,13 @@
<dependency>
<groupId>org.odftoolkit</groupId>
<artifactId>odfdom-java</artifactId>
<!-- There are later versions, but that versions need JDKs after version 8 -->
<version>0.9.0</version>
<version>${version.odfdom-java}</version>
</dependency>
<!-- XML APIs is needed for JDK 8, was a transitive dependency from old version of odfdom-java -->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -461,7 +467,7 @@
<dependency>
<groupId>org.odftoolkit</groupId>
<artifactId>odfdom-java</artifactId>
<version>0.9.0</version>
<version>${version.odfdom-java}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -546,5 +552,48 @@
</plugins>
</reporting>
</profile>

<profile>
<id>java11-mrjar</id>
<activation>
<jdk>[11,)</jdk>
</activation>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<!-- Compile Java 11+ specific code -->
<execution>
<id>java11-compile</id>
<goals>
<goal>compile</goal>
</goals>
<phase>compile</phase>
<configuration>
<release>11</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
</compileSourceRoots>
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/11</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<classesDirectory>${project.build.outputDirectory}/META-INF/versions/11</classesDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
3 changes: 3 additions & 0 deletions src/it/aggregate-download-licenses-extended-spreadsheet/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@
###
invoker.goals=clean license:aggregate-download-licenses
invoker.failureBehavior=fail-fast

# LibreOffice Calc file (ODS) requires JDK 11+
invoker.java.version = 11+
2 changes: 2 additions & 0 deletions src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,8 @@ public abstract class AbstractDownloadLicensesMojo extends AbstractLicensesXmlMo

/**
* Write LibreOffice Calc file (ODS) for goal license:aggregate-download-licenses.
* <p>
* <b>NOTICE</b> Requires JDK 11 or higher.
*
* @since 2.4.0
*/
Expand Down
Loading