Support the provided scope by the PomBuilder class

rife2 · Jun 23, 2024 · 4f20fb2 · 4f20fb2
1 parent e65668a
commit 4f20fb2
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 17 deletions.
diff --git a/src/main/java/rife/bld/publish/PomBuilder.java b/src/main/java/rife/bld/publish/PomBuilder.java
@@ -152,6 +152,7 @@ public String build() {
         if (dependencies() != null && !dependencies().isEmpty()) {
             addDependencies(t, Scope.compile);
             addDependencies(t, Scope.runtime);
+            addDependencies(t, Scope.provided);
             t.setBlock("dependencies-tag");
         }
 

diff --git a/src/test/java/rife/bld/publish/TestPomBuilder.java b/src/test/java/rife/bld/publish/TestPomBuilder.java
@@ -419,6 +419,41 @@ void testDependenciesRuntime() {
                 """, builder.build());
     }
 
+    @Test
+    void testDependenciesProvided() {
+        var builder = new PomBuilder();
+        builder.dependencies().scope(Scope.provided)
+            .include(new Dependency("org.eclipse.jetty.ee10", "jetty-ee10", new VersionNumber(12,0,7)))
+            .include(new Dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,7)));
+        assertEquals("""
+                <?xml version="1.0" encoding="UTF-8"?>
+                <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                  <modelVersion>4.0.0</modelVersion>
+                  <groupId></groupId>
+                  <artifactId></artifactId>
+                  <version></version>
+                  <name></name>
+                  <description></description>
+                  <url></url>
+                  <dependencies>
+                    <dependency>
+                      <groupId>org.eclipse.jetty.ee10</groupId>
+                      <artifactId>jetty-ee10</artifactId>
+                      <version>12.0.7</version>
+                      <scope>provided</scope>
+                    </dependency>
+                    <dependency>
+                      <groupId>org.eclipse.jetty.ee10</groupId>
+                      <artifactId>jetty-ee10-servlet</artifactId>
+                      <version>12.0.7</version>
+                      <scope>provided</scope>
+                    </dependency>
+                  </dependencies>
+                </project>
+                """, builder.build());
+    }
+
     @Test
     void testDependencies() {
         var builder = new PomBuilder();
@@ -428,9 +463,10 @@ void testDependencies() {
                 .include(new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4))
                         .exclude("*", "artifactId"));
         builder.dependencies().scope(Scope.runtime)
-                .include(new Dependency("com.uwyn.rife2", "rife2", VersionNumber.UNKNOWN, "agent"))
-                .include(new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14))
-                        .exclude("*", "*").exclude("groupId", "artifactId"));
+                .include(new Dependency("com.uwyn.rife2", "rife2", VersionNumber.UNKNOWN, "agent"));
+        builder.dependencies().scope(Scope.provided)
+            .include(new Dependency("org.eclipse.jetty.ee10", "jetty-ee10", new VersionNumber(12,0,7)))
+            .include(new Dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,7)));
         assertEquals("""
                 <?xml version="1.0" encoding="UTF-8"?>
                 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
@@ -475,20 +511,16 @@ void testDependencies() {
                       <scope>runtime</scope>
                     </dependency>
                     <dependency>
-                      <groupId>org.eclipse.jetty</groupId>
-                      <artifactId>jetty-server</artifactId>
-                      <version>11.0.14</version>
-                      <scope>runtime</scope>
-                      <exclusions>
-                        <exclusion>
-                          <groupId>*</groupId>
-                          <artifactId>*</artifactId>
-                        </exclusion>
-                        <exclusion>
-                          <groupId>groupId</groupId>
-                          <artifactId>artifactId</artifactId>
-                        </exclusion>
-                      </exclusions>
+                      <groupId>org.eclipse.jetty.ee10</groupId>
+                      <artifactId>jetty-ee10</artifactId>
+                      <version>12.0.7</version>
+                      <scope>provided</scope>
+                    </dependency>
+                    <dependency>
+                      <groupId>org.eclipse.jetty.ee10</groupId>
+                      <artifactId>jetty-ee10-servlet</artifactId>
+                      <version>12.0.7</version>
+                      <scope>provided</scope>
                     </dependency>
                   </dependencies>
                 </project>