diff --git a/bom/pom.xml b/bom/pom.xml new file mode 100644 index 0000000000..bef9f8bb9d --- /dev/null +++ b/bom/pom.xml @@ -0,0 +1,203 @@ + + + + 4.0.0 + + + org.jenkins-ci.main + jenkins-parent + ${revision}${changelist} + + + org.jenkins-ci.main + jenkins-bom + pom + + Jenkins BOM + The module contains dependencies that are used by a specific Jenkins version + + + + 11.0.1 + 1.7.26 + + + + + + com.github.spotbugs + spotbugs-annotations + 3.1.11 + + + net.jcip + jcip-annotations + 1.0 + + + org.apache.ant + ant + 1.9.14 + + + commons-io + commons-io + 2.6 + + + commons-lang + commons-lang + 2.6 + + + commons-httpclient + commons-httpclient + 3.1-jenkins-1 + + + org.jenkins-ci.main + remoting + ${remoting.version} + + + com.google.guava + guava + ${guavaVersion} + + + com.google.guava + guava-testlib + ${guavaVersion} + + + com.google.inject + guice + 4.0 + + + + + org.slf4j + slf4j-api + ${slf4jVersion} + + + org.slf4j + slf4j-jdk14 + ${slf4jVersion} + + + org.slf4j + jcl-over-slf4j + ${slf4jVersion} + + + commons-logging + commons-logging + 1.2 + provided + + + org.slf4j + log4j-over-slf4j + ${slf4jVersion} + + + log4j + log4j + 1.2.17 + provided + + + org.samba.jcifs + jcifs + 1.3.17-kohsuke-1 + + + org.kohsuke + access-modifier-annotation + ${access-modifier-annotation.version} + + + + + javax.servlet + + servlet-api + [0] + + provided + true + + + + commons-codec + commons-codec + 1.12 + + + + org.jenkins-ci + annotation-indexer + 1.12 + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + + true + ${project.build.directory} + ${project.artifactId}-${project.version}.pom + + + + flatten + process-resources + + flatten + + + bom + + + + + + + + diff --git a/cli/pom.xml b/cli/pom.xml index 5d3738bd42..3f98578ed5 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -18,6 +18,18 @@ Medium + + + + org.jenkins-ci.main + jenkins-bom + ${project.version} + pom + import + + + + org.powermock diff --git a/core/pom.xml b/core/pom.xml index dc8cc5330b..4c4ef6563b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -44,6 +44,19 @@ THE SOFTWARE. 2.4.12 + + + + org.jenkins-ci.main + jenkins-bom + ${project.version} + pom + import + + + + + org.jenkins-ci.plugins.icon-shim @@ -53,7 +66,6 @@ THE SOFTWARE. ${project.groupId} remoting - ${project.groupId} diff --git a/pom.xml b/pom.xml index c09b549f89..2747c44917 100755 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,7 @@ THE SOFTWARE. + bom core war test-pom @@ -90,17 +91,11 @@ THE SOFTWARE. https://api.github.com jenkins-jira - 11.0.1 - 1.7.26 2.14 2.3 1.14 0.11 ${skipTests} - 1.14 - ${access-modifier.version} - ${access-modifier.version} - 8 https://jenkins.io/changelog @@ -116,6 +111,10 @@ THE SOFTWARE. Max High ${project.basedir}/../src/findbugs/findbugs-excludes.xml + + + 1.14 + 1.14 - - org.apache.ant - ant - 1.9.14 - - - - commons-io - commons-io - 2.6 - - - - commons-lang - commons-lang - 2.6 - org.mockito @@ -178,78 +161,6 @@ THE SOFTWARE. 2.6 - - commons-httpclient - commons-httpclient - 3.1-jenkins-1 - - - - org.jenkins-ci.main - remoting - ${remoting.version} - - - - com.google.guava - guava - ${guavaVersion} - - - com.google.guava - guava-testlib - ${guavaVersion} - - - - com.google.inject - guice - 4.0 - - - - - org.slf4j - slf4j-api - ${slf4jVersion} - - - org.slf4j - slf4j-jdk14 - ${slf4jVersion} - - - org.slf4j - jcl-over-slf4j - ${slf4jVersion} - - - commons-logging - commons-logging - 1.2 - provided - - - org.slf4j - log4j-over-slf4j - ${slf4jVersion} - - - log4j - log4j - 1.2.17 - provided - - - org.samba.jcifs - jcifs - 1.3.17-kohsuke-1 - - - org.kohsuke - access-modifier-annotation - ${access-modifier-annotation.version} - @@ -268,18 +179,6 @@ THE SOFTWARE. provided true - - - commons-codec - commons-codec - 1.12 - - - - org.jenkins-ci - annotation-indexer - 1.12 - diff --git a/test-pom/pom.xml b/test-pom/pom.xml index c0cfecf61f..cd37d10864 100644 --- a/test-pom/pom.xml +++ b/test-pom/pom.xml @@ -45,6 +45,13 @@ THE SOFTWARE. + + org.jenkins-ci.main + jenkins-bom + ${project.version} + pom + import + com.google.code.findbugs annotations diff --git a/war/pom.xml b/war/pom.xml index 61558dfbfc..985e8e115e 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -45,6 +45,18 @@ THE SOFTWARE. 0.24.5 + + + + org.jenkins-ci.main + jenkins-bom + ${project.version} + pom + import + + + + org.jenkins-ci