Skip to content

Commit

Permalink
Processing feedback
Browse files Browse the repository at this point in the history
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
  • Loading branch information
arjantijms committed Apr 10, 2020
1 parent a318e54 commit 8da89ff
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 71 deletions.
35 changes: 17 additions & 18 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
-->

<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>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<relativePath/>
<relativePath />
</parent>

<groupId>jakarta.servlet.jsp</groupId>
Expand Down Expand Up @@ -129,8 +130,8 @@
</resource>
</resources>
<plugins>
<!-- Restricts the Java version to 1.8 -->
<plugin>
<!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
Expand All @@ -141,18 +142,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>false</debug>
<!-- skip files not under SCM-->
<!-- skip files not under SCM -->
<scmOnly>true</scmOnly>
<!-- turn off warnings -->
<warn>true</warn>
Expand All @@ -164,7 +165,7 @@
</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>
Expand Down Expand Up @@ -209,7 +210,7 @@
</excludes>
</configuration>
</plugin>

<!-- Creates the source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -220,17 +221,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>
Expand Down Expand Up @@ -278,7 +277,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
79 changes: 39 additions & 40 deletions impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
-->

<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 Down Expand Up @@ -62,11 +63,11 @@

<mailingLists>
<mailingList>
<name>Jakarta Server Pages dev mailing list</name>
<post>jsp-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/jsp-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/jsp-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/jsp-dev</archive>
<name>Jakarta Server Pages dev mailing list</name>
<post>jsp-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/jsp-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/jsp-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/jsp-dev</archive>
</mailingList>
</mailingLists>

Expand Down Expand Up @@ -106,18 +107,18 @@
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.0.0-M1</version>
</dependency>

<!-- Other dependencies -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.7</version>
</dependency>
<dependency>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
<version>3.1.0</version>
<scope>compile</scope>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

Expand All @@ -138,9 +139,9 @@
<targetPath>META-INF/services</targetPath>
</resource>
</resources>

<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<!-- Sets minimal Maven version to 3.3.0 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -161,7 +162,7 @@
</execution>
</executions>
</plugin>

<!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -185,7 +186,7 @@
</excludes>
</configuration>
</plugin>

<!-- Creates the OSGi MANIFEST.MF file -->
<plugin>
<groupId>org.apache.felix</groupId>
Expand All @@ -207,7 +208,7 @@
</execution>
</executions>
</plugin>

<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -228,7 +229,7 @@
</archive>
</configuration>
</plugin>

<!-- Creates the source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -239,39 +240,37 @@
</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>
<version>2.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<groups>
<group>
<title>Jakarta Server Pages API Documentation</title>
<packages>jakarta.servlet.jsp</packages>
</group>
</groups>
</configuration>
</execution>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<groups>
<group>
<title>Jakarta Server Pages API Documentation</title>
<packages>jakarta.servlet.jsp</packages>
</group>
</groups>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
11 changes: 5 additions & 6 deletions jdsol-spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<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/maven-v4_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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<relativePath/>
<relativePath />
</parent>

<groupId>jakarta.jdsol</groupId>
Expand Down Expand Up @@ -156,7 +157,7 @@
</attributes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -175,9 +176,7 @@
</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>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
-->

<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 Down
11 changes: 5 additions & 6 deletions spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<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>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<relativePath/>
<relativePath />
</parent>

<groupId>jakarta.el</groupId>
Expand Down Expand Up @@ -155,7 +156,7 @@
</attributes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -174,9 +175,7 @@
</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>
Expand Down

0 comments on commit 8da89ff

Please sign in to comment.