[maven-resources-plugin/f16: 4/4] Fixed dependency on plexus-container-default
by tradej@fedoraproject.org
commit d69b8227cdbec7871a28ad5641e6e594b6e70f08
Author: Tomas Radej <tradej(a)redhat.com>
Date: Tue Sep 6 09:26:01 2011 +0200
Fixed dependency on plexus-container-default
maven-resources-plugin-plexus-dep.patch | 29 +++++++++++++++++++++++++++++
maven-resources-plugin.spec | 10 +++++++++-
2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/maven-resources-plugin-plexus-dep.patch b/maven-resources-plugin-plexus-dep.patch
new file mode 100644
index 0000000..78ab5ef
--- /dev/null
+++ b/maven-resources-plugin-plexus-dep.patch
@@ -0,0 +1,29 @@
+diff --git a/pom.xml b/pom.xml
+index f74aea0..5bb5ce2 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -65,6 +65,11 @@ under the License.
+
+ <dependencies>
+ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-container-default</artifactId>
++ <version>1.0-alpha-9-stable-1</version>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+@@ -102,12 +107,6 @@ under the License.
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-container-default</artifactId>
+- <version>1.0-alpha-9-stable-1</version>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
+ </dependency>
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index c8983c7..5fb642a 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-resources-plugin
Version: 2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Resources Plugin
Group: Development/Libraries
@@ -10,6 +10,10 @@ URL: http://maven.apache.org/plugins/maven-resources-plugin
#tar zcf maven-resources-plugin-2.5.tar.gz maven-resources-plugin-2.5/
Source0: %{name}-%{version}.tar.gz
+# Relocation of plexus-container-default is necessary as sisu gets to the
+# classpath first and uses an old version of a class from container-default
+Patch0: %{name}-plexus-dep.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -61,6 +65,7 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
mvn-rpmbuild \
@@ -92,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 06 2011 Tomas Radej <tradej(a)redhat.com> - 2.5-4
+- Fixed dependency on plexus-container-default
+
* Tue Aug 30 2011 Tomas Radej <tradej(a)redhat.com> - 2.5-3
- Added changelog
12 years, 7 months
[javapackages] Normalize manifest lines.
by Alexander Kurtakov
commit 3660188328d588102323107e04016d5ea4507c30
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Sep 15 15:36:32 2011 +0300
Normalize manifest lines.
depgenerators/osgi.prov | 12 ++++++++++--
depgenerators/osgi.req | 29 ++++++++++++++---------------
2 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
index 49b3ace..0522690 100755
--- a/depgenerators/osgi.prov
+++ b/depgenerators/osgi.prov
@@ -59,10 +59,18 @@ class TagBuilder:
for path in paths:
self.get_osgi_provide (path)
-
+ def normalize_manifest(self, manifest):
+ lines = []
+ for line in manifest.readlines():
+ if line.startswith(' '):
+ lines[-1] += line.strip()
+ else:
+ lines.append(line.strip())
+ return lines
+
def handle_manifest(self, manifest):
provideInfo = OsgiProvideInfo()
- for line in manifest.readlines():
+ for line in self.normalize_manifest(manifest):
if line.startswith("Bundle-SymbolicName:"):
provideInfo.setSymbolicName(line.split(':')[1].strip())
if line.startswith("Bundle-Version:"):
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 901d64e..2bcd312 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -43,37 +43,36 @@ class TagBuilder:
for path in paths:
self.get_osgi_require (path)
+ def normalize_manifest(self, manifest):
+ lines = []
+ for line in manifest.readlines():
+ if line.startswith(' '):
+ lines[-1] += line.strip()
+ else:
+ lines.append(line.strip())
+ return lines
+
def parse_manifest (self, manifest):
headers = {}
DELIM = ": "
- name = None
- for line in manifest.readlines():
+ for line in self.normalize_manifest(manifest):
split = line.split(DELIM)
- if not name:
+ if len(split) > 1:
name = split[0].strip()
headers[name]= split[1].strip()
- else:
- if len(split) < 2:
- headers[name] = headers[name]+line.strip()
- else:
- name = split[0].strip()
- headers[name]= split[1].strip()
return headers
def split_bundle_name (self, bundles):
bundlenames = []
for bundle in bundles.split(','):
- if ")" in bundle or "]" in bundle >0:
+ if ")" in bundle or "]" in bundle:
continue
if ";" in bundle:
bundlenames.append(bundle.split(";")[0].strip())
else:
- bundlenames.append(bundle)
-
+ bundlenames.append(bundle.strip())
return bundlenames
-
-
-
+
def get_osgi_require (self, path):
if not os.path.islink(path):
if zipfile.is_zipfile(path):
12 years, 7 months
[javapackages/0.2.x] Normalize manifest lines.
by Alexander Kurtakov
commit 8dd79b021aa453ccb1b6430a1a717186fa247a77
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Sep 15 15:36:32 2011 +0300
Normalize manifest lines.
depgenerators/osgi.prov | 12 ++++++++++--
depgenerators/osgi.req | 29 ++++++++++++++---------------
2 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
index 49b3ace..0522690 100755
--- a/depgenerators/osgi.prov
+++ b/depgenerators/osgi.prov
@@ -59,10 +59,18 @@ class TagBuilder:
for path in paths:
self.get_osgi_provide (path)
-
+ def normalize_manifest(self, manifest):
+ lines = []
+ for line in manifest.readlines():
+ if line.startswith(' '):
+ lines[-1] += line.strip()
+ else:
+ lines.append(line.strip())
+ return lines
+
def handle_manifest(self, manifest):
provideInfo = OsgiProvideInfo()
- for line in manifest.readlines():
+ for line in self.normalize_manifest(manifest):
if line.startswith("Bundle-SymbolicName:"):
provideInfo.setSymbolicName(line.split(':')[1].strip())
if line.startswith("Bundle-Version:"):
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 901d64e..2bcd312 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -43,37 +43,36 @@ class TagBuilder:
for path in paths:
self.get_osgi_require (path)
+ def normalize_manifest(self, manifest):
+ lines = []
+ for line in manifest.readlines():
+ if line.startswith(' '):
+ lines[-1] += line.strip()
+ else:
+ lines.append(line.strip())
+ return lines
+
def parse_manifest (self, manifest):
headers = {}
DELIM = ": "
- name = None
- for line in manifest.readlines():
+ for line in self.normalize_manifest(manifest):
split = line.split(DELIM)
- if not name:
+ if len(split) > 1:
name = split[0].strip()
headers[name]= split[1].strip()
- else:
- if len(split) < 2:
- headers[name] = headers[name]+line.strip()
- else:
- name = split[0].strip()
- headers[name]= split[1].strip()
return headers
def split_bundle_name (self, bundles):
bundlenames = []
for bundle in bundles.split(','):
- if ")" in bundle or "]" in bundle >0:
+ if ")" in bundle or "]" in bundle:
continue
if ";" in bundle:
bundlenames.append(bundle.split(";")[0].strip())
else:
- bundlenames.append(bundle)
-
+ bundlenames.append(bundle.strip())
return bundlenames
-
-
-
+
def get_osgi_require (self, path):
if not os.path.islink(path):
if zipfile.is_zipfile(path):
12 years, 7 months
[javapackages/0.2.x] Strip gid, aid and version to prevent problems
by Stanislav Ochotnicky
commit 23080d65407e29b450e4dc5f43c0d4e7af3a6812
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Sep 15 14:23:01 2011 +0200
Strip gid,aid and version to prevent problems
Some pom.xml files use whitespaces inside these tags and these were
making our code barf when resolving. This simple patch strips
whitespace before producing dependency mapping fragment.
scripts/maven_depmap.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/maven_depmap.py b/scripts/maven_depmap.py
index c167c57..43ecc84 100644
--- a/scripts/maven_depmap.py
+++ b/scripts/maven_depmap.py
@@ -43,9 +43,9 @@ from os.path import basename, dirname
class Fragment:
"""simple structure to hold fragment information"""
def __init__(self, gid, aid, version, local_gid, local_aid):
- self.gid = gid
- self.aid = aid
- self.version = version
+ self.gid = gid.strip()
+ self.aid = aid.strip()
+ self.version = version.strip()
self.local_gid = local_gid
self.local_aid = local_aid
12 years, 7 months
[javapackages] Strip gid, aid and version to prevent problems
by Stanislav Ochotnicky
commit e4757cb627c78a683f6ccb5a430585a004d0a252
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Sep 15 14:23:01 2011 +0200
Strip gid,aid and version to prevent problems
Some pom.xml files use whitespaces inside these tags and these were
making our code barf when resolving. This simple patch strips
whitespace before producing dependency mapping fragment.
scripts/maven_depmap.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/maven_depmap.py b/scripts/maven_depmap.py
index c167c57..43ecc84 100644
--- a/scripts/maven_depmap.py
+++ b/scripts/maven_depmap.py
@@ -43,9 +43,9 @@ from os.path import basename, dirname
class Fragment:
"""simple structure to hold fragment information"""
def __init__(self, gid, aid, version, local_gid, local_aid):
- self.gid = gid
- self.aid = aid
- self.version = version
+ self.gid = gid.strip()
+ self.aid = aid.strip()
+ self.version = version.strip()
self.local_gid = local_gid
self.local_aid = local_aid
12 years, 7 months