Clean poms, formatting, versions and automatic module id

Signed-off-by: arjantijms <arjan.tijms@gmail.com>
jakartaee · Aug 24, 2020 · 506e891 · 506e891
1 parent 1fb4874
commit 506e891
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 23 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -45,7 +45,6 @@
             <email>jsp-dev@eclipse.org</email>
         </developer>
     </developers>
-
     <contributors>
        <contributor>
            <name>Jakarta Server Pages Contributors</name>
@@ -70,7 +69,6 @@
         <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>
@@ -89,7 +87,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0-M2</version>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -117,7 +115,6 @@
                 <targetPath>META-INF</targetPath>
             </resource>
         </resources>
-
         <plugins>
             <!-- Sets minimal Maven version to 3.5.4 -->
             <plugin>
@@ -217,7 +214,7 @@
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         <manifestEntries>
-                            <Automatic-Module-Name>jakarta.servlet.jsp.api</Automatic-Module-Name>
+                            <Automatic-Module-Name>jakarta.servlet.jsp</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                     <excludes>
@@ -291,5 +288,4 @@ Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -44,7 +44,6 @@
             <email>jsp-dev@eclipse.org</email>
         </developer>
     </developers>
-
     <contributors>
        <contributor>
            <name>Jakarta Server Pages Contributors</name>
@@ -69,7 +68,6 @@
         <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>
@@ -142,7 +140,6 @@
                 <targetPath>META-INF/services</targetPath>
             </resource>
         </resources>
-
         <plugins>
             <!-- Sets minimal Maven version to 3.5.4 -->
             <plugin>
@@ -195,7 +192,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifestFile>
@@ -240,7 +237,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

diff --git a/jdsol-spec/pom.xml b/jdsol-spec/pom.xml
@@ -35,7 +35,6 @@
     <name>Jakarta Debugging Support for Other Languages Specification</name>
     <description>Jakarta Debugging Support for Other Languages - Specification</description>
     <url>https://projects.eclipse.org/projects/ee4j.jsp</url>
-
     <licenses>
         <license>
             <name>Eclipse Foundation Specification License – v1.0</name>
@@ -52,7 +51,6 @@
             <email>jsp-dev@eclipse.org</email>
         </developer>
     </developers>
-
     <contributors>
        <contributor>
            <name>Jakarta Server Pages Contributors</name>
@@ -77,7 +75,6 @@
         <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>
@@ -87,9 +84,9 @@
         <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.3.0</asciidoctorj.version>
+        <asciidoctorj.version>2.4.0</asciidoctorj.version>
         <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
-        <jruby.version>9.2.12.0</jruby.version>
+        <jruby.version>9.2.13.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>
@@ -235,7 +232,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>

diff --git a/pom.xml b/pom.xml
@@ -43,4 +43,29 @@
         <module>impl</module>
     </modules>
 
+    <build>
+        <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-M3</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.5.4</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/spec/pom.xml b/spec/pom.xml
@@ -34,7 +34,6 @@
     <name>Jakarta Server Pages Specification</name>
     <description>Jakarta Server Pages - Specification</description>
     <url>https://projects.eclipse.org/projects/ee4j.jsp</url>
-
     <licenses>
         <license>
             <name>Eclipse Foundation Specification License – v1.0</name>
@@ -51,7 +50,6 @@
             <email>jsp-dev@eclipse.org</email>
         </developer>
     </developers>
-
     <contributors>
        <contributor>
            <name>Jakarta Server Pages Contributors</name>
@@ -76,7 +74,6 @@
         <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>
@@ -85,9 +82,9 @@
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctorj.version>2.3.0</asciidoctorj.version>
+        <asciidoctorj.version>2.4.0</asciidoctorj.version>
         <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
-        <jruby.version>9.2.12.0</jruby.version>
+        <jruby.version>9.2.13.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>
@@ -233,7 +230,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>