Cleanup of poms

* Formatting * Removing unused/unnecessary plug-ins * Updating leftover terms (JavaServer to Jakarta Server, ...) Signed-off-by: arjantijms <arjan.tijms@gmail.com>
jakartaee · Apr 10, 2020 · a318e54 · a318e54
1 parent 58a9f16
commit a318e54
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 255 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -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/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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -33,23 +32,10 @@
     <artifactId>jakarta.servlet.jsp-api</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    
+
     <name>Jakarta Server Pages API</name>
     <description>Jakarta Server Pages API</description>
     <url>https://projects.eclipse.org/projects/ee4j.jsp</url>
-
-    <properties>
-        <!-- Make sure the two versions are in sync with the maven version -->
-        <spec.version>3.0</spec.version>
-        <bundle.version>3.0.0-SNAPSHOT</bundle.version>
-        <extensionName>jakarta.servlet.jsp</extensionName>
-        <bundle.symbolicName>jakarta.servlet.jsp-api</bundle.symbolicName>
-        <vendorName>Eclipse Foundation</vendorName>
-        <findbugs.version>2.5.2</findbugs.version>
-        <findbugs.exclude />
-        <findbugs.threshold>High</findbugs.threshold>
-    </properties>
-
     <licenses>
         <license>
             <name>EPL 2.0</name>
@@ -63,10 +49,19 @@
         </license>
     </licenses>
 
-    <issueManagement>
-        <system>github</system>
-        <url>https://github.com/eclipse-ee4j/jsp-api/issues</url>
-    </issueManagement>
+    <developers>
+        <developer>
+            <id>yaminikb</id>
+            <name>Yamini K B</name>
+            <organization>Oracle Corporation</organization>
+            <organizationUrl>http://www.oracle.com</organizationUrl>
+        </developer>
+    </developers>
+    <contributors>
+        <contributor>
+            <name>Kin Man Chung</name>
+        </contributor>
+    </contributors>
 
     <mailingLists>
         <mailingList>
@@ -84,21 +79,37 @@
         <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>
 
-    <developers>
-        <developer>
-            <id>yaminikb</id>
-            <name>Yamini K B</name>
-            <organization>Oracle Corporation</organization>
-            <organizationUrl>http://www.oracle.com</organizationUrl>
-        </developer>
-    </developers>
+    <properties>
+        <!-- Make sure the two versions are in sync with the maven version -->
+        <spec.version>3.0</spec.version>
+        <bundle.version>3.0.0-SNAPSHOT</bundle.version>
+        <extensionName>jakarta.servlet.jsp</extensionName>
+        <bundle.symbolicName>jakarta.servlet.jsp-api</bundle.symbolicName>
+        <vendorName>Eclipse Foundation</vendorName>
+        <findbugs.version>2.5.2</findbugs.version>
+        <findbugs.exclude />
+        <findbugs.threshold>High</findbugs.threshold>
+    </properties>
 
-    <contributors>
-        <contributor>
-            <name>Kin Man Chung</name>
-        </contributor>
-    </contributors>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0-M1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+            <version>4.0.0-RC1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <resources>
@@ -117,7 +128,6 @@
                 <targetPath>META-INF</targetPath>
             </resource>
         </resources>
-
         <plugins>
              <!-- Restricts the Java version to 1.8 -->
              <plugin>
@@ -278,7 +288,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>          
+                <version>1.6</version>
             </plugin>
         </plugins>
     </build>
@@ -296,19 +306,4 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
             </plugin>
         </plugins>
     </reporting>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0-M1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.el</groupId>
-            <artifactId>jakarta.el-api</artifactId>
-            <version>4.0.0-RC1</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
 </project>