Skip to content

Commit 5fd7d4b

Browse files
committed
Merge pull request #21 from rogerhu/jenkins_22820
[JENKINS-22820] fix - Bump maven.scm to 1.9.1 to avoid issues with Git v1.9 upgrades.
2 parents a6d775b + f9a484e commit 5fd7d4b

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<plugin>
5555
<artifactId>maven-release-plugin</artifactId>
5656
<!-- To have pushChanges parameter available -->
57-
<version>2.1</version>
57+
<version>2.5</version>
5858
<configuration>
5959
<!-- Git scm specific behaviour -->
6060
<localCheckout>true</localCheckout>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>org.apache.maven.scm</groupId>
127127
<artifactId>maven-scm-manager-plexus</artifactId>
128-
<version>1.6</version>
128+
<version>1.9.1</version>
129129
<!--
130130
<exclusions>
131131
<exclusion>
@@ -158,7 +158,7 @@
158158
<dependency>
159159
<groupId>org.apache.maven.scm</groupId>
160160
<artifactId>maven-scm-provider-gitexe</artifactId>
161-
<version>1.6</version>
161+
<version>1.9.1</version>
162162
</dependency>
163163

164164

src/main/resources/META-INF/plexus/components.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,12 @@ under the License.
3737
<implementation>org.apache.maven.scm.provider.svn.svnjava.SvnJavaScmProvider</implementation>
3838
<!-- <implementation>org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider</implementation> -->
3939
</component>
40+
41+
<component>
42+
<role>org.apache.maven.scm.provider.ScmProvider</role>
43+
<role-hint>git</role-hint>
44+
<implementation>org.apache.maven.scm.provider.git.gitexe.GitExeScmProvider</implementation>
45+
</component>
46+
4047
</components>
4148
</component-set>

0 commit comments

Comments
 (0)