Compare/align poms with JSP project
Signed-off-by: Mark Thomas <markt@apache.org>
diff --git a/api/pom.xml b/api/pom.xml
index 1973507..ba41861 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -31,7 +31,8 @@
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
-
+ <packaging>jar</packaging>
+
<name>Jakarta Expression Language API</name>
<description>
Jakarta Expression Language defines an expression language for Java applications
@@ -54,7 +55,7 @@
<url>https://github.com/eclipse-ee4j/el-ri/graphs/contributors</url>
</contributor>
</contributors>
-
+
<mailingLists>
<mailingList>
<name>Expression Language dev mailing list</name>
@@ -130,12 +131,12 @@
</execution>
</executions>
</plugin>
-
+
<!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -143,18 +144,18 @@
</configuration>
</plugin>
- <!-- Checks copyright / license headers -->
+ <!-- Checks copyright / license headers -->
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>2.3</version>
<configuration>
<excludeFile>etc/config/copyright-exclude</excludeFile>
- <!--svn|mercurial|git - defaults to svn-->
+ <!--svn|mercurial|git - defaults to svn -->
<scm>git</scm>
<!-- turn on/off debugging -->
- <debug>off</debug>
- <!-- skip files not under SCM-->
+ <debug>false</debug>
+ <!-- skip files not under SCM -->
<scmOnly>true</scmOnly>
<!-- turn off warnings -->
<warn>true</warn>
@@ -166,11 +167,11 @@
</configuration>
</plugin>
- <!-- Creates the OSGi MANIFEST.MF file -->
+ <!-- Creates the OSGi MANIFEST.MF file -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>4.2.1</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
@@ -214,7 +215,7 @@
</excludes>
</configuration>
</plugin>
-
+
<!-- Creates the source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -225,17 +226,15 @@
</configuration>
<executions>
<execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
</execution>
</executions>
</plugin>
-
- <!--
- Create Javadoc for API jar
- -->
+
+ <!-- Create Javadoc for API jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/impl/pom.xml b/impl/pom.xml
index 7351571..70993b5 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -35,7 +35,7 @@
<name>Jakarta Expression Language Implementation</name>
<description>Jakarta Expression Language Implementation</description>
<url>https://projects.eclipse.org/projects/ee4j.el</url>
-
+
<developers>
<developer>
<id>jakarta-ee4j-el</id>
@@ -52,7 +52,7 @@
<url>https://github.com/eclipse-ee4j/el-ri/graphs/contributors</url>
</contributor>
</contributors>
-
+
<mailingLists>
<mailingList>
<name>Expression Language dev mailing list</name>
@@ -87,6 +87,20 @@
<findbugs.threshold>High</findbugs.threshold>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>${bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -105,8 +119,7 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>
-
-
+
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
@@ -137,20 +150,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>4.2.1</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Description>
- Jakarta Expression Language ${spec.version} Implementation
- </Bundle-Description>
- <Bundle-Version>${bundle.version}</Bundle-Version>
- <Extension-Name>${extensionName}</Extension-Name>
- <Specification-Version>${spec.version}</Specification-Version>
- <Specification-Vendor>${vendorName}</Specification-Vendor>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${vendorName}</Implementation-Vendor>
- <Export-Package>com.sun.el</Export-Package>
+ <_include>-osgi.bundle</_include>
</instructions>
</configuration>
<executions>
@@ -163,21 +167,33 @@
</execution>
</executions>
</plugin>
-
+
+ <!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>
+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+ </manifestFile>
+ <manifestEntries>
+ <Extension-Name>${extensionName}</Extension-Name>
+ <Specification-Version>${spec.version}</Specification-Version>
+ <Specification-Vendor>${vendorName}</Specification-Vendor>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${vendorName}</Implementation-Vendor>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
-
+
+ <!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -185,6 +201,7 @@
</configuration>
</plugin>
+ <!-- Create Javadoc for API jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -271,18 +288,4 @@
</plugins>
</reporting>
- <dependencies>
- <dependency>
- <groupId>jakarta.el</groupId>
- <artifactId>jakarta.el-api</artifactId>
- <version>${bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
</project>
diff --git a/spec/pom.xml b/spec/pom.xml
index 4bec539..78e2e6a 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -85,10 +85,10 @@
<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>1.6.2</asciidoctorj.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
- <jruby.version>9.2.6.0</jruby.version>
+ <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
+ <asciidoctorj.version>2.2.0</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
+ <jruby.version>9.2.11.1</jruby.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -228,32 +228,12 @@
</attributes>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>${release.arguments}</arguments>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-gitexe</artifactId>
- <version>1.9.4</version>
- </dependency>
- </dependencies>
- </plugin>
- <!--
- This is the rule that builds the zip file for download.
- -->
+ <!-- This is the rule that builds the zip file for download. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
