[javapackages] Support POMs with no groupId specified
by Mikolaj Izdebski
commit e245a1e09bf4fa76766f82ca214ea705b8c8076e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jul 30 11:27:49 2012 +0200
Support POMs with no groupId specified
In some cases there is no groupId specified explictly in POM file.
scripts/pom_editor.sh | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/scripts/pom_editor.sh b/scripts/pom_editor.sh
index f93323a..e84b7c1 100644
--- a/scripts/pom_editor.sh
+++ b/scripts/pom_editor.sh
@@ -159,10 +159,23 @@ _pom_disable_gaid()
local what=$(sed 's/[^ ]*://' <<<"${1}")
local gid=$(sed -e 's/:[^:]*//' -e "s/..*/[text()='&']/" <<<"${2}")
local aid=$(sed -e 's/[^:]*://' -e "s/..*/[text()='&']/" <<<"${2}")
+ local extra=""
+
+ # Support cases with no groupId specified
+ if test -z "${gid}"; then
+ extra='
+ <xsl:template match="//'"${1} [pom:artifactId${aid}]"'">
+ <xsl:comment>
+ <xsl:text> '"${what}"' disabled by maintainer: </xsl:text>
+ <xsl:apply-templates select="pom:artifactId"/>
+ <xsl:text> </xsl:text>
+ </xsl:comment>
+ </xsl:template>'
+ fi
- # TODO: support cases with no groupId specified
_pom_patch "${3}" <<EOF
${_pom_xslt_header}
+ ${extra}
<xsl:template match="//${1} [pom:groupId${gid} and pom:artifactId${aid}]">
<xsl:comment>
<xsl:text> ${what} disabled by maintainer: </xsl:text>
11 years, 11 months
[javapackages] Preserve timestamps of backup POM files
by Mikolaj Izdebski
commit 7d8595210e086e154094aaffbb946f3fbf2fec3e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jul 30 11:23:16 2012 +0200
Preserve timestamps of backup POM files
scripts/pom_editor.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/pom_editor.sh b/scripts/pom_editor.sh
index 1725a76..f93323a 100644
--- a/scripts/pom_editor.sh
+++ b/scripts/pom_editor.sh
@@ -80,7 +80,7 @@ _pom_patch()
fi
# Create a backup file -- pom.xml.orig.
- test -f "${pom}".orig || cp "${pom}"{,.orig}
+ test -f "${pom}".orig || cp -p "${pom}"{,.orig}
# Apply identity transformation.
xsltproc --nonet - "${pom}" >"${pom}".tmp <<<"${_pom_xslt_header}${_pom_xslt_trailer}"
11 years, 11 months
[jena-iri] Icu4j (B)R
by tradej＠fedoraproject.org
Summary of changes:
f5695b4... Icu4j (B)R (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 11 months
[jena-iri/f17: 2/2] Icu4j (B)R
by tradej＠fedoraproject.org
commit f5695b4d87627dd56c95f9f0beccd9ab8b50668f
Author: Tomas Radej <tradej(a)redhat.com>
Date: Fri Jul 27 11:35:42 2012 +0200
Icu4j (B)R
jena-iri.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/jena-iri.spec b/jena-iri.spec
index a3ed9b4..4ffa93a 100644
--- a/jena-iri.spec
+++ b/jena-iri.spec
@@ -3,7 +3,7 @@
Name: %{parent}-%{subname}
Version: 0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
BuildArch: noarch
Summary: The Jena IRI Library
@@ -23,9 +23,11 @@ BuildRequires: maven-shared
BuildRequires: maven-shared-file-management
BuildRequires: maven-assembly-plugin
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: icu4j
Requires: java
Requires: jpackage-utils
+Requires: icu4j
%description
The Jena IRI Library is an implementation of RFC 3987 (IRI) and
@@ -79,6 +81,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Jul 27 2012 Tomas Radej <tradej(a)redhat.com> - 0.8-7
+- Added icu4j (B)R
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 11 months
[Bug 825782] New: New version resolver doesn't work
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=825782
Bug ID: 825782
QA Contact: extras-qa(a)fedoraproject.org
Severity: unspecified
Version: rawhide
Priority: unspecified
CC: akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
sochotni(a)redhat.com
Assignee: sochotni(a)redhat.com
Summary: New version resolver doesn't work
Regression: ---
Story Points: ---
Classification: Fedora
OS: Unspecified
Reporter: mgoldman(a)redhat.com
Type: Bug
Documentation: ---
Hardware: Unspecified
Mount Type: ---
Status: NEW
Component: maven
Product: Fedora
Description of problem:
It seems that the new maven-3.0.4-6.fc18 which has a new feature (bug 824789)
is causing build errors for some packages. In my case it is jboss-as.
For more info see the build log:
https://koji.fedoraproject.org/koji/taskinfo?taskID=4109448
The thing is that the org.jboss.as:jboss-as-parent:pom:7.1.0.Beta1b version
doesn't exists, true, but there is available a newer one:
org.jboss.as:jboss-as-parent:pom:7.1.1.Final
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 11 months