[javapackages] Do not try to produce "pretty" XML with Python < 2.7
by Michal Srb
commit 4f4472ae64145bbd6d4fa13f055230be2593ec4e
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Jan 6 14:35:28 2015 +0100
Do not try to produce "pretty" XML with Python < 2.7
java-utils/maven_depmap.py | 4 ++--
java-utils/mvn_artifact.py | 5 ++---
python/javapackages/common/util.py | 11 +++++++++++
3 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 8f6b11f..9a25211 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -51,6 +51,7 @@ from javapackages.metadata.artifact import MetadataArtifact
from javapackages.metadata.alias import MetadataAlias
import javapackages.metadata.pyxbmetadata as m
+import javapackages.common.util as util
import pyxb
@@ -199,8 +200,7 @@ def write_metadata(metadata_file, artifacts):
root.artifacts = pyxb.BIND(*artifacts)
with open(metadata_file, 'w') as f:
- dom = root.toDOM(None)
- f.write(dom.toprettyxml(indent=" "))
+ util.write_metadata(f, root)
if __name__ == "__main__":
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index 424252b..0bd97e0 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -42,7 +42,7 @@ from javapackages.maven.pom import POM, PomLoadingException
from javapackages.ivy.ivyfile import IvyFile
from javapackages.xmvn.xmvn_resolve import XMvnResolve, ResolutionResult, ResolutionRequest
-from javapackages.common.util import args_to_unicode
+from javapackages.common.util import args_to_unicode, write_metadata
import sys
import os
@@ -316,5 +316,4 @@ if __name__ == "__main__":
add_artifact_elements(metadata, art, pom_path, jar_path)
with open(config, 'w') as f:
- dom = metadata.toDOM(None)
- f.write(dom.toprettyxml(indent=" "))
+ write_metadata(f, metadata)
diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py
index f893cc4..37942a4 100644
--- a/python/javapackages/common/util.py
+++ b/python/javapackages/common/util.py
@@ -128,3 +128,14 @@ def get_logger(name):
handler.setFormatter(formatter)
logger.addHandler(handler)
return logger
+
+
+def write_metadata(fileobj, metadata):
+ dom = metadata.toDOM(None)
+
+ # minidom in Python < 2.6 adds unnecessary whitespace
+ # see: http://bugs.python.org/issue4147
+ if sys.version_info < (2, 7):
+ fileobj.write(dom.toxml())
+ else:
+ fileobj.write(dom.toprettyxml(indent=" "))
9 years, 5 months
[seam-parent] No more needed
by gil
commit 00ffe50a465a958727939be68a187ffa101a2f5c
Author: gil <puntogil(a)libero.it>
Date: Mon Jan 5 19:36:52 2015 +0100
No more needed
.gitignore | 2 -
LICENSE-2.0.txt | 202 ------------------------------------------------------
dead.package | 1 +
seam-parent.spec | 87 -----------------------
sources | 1 -
5 files changed, 1 insertions(+), 292 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ae4feb4
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+No more needed
9 years, 5 months
[seam-conversation] No more needed
by gil
commit e46a5275534c535d1501d97a16fc0429376f0114
Author: gil <puntogil(a)libero.it>
Date: Mon Jan 5 19:30:52 2015 +0100
No more needed
.gitignore | 1 -
dead.package | 1 +
seam-conversation-3.1.0.Final-depmap | 14 ---
seam-conversation.spec | 176 ----------------------------------
sources | 1 -
5 files changed, 1 insertions(+), 192 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ae4feb4
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+No more needed
9 years, 5 months
[javapackages] Post release version bump: 4.4.0-SNAPSHOT
by Michal Srb
commit eb7e32a9cba360b4100ff2fb27c8f069bb2975ed
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jan 5 18:40:31 2015 +0100
Post release version bump: 4.4.0-SNAPSHOT
VERSION | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/VERSION b/VERSION
index cc2fbe8..99fc609 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.3.2
+4.4.0-SNAPSHOT
9 years, 5 months
[xmvn] Update to upstream version 2.1.1
by Mikolaj Izdebski
commit 8dd3489a737fbc3dd6aca9297ee45bed9146fbed
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 5 18:00:19 2015 +0100
Update to upstream version 2.1.1
.gitignore | 1 +
...stalling-the-same-attached-artifact-twice.patch | 30 ----------
...nstallation-of-attached-Eclipse-artifacts.patch | 25 --------
0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch | 32 ----------
...-repository-namespace-during-installation.patch | 26 --------
...any-system-dependencies-in-Tycho-projects.patch | 49 ---------------
...ualified-osgi-version-to-install-plan-whe.patch | 62 --------------------
sources | 2 +-
xmvn.spec | 20 ++-----
9 files changed, 7 insertions(+), 240 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a7a280..7994260 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/xmvn-2.0.0.tar.xz
/xmvn-2.0.1.tar.xz
/xmvn-2.1.0.tar.xz
+/xmvn-2.1.1.tar.xz
diff --git a/sources b/sources
index 5c1d4a2..cd3b173 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f02fb3d6dc26cdeefc6ff9e6843e7189 xmvn-2.1.0.tar.xz
+a1b3f52a2d3a8f8c0c5c26fab35bc63f xmvn-2.1.1.tar.xz
diff --git a/xmvn.spec b/xmvn.spec
index ad3b100..4910c81 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -3,8 +3,8 @@
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^osgi\\($
Name: xmvn
-Version: 2.1.0
-Release: 8%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
Summary: Local Extensions for Apache Maven
License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn
@@ -12,13 +12,6 @@ BuildArch: noarch
Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
-Patch0: 0001-Avoid-installing-the-same-attached-artifact-twice.patch
-Patch1: 0002-Fix-installation-of-attached-Eclipse-artifacts.patch
-Patch2: 0003-Fix-conversion-of-Ivy-to-XMvn-artifacts.patch
-Patch3: 0004-Use-topmost-repository-namespace-during-installation.patch
-Patch4: 0005-Ignore-any-system-dependencies-in-Tycho-projects.patch
-Patch5: 0006-Add-fully-qualified-osgi-version-to-install-plan-whe.patch
-
BuildRequires: maven >= 3.2.1-10
BuildRequires: maven-local
BuildRequires: beust-jcommander
@@ -147,12 +140,6 @@ This package provides %{summary}.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%mvn_package :xmvn __noinstall
@@ -302,6 +289,9 @@ end
%doc LICENSE NOTICE
%changelog
+* Mon Jan 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1.1-1
+- Update to upstream version 2.1.1
+
* Wed Dec 10 2014 Michal Srb <msrb(a)redhat.com> - 2.1.0-8
- Add fully qualified osgi version to install plan when tycho detected
- Resolves: rhbz#1172225
9 years, 5 months