[buildnumber-maven-plugin] Remove dependency on svnkit
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Feb 10 14:16:19 UTC 2012
commit 3ad71ddf16ff8a79afe32b45336c5211a8518677
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Feb 10 11:54:30 2012 +0100
Remove dependency on svnkit
...dd-source-and-target-version-for-compiler.patch | 6 ++--
...ove-maven-scm-provider-svnjava-dependency.patch | 6 ++--
0003-Remove-svnkit-dependency.patch | 35 ++++++++++++++++++++
buildnumber-maven-plugin-depmap.xml | 7 ----
buildnumber-maven-plugin.spec | 10 +++--
5 files changed, 47 insertions(+), 17 deletions(-)
---
diff --git a/0001-Add-source-and-target-version-for-compiler.patch b/0001-Add-source-and-target-version-for-compiler.patch
index ee57af8..d7a50c2 100644
--- a/0001-Add-source-and-target-version-for-compiler.patch
+++ b/0001-Add-source-and-target-version-for-compiler.patch
@@ -1,7 +1,7 @@
-From e43c46d81384be53a4f79009bd543036c4f6ce49 Mon Sep 17 00:00:00 2001
+From 728da5c914e46a6621d47e73a541a8e8d2e8217a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon, 18 Apr 2011 13:07:20 +0200
-Subject: [PATCH 1/2] Add source and target version for compiler
+Subject: [PATCH 1/3] Add source and target version for compiler
---
pom.xml | 9 +++++++++
@@ -28,5 +28,5 @@ index 0fa6a52..bd64386 100644
</build>
--
-1.7.4.4
+1.7.7.6
diff --git a/0002-Remove-maven-scm-provider-svnjava-dependency.patch b/0002-Remove-maven-scm-provider-svnjava-dependency.patch
index 0cb8ce9..dedcaf3 100644
--- a/0002-Remove-maven-scm-provider-svnjava-dependency.patch
+++ b/0002-Remove-maven-scm-provider-svnjava-dependency.patch
@@ -1,7 +1,7 @@
-From 5c3685fea93f280bd56e8004afdde7da313154a1 Mon Sep 17 00:00:00 2001
+From b845f071abbc549f028a43359413090fad4ebb4e Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon, 18 Apr 2011 13:18:28 +0200
-Subject: [PATCH 2/2] Remove maven-scm-provider-svnjava dependency
+Subject: [PATCH 2/3] Remove maven-scm-provider-svnjava dependency
---
pom.xml | 11 -----------
@@ -30,5 +30,5 @@ index bd64386..99f56b4 100644
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
--
-1.7.4.4
+1.7.7.6
diff --git a/0003-Remove-svnkit-dependency.patch b/0003-Remove-svnkit-dependency.patch
new file mode 100644
index 0000000..8f1e247
--- /dev/null
+++ b/0003-Remove-svnkit-dependency.patch
@@ -0,0 +1,35 @@
+From 3091f6a502f3890ab8c1d8e8b999ad2ad7c39977 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Fri, 10 Feb 2012 11:27:08 +0100
+Subject: [PATCH 3/3] Remove svnkit dependency
+
+---
+ pom.xml | 12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 99f56b4..9bde967 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -161,18 +161,6 @@
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+- <groupId>org.tmatesoft.svnkit</groupId>
+- <artifactId>svnkit</artifactId>
+- <version>1.3.5</version>
+- <!-- the current jna dependency is a range and it sucks -->
+- <exclusions>
+- <exclusion>
+- <groupId>net.java.dev.jna</groupId>
+- <artifactId>jna</artifactId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>3.2.2</version>
+--
+1.7.7.6
+
diff --git a/buildnumber-maven-plugin-depmap.xml b/buildnumber-maven-plugin-depmap.xml
index 9477af5..ab85418 100644
--- a/buildnumber-maven-plugin-depmap.xml
+++ b/buildnumber-maven-plugin-depmap.xml
@@ -13,11 +13,4 @@
<version>1.0.0</version>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>1.0.0</version>
- </maven>
- </dependency>
</dependencies>
diff --git a/buildnumber-maven-plugin.spec b/buildnumber-maven-plugin.spec
index c4e9037..97bcb38 100644
--- a/buildnumber-maven-plugin.spec
+++ b/buildnumber-maven-plugin.spec
@@ -1,6 +1,6 @@
Name: buildnumber-maven-plugin
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Build Number Maven Plugin
Group: Development/Libraries
@@ -14,6 +14,7 @@ Source1: %{name}-depmap.xml
Patch0: 0001-Add-source-and-target-version-for-compiler.patch
Patch1: 0002-Remove-maven-scm-provider-svnjava-dependency.patch
+Patch2: 0003-Remove-svnkit-dependency.patch
BuildArch: noarch
@@ -42,7 +43,6 @@ BuildRequires: maven-plugin-cobertura
BuildRequires: plexus-containers-component-javadoc
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
-BuildRequires: svnkit
BuildRequires: jna
BuildRequires: mojo-parent
BuildRequires: maven-project
@@ -54,7 +54,6 @@ Requires: maven
Requires: maven-project
Requires: maven-scm
Requires: jna
-Requires: svnkit
Requires: jpackage-utils
Requires: mojo-parent
Requires: plexus-containers-container-default
@@ -92,12 +91,12 @@ API documentation for %{name}.
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# tests skipped due to invoker problems with local repository tests
mvn-rpmbuild -DskipTests=true \
- -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:javadoc
@@ -135,6 +134,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Fri Feb 10 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-5
+- Remove dependency on svnkit
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list