Sort dependencies (#376)

jenkinsci · Jun 25, 2022 · 0128d8e · 0128d8e
1 parent 42e5995
commit 0128d8e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -49,6 +49,11 @@
       <artifactId>commons-io</artifactId>
       <version>2.11.0</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
     <!--
       For compatibility only. TODO once plugins have migrated to Jakarta Annotations,
       this dependency can be dropped.
@@ -58,17 +63,6 @@
       <artifactId>javax.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <!--
         To allow stapler to be used from Groovy, code, we have a bit of tooling
@@ -111,6 +105,12 @@
       <artifactId>asm</artifactId>
       <version>9.3</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.jolira</groupId>
       <artifactId>hickory</artifactId>

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -17,12 +17,6 @@
       <artifactId>stapler-jelly</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
@@ -33,6 +27,12 @@
       <artifactId>metainf-services</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>stapler</artifactId>

diff --git a/jelly/pom.xml b/jelly/pom.xml
@@ -17,12 +17,6 @@
       <artifactId>stapler</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.dom4j</groupId>
       <artifactId>dom4j</artifactId>
@@ -52,6 +46,12 @@
       <artifactId>metainf-services</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>

diff --git a/jrebel/pom.xml b/jrebel/pom.xml
@@ -17,17 +17,17 @@
       <artifactId>stapler</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.kohsuke.metainf-services</groupId>
+      <artifactId>metainf-services</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.kohsuke.metainf-services</groupId>
-      <artifactId>metainf-services</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.zeroturnaround</groupId>
       <artifactId>jr-sdk</artifactId>

diff --git a/jsp/pom.xml b/jsp/pom.xml
@@ -17,6 +17,11 @@
       <artifactId>stapler</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.kohsuke.metainf-services</groupId>
+      <artifactId>metainf-services</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -29,10 +34,5 @@
       <version>2.3.3</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.kohsuke.metainf-services</groupId>
-      <artifactId>metainf-services</artifactId>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 </project>