Skip to content

Commit

Permalink
Compare/align POMs with Jakarta EL
Browse files Browse the repository at this point in the history
  • Loading branch information
@markt-asf
markt-asf committed Jun 12, 2020
1 parent 7016bf3 commit 8268844
Show file tree
Hide file tree
Showing 5 changed files with 230 additions and 195 deletions.
38 changes: 16 additions & 22 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<relativePath />
<relativePath/>
</parent>

<groupId>jakarta.servlet.jsp</groupId>
Expand All @@ -36,31 +36,22 @@
<name>Jakarta Server Pages API</name>
<description>Jakarta Server Pages API</description>
<url>https://projects.eclipse.org/projects/ee4j.jsp</url>
<licenses>
<license>
<name>EPL 2.0</name>
<url>http://www.eclipse.org/legal/epl-2.0</url>
<distribution>repo</distribution>
</license>
<license>
<name>GPL2 w/ CPE</name>
<url>https://www.gnu.org/software/classpath/license.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>yaminikb</id>
<name>Yamini K B</name>
<organization>Oracle Corporation</organization>
<organizationUrl>http://www.oracle.com</organizationUrl>
<id>jakarta-ee4j-jsp</id>
<name>Jakarta Server Pages Developers</name>
<organization>Eclipse Foundation</organization>
<email>jsp-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Kin Man Chung</name>
</contributor>
<contributor>
<name>Jakarta Server Pages Contributors</name>
<email>jsp-dev@eclipse.org</email>
<url>https://github.com/eclipse-ee4j/jsp-api/graphs/contributors</url>
</contributor>
</contributors>

<mailingLists>
Expand All @@ -79,6 +70,7 @@
<url>https://github.com/eclipse-ee4j/jsp-api</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/jsp-api/issues</url>
Expand All @@ -103,7 +95,7 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -125,12 +117,13 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>

<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -141,6 +134,7 @@
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
120 changes: 58 additions & 62 deletions impl/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -24,6 +25,7 @@
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<relativePath/>
</parent>

<groupId>org.glassfish.web</groupId>
Expand All @@ -33,31 +35,22 @@
<name>Jakarta Server Pages implementation</name>
<description>JavaServer Pages API</description>
<url>https://projects.eclipse.org/projects/ee4j.jsp</url>
<licenses>
<license>
<name>EPL 2.0</name>
<url>http://www.eclipse.org/legal/epl-2.0</url>
<distribution>repo</distribution>
</license>
<license>
<name>GPL2 w/ CPE</name>
<url>https://www.gnu.org/software/classpath/license.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>yaminikb</id>
<name>Yamini K B</name>
<organization>Oracle Corporation</organization>
<organizationUrl>http://www.oracle.com</organizationUrl>
<id>jakarta-ee4j-jsp</id>
<name>Jakarta Server Pages Developers</name>
<organization>Eclipse Foundation</organization>
<email>jsp-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Kin Man Chung</name>
</contributor>
<contributor>
<name>Jakarta Server Pages Contributors</name>
<email>jsp-dev@eclipse.org</email>
<url>https://github.com/eclipse-ee4j/jsp-api/graphs/contributors</url>
</contributor>
</contributors>

<mailingLists>
Expand All @@ -76,12 +69,15 @@
<url>https://github.com/eclipse-ee4j/jsp-api</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/jsp-api/issues</url>
</issueManagement>

<properties>
<!-- the bundle build number must be the same as the maven number -->
<bundle.version>${project.version}</bundle.version>
<spec.version>3.0</spec.version>
<extensionName>jakarta.servlet.jsp</extensionName>
<bundle.symbolicName>org.glassfish.web.jakarta.servlet.jsp</bundle.symbolicName>
Expand All @@ -99,12 +95,12 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0-RC1</version>
<version>4.0.0-RC2</version>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.0.0-M1</version>
<version>${bundle.version}</version>
</dependency>

<!-- Other dependencies -->
Expand All @@ -130,6 +126,14 @@
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>${project.basedir}/..</directory>
<includes>
<include>LICENSE.md</include>
<include>NOTICE.md</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
Expand All @@ -138,12 +142,13 @@
<targetPath>META-INF/services</targetPath>
</resource>
</resources>

<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -154,38 +159,17 @@
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgument>-Xlint:unchecked</compilerArgument>
<excludes>
<exclude>
org/apache/jasper/compiler/JDTJavaCompiler.java
</exclude>
<exclude>
org/apache/jasper/compiler/AntJavaCompiler.java
</exclude>
<exclude>
<!-- This is only used by AntJavaCompiler -->
org/apache/jasper/util/SystemLogHandler.java
</exclude>
</excludes>
</configuration>
</plugin>

<!-- Creates the OSGi MANIFEST.MF file -->
<!-- Configure maven-bundle-plugin to generate OSGi manifest. Please note: we use the manifest goal only and not the bundle goal.
The bundle goal can lead to very surprising results if the package names are not correctly specified. So, we use the jar plugin to generate the
jar. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -228,22 +212,28 @@
</configuration>
</plugin>

<!-- Creates the source jar -->
<!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<includePom>true</includePom>
<source>1.8</source>
<target>1.8</target>
<compilerArgument>-Xlint:unchecked</compilerArgument>
<excludes>
<exclude>
org/apache/jasper/compiler/JDTJavaCompiler.java
</exclude>
<exclude>
org/apache/jasper/compiler/AntJavaCompiler.java
</exclude>
<exclude>
<!-- This is only used by AntJavaCompiler -->
org/apache/jasper/util/SystemLogHandler.java
</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Create Javadoc for API jar -->
Expand All @@ -262,10 +252,16 @@
<additionalJOption>-Xdoclint:none</additionalJOption>
<groups>
<group>
<title>Jakarta Server Pages API Documentation</title>
<packages>jakarta.servlet.jsp</packages>
<title>Jakarta Server Pages ${spec.version} Implementation</title>
<packages>org.apache.jasper</packages>
<packages>glassfish.jsp.api</packages>
</group>
</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>
Use is subject to <a href="http://www.eclipse.org/legal/epl-2.0" target="_top">license terms</a>.]]>
</bottom>
</configuration>
</execution>
</executions>
Expand Down
Loading

0 comments on commit 8268844

Please sign in to comment.