[javapackages: 1/2] Force explicit XML namespace in POM files
by Mikolaj Izdebski
commit 26fa23a666c4a8331bb64e1d223a3cc7edfe829e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Dec 10 11:03:17 2012 +0100
Force explicit XML namespace in POM files
scripts/pom_editor.sh | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/scripts/pom_editor.sh b/scripts/pom_editor.sh
index 9cd3756..1d0749d 100644
--- a/scripts/pom_editor.sh
+++ b/scripts/pom_editor.sh
@@ -82,6 +82,12 @@ _pom_patch()
# Create a backup file -- pom.xml.orig.
test -f "${pom}".orig || cp -p "${pom}"{,.orig}
+ # Most of POM files specify XML namespace explicitly, but some of
+ # them don't. In order to be able to process all POMs in a uniform
+ # way we force explicit namespace declaration here. (An assumption
+ # is made that model version is 4.0.0.)
+ sed -i 's|<project>|<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">|' "${pom}"
+
# Apply identity transformation.
xsltproc --nonet - "${pom}" >"${pom}".tmp <<<"${_pom_xslt_header}${_pom_xslt_trailer}"
11 years, 5 months
[maven-surefire] Port to new %mvn_build macro
by Mikolaj Izdebski
commit b6a2a4f7321b3c367d79649b6548011842052243
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Dec 10 10:42:56 2012 +0100
Port to new %mvn_build macro
Newer versions of xmvn macros require arguments to be quoted.
maven-surefire.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index f626d2c..04d6693 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -20,7 +20,7 @@ BuildRequires: plexus-utils
BuildRequires: junit4
BuildRequires: testng
-BuildRequires: maven-local, xmvn
+BuildRequires: xmvn
BuildRequires: maven-compiler-plugin
BuildRequires: maven-help-plugin
BuildRequires: maven-install-plugin
@@ -158,7 +158,7 @@ sed -i 's:${shadedVersion}:%{version}:' surefire-integration-tests/pom.xml
%build
# tests turned off because they need jmock
-%mvn_build -f -L (surefire-plugin|report-plugin|junit3|junit4|testng|failsafe-plugin)=>@1
+%mvn_build -f -L "(surefire-plugin|report-plugin|junit3|junit4|testng|failsafe-plugin)=>@1"
%install
%mvn_install
11 years, 5 months
[maven-install-plugin/f18] remove patches for maven3
by Weinan Li
commit 432d6be5c0ce0b7c0d8896b4f22221f6be27c9c1
Author: weli <weli(a)localhost.localdomain>
Date: Mon Dec 10 17:40:38 2012 +0800
remove patches for maven3
0001-Fix-up-dependencies-for-maven-3.patch | 39 ----------------------------
maven-install-plugin.spec | 4 +--
2 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/maven-install-plugin.spec b/maven-install-plugin.spec
index c3c69b2..ff4e9e8 100644
--- a/maven-install-plugin.spec
+++ b/maven-install-plugin.spec
@@ -7,7 +7,6 @@ Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-install-plugin
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: 0001-Fix-up-dependencies-for-maven-3.patch
BuildArch: noarch
@@ -28,6 +27,7 @@ BuildRequires: plexus-digest
BuildRequires: junit
BuildRequires: maven-archiver
BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-artifact
Requires: maven
Requires: jpackage-utils
@@ -52,8 +52,6 @@ API documentation for %{name}.
%prep
%setup -q
-#Add dependency to make this work properly with maven 3
-%patch0 -p1
%build
mvn-rpmbuild \
11 years, 5 months
[maven-install-plugin/f18] * Mon Dec 10 2012 Weinan Li <weli@redhat.com> 2.3.1-7 - Install license files
by Weinan Li
commit 96203a6608d2f687e090bbe1339579ee0aaf5d29
Author: weli <weli(a)localhost.localdomain>
Date: Mon Dec 10 02:11:32 2012 +0800
* Mon Dec 10 2012 Weinan Li <weli(a)redhat.com> 2.3.1-7
- Install license files
maven-install-plugin.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/maven-install-plugin.spec b/maven-install-plugin.spec
index f2f49a8..c3c69b2 100644
--- a/maven-install-plugin.spec
+++ b/maven-install-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-install-plugin
Version: 2.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Maven Install Plugin
Group: Development/Libraries
@@ -82,12 +82,17 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadir}/%{name}.jar
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
+%doc LICENSE NOTICE
%files javadoc
%doc LICENSE
%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
%changelog
+* Mon Dec 10 2012 Weinan Li <weli(a)redhat.com> 2.3.1-7
+- Install license files
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 5 months
[maven-install-plugin] remove patches for maven3
by Weinan Li
commit 087dfe865fa347ec40ad12c2e9c6a7e8c83aad96
Author: weli <weli(a)localhost.localdomain>
Date: Mon Dec 10 17:04:58 2012 +0800
remove patches for maven3
0001-Fix-up-dependencies-for-maven-3.patch | 39 ----------------------------
maven-install-plugin.spec | 4 +--
2 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/maven-install-plugin.spec b/maven-install-plugin.spec
index c3c69b2..ff4e9e8 100644
--- a/maven-install-plugin.spec
+++ b/maven-install-plugin.spec
@@ -7,7 +7,6 @@ Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-install-plugin
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: 0001-Fix-up-dependencies-for-maven-3.patch
BuildArch: noarch
@@ -28,6 +27,7 @@ BuildRequires: plexus-digest
BuildRequires: junit
BuildRequires: maven-archiver
BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-artifact
Requires: maven
Requires: jpackage-utils
@@ -52,8 +52,6 @@ API documentation for %{name}.
%prep
%setup -q
-#Add dependency to make this work properly with maven 3
-%patch0 -p1
%build
mvn-rpmbuild \
11 years, 5 months
[maven-install-plugin] * Mon Dec 10 2012 Weinan Li <weli@redhat.com> 2.3.1-7 - Install license files
by Weinan Li
commit 5315e3bb084faf68d26c9f850c297ee0dbdd45ad
Author: weli <weli(a)localhost.localdomain>
Date: Mon Dec 10 02:00:51 2012 +0800
* Mon Dec 10 2012 Weinan Li <weli(a)redhat.com> 2.3.1-7
- Install license files
maven-install-plugin.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/maven-install-plugin.spec b/maven-install-plugin.spec
index f2f49a8..c3c69b2 100644
--- a/maven-install-plugin.spec
+++ b/maven-install-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-install-plugin
Version: 2.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Maven Install Plugin
Group: Development/Libraries
@@ -82,12 +82,17 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadir}/%{name}.jar
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
+%doc LICENSE NOTICE
%files javadoc
%doc LICENSE
%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
%changelog
+* Mon Dec 10 2012 Weinan Li <weli(a)redhat.com> 2.3.1-7
+- Install license files
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 5 months