Merge pull request #177 from arjantijms/pom_updates
Update dependency versions and copyright in poms
diff --git a/api/pom.xml b/api/pom.xml
index c5e8a0d..87486e0 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -103,7 +103,7 @@
</resource>
</resources>
<plugins>
- <!-- Sets minimal Maven version to 3.5.4 -->
+ <!-- Sets minimal Maven version -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -117,8 +117,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.5.4</version>
- <message>You need Maven 3.5.4 or higher</message>
+ <version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -239,13 +238,14 @@
<configuration>
<source>11</source>
<additionalJOption>-Xdoclint:none</additionalJOption>
+ <quiet>true</quiet>
<description>Jakarta Expression Language API documentation</description>
<doctitle>Jakarta Expression Language API documentation</doctitle>
<windowtitle>Jakarta Expression Language API documentation</windowtitle>
<header><![CDATA[<br>Jakarta Expression Language API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:el-dev@eclipse.org">el-dev@eclipse.org</a>.<br>
-Copyright © 2018, 2020 Eclipse Foundation. All rights reserved.<br>
+Copyright © 2018, 2021 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.]]>
</bottom>
<docfilessubdirs>true</docfilessubdirs>
diff --git a/impl/pom.xml b/impl/pom.xml
index bc4daa0..92842ba 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -106,11 +106,11 @@
</resource>
</resources>
<plugins>
- <!-- Sets minimal Maven version to 3.5.4 -->
+ <!-- Sets minimal Maven version -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -120,8 +120,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.5.4</version>
- <message>You need Maven 3.5.4 or higher</message>
+ <version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -135,7 +134,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.1</version>
+ <version>5.1.2</version>
<configuration>
<instructions>
<Bundle-SymbolicName>org.glassfish.jakarta.el</Bundle-SymbolicName>
@@ -190,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -200,6 +199,7 @@
<configuration>
<source>11</source>
<additionalJOption>-Xdoclint:none</additionalJOption>
+ <quiet>true</quiet>
<groups>
<group>
<title>Jakarta Expression Language ${project.version} Implementation</title>
@@ -208,7 +208,7 @@
</groups>
<bottom><![CDATA[
Comments to: <a href="mailto:el-dev@eclipse.org">el-dev@eclipse.org</a>.<br>
-Copyright © 2018, 2020 Eclipse Foundation. All rights reserved.<br>
+Copyright © 2018, 2021 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="http://www.eclipse.org/legal/epl-2.0" target="_top">license terms</a>.]]>
</bottom>
</configuration>
diff --git a/pom.xml b/pom.xml
index d2cd9bc..6e35168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<build>
<plugins>
- <!-- Sets minimal Maven version to 3.5.4 -->
+ <!-- Sets minimal Maven version -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -58,7 +58,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.5.4</version>
+ <version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
diff --git a/spec/pom.xml b/spec/pom.xml
index fc97473..3c031e4 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -82,10 +82,9 @@
<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
- <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.version>2.4.0</asciidoctorj.version>
- <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
- <jruby.version>9.2.13.0</jruby.version>
+ <asciidoctorj.version>2.5.2</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version>
+ <jruby.version>9.3.2.0</jruby.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -95,7 +94,7 @@
<build>
<defaultGoal>package</defaultGoal>
<plugins>
- <!-- Sets minimal Maven version to 3.5.4 and Java version to 11 -->
+ <!-- Sets minimal Maven version and Java version-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -109,12 +108,10 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.5.4</version>
- <message>You need Maven 3.5.4 or higher</message>
+ <version>3.6.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
- <message>You need Java 11 or higher</message>
</requireJavaVersion>
</rules>
</configuration>
@@ -145,7 +142,7 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>${asciidoctor.maven.plugin.version}</version>
+ <version>2.2.1</version>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
@@ -172,8 +169,11 @@
</goals>
<configuration>
<backend>html5</backend>
+ <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
<outputFile>${project.build.directory}/generated-docs/jakarta-expression-language-spec-${project.version}.html</outputFile>
<attributes>
+ <source-highlighter>coderay</source-highlighter>
+ <imagesdir>images</imagesdir>
<doctype>book</doctype>
<status>${status}</status>
<data-uri />
@@ -195,8 +195,11 @@
</goals>
<configuration>
<backend>pdf</backend>
+ <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
<outputFile>${project.build.directory}/generated-docs/jakarta-expression-language-spec-${project.version}.pdf</outputFile>
<attributes>
+ <source-highlighter>coderay</source-highlighter>
+ <imagesdir>images</imagesdir>
<pdf-stylesdir>${project.basedir}/src/main/theme</pdf-stylesdir>
<pdf-style>jakartaee</pdf-style>
<doctype>book</doctype>
@@ -217,7 +220,6 @@
</executions>
<configuration>
<sourceDocumentName>expression-language-spec.adoc</sourceDocumentName>
- <sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<revnumber>${project.version}</revnumber>
<revremark>${status}</revremark>
