[JENKINS-50475] Add support for scope "import"

jenkinsci · Apr 13, 2018 · fa3c5b4 · fa3c5b4
1 parent bef24d2
commit fa3c5b4
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 0 deletions.
diff --git a/...src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/PipelineGraphPublisher.java b/...src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/PipelineGraphPublisher.java
@@ -49,6 +49,8 @@ public class PipelineGraphPublisher extends MavenPublisher {
 
     private boolean includeScopeProvided = true;
 
+    private boolean includeScopeImport = true;
+
     private boolean skipDownstreamTriggers;
 
     /**
@@ -74,6 +76,8 @@ protected Set<String> getIncludedScopes() {
             includedScopes.add("provided");
         if (includeScopeTest)
             includedScopes.add("test");
+        if (includeScopeImport)
+            includedScopes.add("import");
         return includedScopes;
     }
 

diff --git a/...sci/plugins/pipeline/maven/test/test_maven_projects/maven_project_with_bom/my-bom/pom.xml b/...sci/plugins/pipeline/maven/test/test_maven_projects/maven_project_with_bom/my-bom/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>jenkins.mvn.test.bom</groupId>
+    <artifactId>my-bom</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>24.1-jre</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/...sci/plugins/pipeline/maven/test/test_maven_projects/maven_project_with_bom/my-jar/pom.xml b/...sci/plugins/pipeline/maven/test/test_maven_projects/maven_project_with_bom/my-jar/pom.xml
@@ -0,0 +1,39 @@
+<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>
+    <groupId>jenkins.mvn.test.bom</groupId>
+    <artifactId>my-app</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.0.1.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.0.1.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
+
diff --git a/..._projects/maven_project_with_bom/my-jar/src/main/java/com/example/MonoModuleMavenApp.java b/..._projects/maven_project_with_bom/my-jar/src/main/java/com/example/MonoModuleMavenApp.java
@@ -0,0 +1,11 @@
+package com.example;
+
+public class MonoModuleMavenApp {
+    /**
+     * TODO message
+     * @param args
+     */
+    public static void main(String[] args) {
+        System.out.println("Hello MonoModuleMavenApp");
+    }
+}
diff --git a/...rojects/maven_project_with_bom/my-jar/src/test/java/com/example/MonoModuleMavenAppIT.java b/...rojects/maven_project_with_bom/my-jar/src/test/java/com/example/MonoModuleMavenAppIT.java
@@ -0,0 +1,14 @@
+package com.example;
+
+import org.junit.Test;
+
+/**
+ * Integration test for the maven-failsafe-plugin
+ */
+public class MonoModuleMavenAppIT {
+
+    @Test
+    public void success(){
+        System.out.println("MonoModuleMavenAppIT#success");
+    }
+}
diff --git a/...jects/maven_project_with_bom/my-jar/src/test/java/com/example/MonoModuleMavenAppTest.java b/...jects/maven_project_with_bom/my-jar/src/test/java/com/example/MonoModuleMavenAppTest.java
@@ -0,0 +1,11 @@
+package com.example;
+
+import org.junit.Test;
+
+public class MonoModuleMavenAppTest {
+
+    @Test
+    public void success(){
+        System.out.println("MonoModuleMavenAppTest#success");
+    }
+}
diff --git a/.../jenkinsci/plugins/pipeline/maven/test/test_maven_projects/maven_project_with_bom/pom.xml b/.../jenkinsci/plugins/pipeline/maven/test/test_maven_projects/maven_project_with_bom/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>jenkins.mvn.test.bom</groupId>
+    <artifactId>multimodule-parent</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>my-bom</module>
+        <module>my-jar</module>
+    </modules>
+</project>