Skip to content

Commit

Permalink
Update dependency versions and copyright in poms
Browse files Browse the repository at this point in the history 
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
  • Loading branch information
@arjantijms
arjantijms committed Dec 11, 2021
1 parent a9c4363 commit 87371bf
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 21 deletions.
9 changes: 5 additions & 4 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
</resource>
</resources>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<!-- Sets minimal Maven version to 3.6.0 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -117,8 +117,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
<version>3.6.0</version>
<message>You need Maven 3.6.0 or higher</message>
</requireMavenVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -239,13 +239,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 &#169; 2018, 2020 Eclipse Foundation. All rights reserved.<br>
Copyright &#169; 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>
Expand Down
17 changes: 9 additions & 8 deletions impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -106,11 +106,11 @@
</resource>
</resources>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<!-- Sets minimal Maven version to 3.6.0 -->
<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>
Expand All @@ -120,8 +120,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
<version>3.6.0</version>
<message>You need Maven 3.6.0 or higher</message>
</requireMavenVersion>
</rules>
</configuration>
Expand All @@ -135,7 +135,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>
Expand Down Expand Up @@ -190,7 +190,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>
Expand All @@ -200,6 +200,7 @@
<configuration>
<source>11</source>
<additionalJOption>-Xdoclint:none</additionalJOption>
<quiet>true</quiet>
<groups>
<group>
<title>Jakarta Expression Language ${project.version} Implementation</title>
Expand All @@ -208,7 +209,7 @@
</groups>
<bottom><![CDATA[
Comments to: <a href="mailto:el-dev@eclipse.org">el-dev@eclipse.org</a>.<br>
Copyright &#169; 2018, 2020 Eclipse Foundation. All rights reserved.<br>
Copyright &#169; 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>
Expand Down
22 changes: 13 additions & 9 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 to 3.6.0 and Java version to 11 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -109,8 +108,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
<version>3.6.0</version>
<message>You need Maven 3.6.0 or higher</message>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
Expand Down Expand Up @@ -145,7 +144,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>
Expand All @@ -172,8 +171,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 />
Expand All @@ -195,8 +197,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>
Expand All @@ -217,7 +222,6 @@
</executions>
<configuration>
<sourceDocumentName>expression-language-spec.adoc</sourceDocumentName>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<revnumber>${project.version}</revnumber>
<revremark>${status}</revremark>
Expand Down

0 comments on commit 87371bf

Please sign in to comment.