Skip to content

Commit

Permalink
Merge pull request #192 from arjantijms/update_pom_versions
Browse files Browse the repository at this point in the history 
Update versions in pom, specifically project to 3.0/EE 10
  • Loading branch information
@arjantijms
arjantijms authored Dec 22, 2021
2 parents a3f6454 + 87f7267 commit 6e44333
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 58 deletions.
34 changes: 14 additions & 20 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -31,7 +30,7 @@

<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Jakarta Standard Tag Library API</name>
Expand Down Expand Up @@ -89,18 +88,18 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0</version>
<version>5.0.0</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -130,11 +129,11 @@
</resource>
</resources>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 and Java version to 11 -->
<!-- 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>
Expand All @@ -144,12 +143,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<version>3.6.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
<message>You need Java 11 or higher</message>
</requireJavaVersion>
</rules>
</configuration>
</execution>
Expand All @@ -173,7 +168,7 @@
<version>2.1</version>
<configuration>
<spec>
<specVersion>2.0</specVersion>
<specVersion>3.0</specVersion>
<specImplVersion>${project.version}</specImplVersion>
<apiPackage>jakarta.servlet.jsp.jstl</apiPackage>
</spec>
Expand All @@ -192,7 +187,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<version>5.1.3</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
Expand Down Expand Up @@ -241,7 +236,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<configuration>
<includePom>true</includePom>
</configuration>
Expand All @@ -261,7 +256,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>timestamp-property</id>
Expand All @@ -280,7 +275,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-api-javadocs</id>
Expand Down Expand Up @@ -312,5 +307,4 @@ Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license
</plugin>
</plugins>
</build>

</project>
</project>
31 changes: 13 additions & 18 deletions impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -31,7 +30,7 @@

<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Jakarta Standard Tag Library Implementation</name>
Expand Down Expand Up @@ -89,25 +88,25 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0</version>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>2.0.0</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
Expand Down Expand Up @@ -145,9 +144,8 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>

<plugins>
<!-- Sets minimal Maven version to 3.5.4 and Java version to 11 -->
<!-- Sets minimal Maven version -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -161,12 +159,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<version>3.6.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
<message>You need Java 11 or higher</message>
</requireJavaVersion>
</rules>
</configuration>
</execution>
Expand All @@ -187,7 +181,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<version>5.1.3</version>
<configuration>
<instructions>
<Bundle-SymbolicName>org.glassfish.web.jakarta.servlet.jsp.jstl</Bundle-SymbolicName>
Expand Down Expand Up @@ -357,7 +351,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<configuration>
<includePom>true</includePom>
</configuration>
Expand All @@ -377,7 +371,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>timestamp-property</id>
Expand All @@ -396,10 +390,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<configuration>
<source>11</source>
<additionalJOption>-Xdoclint:none</additionalJOption>
<quiet>true</quiet>
<bottom><![CDATA[
Copyright &#169; 2019, ${current.year} Eclipse Foundation. All rights reserved.
]]>
Expand Down
29 changes: 25 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.glassfish.web</groupId>
<artifactId>jstl</artifactId>
<version>2.0-SNAPSHOT</version>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>GlassFish Jakarta Standard Tag Library related modules</name>
Expand Down Expand Up @@ -85,17 +85,17 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -105,6 +105,27 @@
</plugins>
</pluginManagement>
<plugins>
<!-- Sets minimal Maven version -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand Down
32 changes: 16 additions & 16 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

<groupId>jakarta.stl</groupId>
<artifactId>jakarta-stl-spec</artifactId>
<version>2.0-SNAPSHOT</version>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jakarta Standard Tag Library Specification</name>

<scm>
Expand All @@ -49,10 +49,9 @@
<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.4.1</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 @@ -62,11 +61,11 @@
<build>
<defaultGoal>package</defaultGoal>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 and Java version to 11 -->
<!-- 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>
Expand All @@ -76,12 +75,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<version>3.6.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
<message>You need Java 11 or higher</message>
</requireJavaVersion>
</rules>
</configuration>
</execution>
Expand All @@ -90,7 +85,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>timestamp-property</id>
Expand All @@ -109,7 +104,7 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.0.0-RC.1</version>
<version>2.2.1</version>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
Expand All @@ -136,8 +131,11 @@
</goals>
<configuration>
<backend>html5</backend>
<sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
<outputFile>${project.build.directory}/generated-docs/jstl-spec-${project.version}.html</outputFile>
<attributes>
<source-highlighter>coderay</source-highlighter>
<imagesdir>images</imagesdir>
<doctype>book</doctype>
<status>${status}</status>
<data-uri />
Expand All @@ -159,8 +157,11 @@
</goals>
<configuration>
<backend>pdf</backend>
<sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
<outputFile>${project.build.directory}/generated-docs/jstl-spec-${project.version}.pdf</outputFile>
<attributes>
<source-highlighter>coderay</source-highlighter>
<imagesdir>images</imagesdir>
<pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir>
<pdf-style>jakartaee</pdf-style>
<doctype>book</doctype>
Expand All @@ -181,7 +182,6 @@
</executions>
<configuration>
<sourceDocumentName>jakarta-stl-spec.adoc</sourceDocumentName>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<revnumber>${project.version}</revnumber>
<revremark>${status}</revremark>
Expand Down

0 comments on commit 6e44333

Please sign in to comment.