[maven-compiler-plugin: 4/4] Merge branch 'update-to-version-3.x'
by Michal Srb
commit 1536679f7dd33480241b8ddd2246429ced336d8d
Merge: 3300605 f200eda
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Mar 7 10:06:51 2013 +0100
Merge branch 'update-to-version-3.x'
Conflicts:
maven-compiler-plugin.spec
.gitignore | 1 +
maven-compiler-plugin.spec | 77 +++++++++++++------------------------------
sources | 2 +-
3 files changed, 25 insertions(+), 55 deletions(-)
---
11 years, 3 months
[plexus-compiler] (8 commits) ...Merge branch 'update-to-version-2.x'
by Michal Srb
Summary of changes:
964139d... Update to upstream version 2.1 (*)
201f453... Update to version 2.1 (*)
7d924ae... Build with original POM files (*)
4c98fed... Bump release version (*)
6facf15... Remove auxiliary aliases (*)
4f7059a... Update to upstream version 2.2 (*)
158693c... Add license file (Resolves: #903268) (*)
0225a9e... Merge branch 'update-to-version-2.x'
(*) This commit already existed in another branch; no separate mail sent
11 years, 3 months
[javapackages-tools] Update to upstream version 0.13.2
by Mikolaj Izdebski
commit f3e81f70cdede15bdc7e50b92f96bf493875e1ae
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Mar 7 09:53:13 2013 +0100
Update to upstream version 0.13.2
.gitignore | 1 +
javapackages-tools.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f0244f..859b03f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
/javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2
/javapackages-0.13.0.tar.xz
/javapackages-0.13.1.tar.xz
+/javapackages-0.13.2.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 69926e9..654064b 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.13.1
+Version: 0.13.2
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -112,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
+* Thu Mar 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.13.2-1
+- Update to upstream version 0.13.2
+
* Thu Mar 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.13.1-1
- Update to upstream version 0.13.1
diff --git a/sources b/sources
index a2e91ee..b692c2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39fa1ed906663e5e73dc6d7602d24806 javapackages-0.13.1.tar.xz
+7a9b5d6c1247f9c6d186dd10290adf21 javapackages-0.13.2.tar.xz
11 years, 3 months
[javapackages] Fix local m2 repo location
by Mikolaj Izdebski
commit 1537dd3588ca7bf4246f7f00200718f26f9df459
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Mar 7 09:51:29 2013 +0100
Fix local m2 repo location
scripts/mvn-rpmbuild | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/mvn-rpmbuild b/scripts/mvn-rpmbuild
index c44d3f9..f74d339 100755
--- a/scripts/mvn-rpmbuild
+++ b/scripts/mvn-rpmbuild
@@ -73,9 +73,9 @@ export XMVN_COMPAT
# and org.codehaus.mojo. This is to allow plugins in these groups to be
# used without giving groupId prefix.
for groupId in org/apache/maven/plugins org/codehaus/mojo; do
- mkdir -p "${XMVN_REPO_LOCAL}"/${groupId}
+ mkdir -p .m2/${groupId}
ln -sf /etc/maven/metadata-${groupId////-}.xml \
- "${XMVN_REPO_LOCAL}"/${groupId}/maven-metadata-central.xml
+ .m2/${groupId}/maven-metadata-central.xml
done
# Maven needs to have M2_HOME exported. See: rhbz#912333
11 years, 3 months
[maven-surefire] Add missing BR: mockito
by Mikolaj Izdebski
commit 3607ca942dc80a8469ac7cb9209724f7344799b8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Mar 7 08:01:52 2013 +0100
Add missing BR: mockito
maven-surefire.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index a76158e..54730f3 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
Version: 2.13
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0 and CPL
@@ -18,6 +18,7 @@ BuildRequires: junit >= 3.8.2
BuildRequires: plexus-utils
BuildRequires: junit4
BuildRequires: testng
+BuildRequires: mockito
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
@@ -158,6 +159,9 @@ done
%doc LICENSE NOTICE cpl-v10.html
%changelog
+* Thu Mar 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.13-4
+- Add missing BR: mockito
+
* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 0:2.13-3
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
11 years, 3 months