Skip to content

Commit

Permalink
DINF-161: use gebit-forked tile jenkins-plign
Browse files Browse the repository at this point in the history
  • Loading branch information
Volodjam committed Feb 2, 2023
1 parent f45c5b4 commit dc9d2e9
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath />
</parent>
<artifactId>gitlab-plugin</artifactId>
<version>1.6.0</version>
<version>${revision}${changelist}</version>
<name>GitLab Plugin</name>
<url>https://github.com/jenkinsci/${project.artifactId}</url>
<packaging>hpi</packaging>
Expand All @@ -31,16 +31,15 @@
<project.jira>DINF</project.jira>

<!-- Version of gebit-build to be used -->
<version.build>3.4.1-I377</version.build>
<version.gebit-build-extension>1.2.2</version.gebit-build-extension>
<version.tiles>2.8-gebit37</version.tiles>
<version.gitflow-maven-plugin>2.4.6-I152</version.gitflow-maven-plugin>
<version.gebit-build-extension>1.2.2</version.gebit-build-extension>
<version.gebit-forked>1.0.0-I3</version.gebit-forked>
<version.build>3.5.0</version.build>
<version.gitflow-maven-plugin>2.4.6</version.gitflow-maven-plugin>

<tiles.applyBefore>org.jenkins-ci.plugins:gitlab-plugin</tiles.applyBefore>
<tiles.mergeTarget>${tiles.applyBefore}</tiles.mergeTarget>

<flow.skipReleaseBranchMerge>true</flow.skipReleaseBranchMerge>

<version.java>${java.version}</version.java>
<java.version>11</java.version>
<version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
Expand All @@ -64,7 +63,7 @@

<!-- gebit: we cannot override the distributionManagement from our build tile
see: https://jira.gebit.de/browse/GBLD-1099 -->
<!-- <distributionManagement>
<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<name>jenkinsci-releases</name>
Expand All @@ -75,7 +74,7 @@
<name>jenkinsci-snapshots</name>
<url>https://repo.jenkins-ci.org/snapshots</url>
</snapshotRepository>
</distributionManagement> -->
</distributionManagement>

<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
Expand Down Expand Up @@ -435,7 +434,7 @@
<applyBefore>${tiles.applyBefore}</applyBefore>
<mergeTarget>${tiles.mergeTarget}</mergeTarget>
<tiles combine.children="append">
<tile>de.gebit.build.tile:build:${version.build}</tile>
<tile>de.gebit.build.forked.tile:jenkins-plugin:${version.gebit-forked}</tile>
<!-- hier can be added other tiles to be used -->
</tiles>
</configuration>
Expand Down

0 comments on commit dc9d2e9

Please sign in to comment.