Skip to content

Commit

Permalink
Adopt POM Code Convention (#801)
Browse files Browse the repository at this point in the history
  • Loading branch information
@basil
basil authored Dec 28, 2021
1 parent 365e483 commit 14bef33
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 59 deletions.
2 changes: 1 addition & 1 deletion bom-2.289.x/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<groupId>${project.groupId}</groupId>
<artifactId>bom-2.303.x</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bom-2.303.x/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<groupId>${project.groupId}</groupId>
<artifactId>bom-2.319.x</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bom-2.319.x/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
20 changes: 10 additions & 10 deletions bom-weekly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<classifier>tests</classifier>
<version>${workflow-api-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -145,8 +145,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<classifier>tests</classifier>
<version>${workflow-cps-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -166,8 +166,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<classifier>tests</classifier>
<version>${workflow-job-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -177,8 +177,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<classifier>tests</classifier>
<version>${workflow-multibranch-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -193,8 +193,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<classifier>tests</classifier>
<version>${workflow-step-api-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -204,8 +204,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<classifier>tests</classifier>
<version>${workflow-support-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -280,8 +280,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<classifier>tests</classifier>
<version>${git-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -406,8 +406,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<classifier>tests</classifier>
<version>${scm-api-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -437,8 +437,8 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>subversion</artifactId>
<classifier>tests</classifier>
<version>${subversion-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -493,8 +493,8 @@
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-definition</artifactId>
<classifier>tests</classifier>
<version>${pipeline-model-definition-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
Expand Down
46 changes: 23 additions & 23 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,42 @@
<version>${changelist}</version>
<packaging>pom</packaging>
<url>https://github.com/jenkinsci/bom</url>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gitHubRepo>jenkinsci/bom</gitHubRepo>
</properties>
<licenses>
<license>
<name>MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
<scm>
<connection>scm:git:[email protected]/${gitHubRepo}.git</connection>
<developerConnection>scm:git:ssh://[email protected]/${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>
<modules>
<module>bom-weekly</module>
<module>bom-2.319.x</module>
<module>bom-2.303.x</module>
<module>bom-2.289.x</module>
<module>sample-plugin</module>
</modules>
<scm>
<connection>scm:git:[email protected]/${gitHubRepo}.git</connection>
<developerConnection>scm:git:ssh://[email protected]/${gitHubRepo}.git</developerConnection>
<tag>${scmTag}</tag>
<url>https://github.com/${gitHubRepo}</url>
</scm>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gitHubRepo>jenkinsci/bom</gitHubRepo>
</properties>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -68,16 +80,4 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
</project>
48 changes: 25 additions & 23 deletions sample-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,14 @@
<jenkins.version>2.326</jenkins.version>
<java.level>8</java.level>
</properties>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-${bom}</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -82,7 +70,8 @@
<artifactId>jaxb</artifactId>
<scope>test</scope>
<exclusions>
<exclusion> <!-- TODO https://github.com/jenkinsci/jaxb-plugin/pull/15 -->
<exclusion>
<!-- TODO https://github.com/jenkinsci/jaxb-plugin/pull/15 -->
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
Expand Down Expand Up @@ -222,7 +211,8 @@
<artifactId>htmlpublisher</artifactId>
<scope>test</scope>
<exclusions>
<exclusion> <!-- TODO https://github.com/jenkinsci/htmlpublisher-plugin/pull/153 -->
<exclusion>
<!-- TODO https://github.com/jenkinsci/htmlpublisher-plugin/pull/153 -->
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
Expand Down Expand Up @@ -380,30 +370,42 @@
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<version>2.1.1</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.21</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>generate-test-sources</phase>
<goals>
<goal>execute</goal>
</goals>
<phase>generate-test-sources</phase>
<configuration>
<source>${project.basedir}/check.groovy</source>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.21</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 14bef33

Please sign in to comment.