[Bug 998463] New: javapackages-tools: whitespace breaks XML node matching for pom macros
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=998463
Bug ID: 998463
Summary: javapackages-tools: whitespace breaks XML node
matching for pom macros
Product: Fedora
Version: 18
Component: javapackages-tools
Assignee: msimacek(a)redhat.com
Reporter: sochotni(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msrb(a)redhat.com,
sochotni(a)redhat.com
Description of problem:
When artifactId (or other node which is being matched) contains whitespace such
as new line it will break XML node matching causing pom modification to fail.
Example snippet:
<build>
...
<plugins>
...
<plugin>
<artifactId>maven-compiler-plugin
</artifactId> <!-- HERE -->
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin
...
</plugins>
...
</build>
This example was taken from plexus-sec-dispatcher which currently suffers from
this problem.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=pyVCP1X17C&a=cc_unsubscribe
10 years, 6 months
[Bug 1012284] New: javapackages-tools: %add_maven_depmap fails with -v
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1012284
Bug ID: 1012284
Summary: javapackages-tools: %add_maven_depmap fails with -v
Product: Fedora
Version: rawhide
Component: javapackages-tools
Assignee: sochotni(a)redhat.com
Reporter: mizdebsk(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msrb(a)redhat.com,
sochotni(a)redhat.com
Created attachment 803264
--> https://bugzilla.redhat.com/attachment.cgi?id=803264&action=edit
Reproducer
Description of problem:
%add_maven_depmap fails if option -v is specified
Version-Release number of selected component (if applicable):
3.2.4-2
Steps to Reproduce:
1. rebuild attached SRPM
Actual results:
+ python -m /usr/share/java-utils/maven_depmap -r 4.5.6 -p /usr -n ''
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/maven-fragments/maven-downloader
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/maven-poms/JPP-foo.pom
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/java/foo.xy
+ [[ -n -v 4.5.6 ]]
+ mv
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/maven-poms/JPP-foo.pom
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/maven-poms/JPP-foo-1.1.pom
+ '[' -f
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/java/foo.xy
']'
+ mv
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/java/foo.xy
/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/java/foo.xy
mv:
'/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/java/foo.xy'
and
'/builddir/build/BUILDROOT/maven-downloader-1.1-5.fc21.x86_64/usr/share/java/foo.xy'
are the same file
Expected results:
Macro succeeds.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=Z1lpYBMoPl&a=cc_unsubscribe
10 years, 6 months
[Bug 1007203] New: javapackages-tools: incorrect artifact extension
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1007203
Bug ID: 1007203
Summary: javapackages-tools: incorrect artifact extension
Product: Fedora
Version: rawhide
Component: javapackages-tools
Assignee: sochotni(a)redhat.com
Reporter: mizdebsk(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msrb(a)redhat.com,
sochotni(a)redhat.com
Description of problem:
maven_depmap.py creates depmap with extension "jar" even if artifact extension
is "war". Such depmaps won't work with XMvn.
Version-Release number of selected component (if applicable):
3.0.3-1
Steps to Reproduce:
$ python /usr/share/java-utils/maven_depmap.py testfrag
/usr/share/maven-poms/JPP-maven-source-plugin.pom
/usr/share/java/maven-source-plugin.war
$ cat testfrag
<?xml version="1.0" ?>
<dependencyMap>
<dependency>
<maven>
<artifactId>maven-source-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.2.1</version>
</maven>
<jpp>
<artifactId>maven-source-plugin</artifactId>
<groupId>JPP</groupId>
</jpp>
</dependency>
</dependencyMap>
$ ls -l /usr/share/java/maven-source-plugin.jar
ls: cannot access /usr/share/java/maven-source-plugin.jar: No such file or
directory
Actual results:
Extension in <jpp> part is set to "jar", but artifact extension is "war".
Expected results:
maven_depmap.py should either set extension to "war" in <jpp> part or fail if
it doesn't support war extension. Silently succeeding with broken depmap is not
desired.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=DzS8BwgW19&a=cc_unsubscribe
10 years, 6 months
[Bug 1002223] New: No splash screen shown on launch of Myrtle
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1002223
Bug ID: 1002223
Summary: No splash screen shown on launch of Myrtle
Product: Fedora
Version: 19
Component: snifflib
Severity: medium
Assignee: msimacek(a)redhat.com
Reporter: mray271(a)gmail.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, mray271(a)gmail.com,
msimacek(a)redhat.com, msrb(a)redhat.com,
sochotni(a)redhat.com
Created attachment 791459
--> https://bugzilla.redhat.com/attachment.cgi?id=791459&action=edit
Proposed patch to /usr/bin/myrtle
Description of problem:
Launching Myrtle spreadsheet by /usr/bin/myrtle script should produce splash
image.
Version-Release number of selected component (if applicable):
1.8.12-1.fc19.noarch
currently available from the fedora-updates-testing repository
How reproducible:
Always
Steps to Reproduce:
1. yum install myrtle
2. myrtle
3.
Actual results:
Spreadsheet application opens as intended, but no splash shown.
Expected results:
Splash image should be shown briefly prior to application launch.
Additional info:
The splash image is a resource in in snifflib.jar
(/usr/share/java/snifflib.jar) and has path
com/mockturtlesolutions/snifflib/spreadsheets/images/myrtlesplash.png
See attached patch.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=ha0RKcnMwt&a=cc_unsubscribe
10 years, 6 months
[Bug 959454] New: plexus-digest: do not use algorithm name as regular expression
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=959454
Bug ID: 959454
Summary: plexus-digest: do not use algorithm name as regular
expression
Product: Fedora
Version: rawhide
Component: plexus-digest
Severity: unspecified
Priority: unspecified
Assignee: sochotni(a)redhat.com
Reporter: fweimer(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com, mizdebsk(a)redhat.com,
msrb(a)redhat.com, overholt(a)gmail.com,
sochotni(a)redhat.com, tradej(a)redhat.com
Blocks: 959453
Category: ---
In org.codehaus.plexus.digest.DigestUtils.cleanChecksum(String, String,
String), the second parameter is used as part of the regular expression.
Compiling the resulting regular expression can result in a VM error with a
crafted algorithm name. The regular expression should be a constant, with a
capture group for the algorithm name, and the name should be checked after
matching.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=k7YPjOe1Ue&a=cc_unsubscribe
10 years, 6 months
[Bug 912333] New: mvn-rpmbuild if F19 does not export M2_HOME
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=912333
Bug ID: 912333
Summary: mvn-rpmbuild if F19 does not export M2_HOME
Product: Fedora
Version: rawhide
Component: javapackages-tools
Severity: unspecified
Priority: unspecified
Reporter: mattias.ellert(a)fysast.uu.se
Description of problem:
mvn-rpmbuild on Fedora 19 does not export M2_HOME
Version-Release number of selected component (if applicable):
javapackages-tools.noarch 0:0.12.0-1.fc19
How reproducible:
Packages in the f19 rebuild failed due to M2_HOME not set. See e.g.
https://koji.fedoraproject.org/koji/taskinfo?taskID=4996219
Error message is:
"Maven application directory was not specified, and ${maven.home} is not
provided in the system properties. Please specify at least on of these."
The code generating this error message is:
if ( ( mavenHome == null ) && ( System.getProperty( "maven.home" ) == null ) )
{
if ( !getSystemEnvVars().containsKey( "M2_HOME" ) )
{
throw new IllegalStateException( "Maven application directory was
+ "specified, and ${maven.home} is not provided in the system "
+ "properties. Please specify at least on of these." );
}
}
I.e. if M2_HOME is set (like in mvn-rpmbuild for Fedora 18 and earlier) the
exception is not thrown.
Actual results:
Failed builds due to M2_HOME not set
Expected results:
Working build
Additional info:
mvn-rpmbuild on Fedora 17 contains the line
export M2_HOME=/usr/share/maven
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=U9jVwfslmC&a=cc_unsubscribe
10 years, 6 months
[snakeyaml] Update to upstream version 1.13
by Mikolaj Izdebski
commit c5c0a4bd6f5bf41eb57b05b0759ab20b246c3297
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Sep 30 17:05:50 2013 +0200
Update to upstream version 1.13
.gitignore | 1 +
snakeyaml.spec | 36 +++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d5b540..3c112b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/SnakeYAML-all-1.8.zip
/SnakeYAML-all-1.9.zip
+/snakeyaml-1.13.zip
diff --git a/snakeyaml.spec b/snakeyaml.spec
index 16d42fe..2b83866 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -1,12 +1,13 @@
+%global vertag 3f1ee79d50cf
+
Name: snakeyaml
-Version: 1.11
-Release: 7%{?dist}
+Version: 1.13
+Release: 1%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
# http://code.google.com/p/snakeyaml
URL: http://code.google.com/p/%{name}
-# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip
-Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.zip
+Source0: https://snakeyaml.googlecode.com/archive/v%{version}.zip#/%{name}-%{versi...
# Upstream has forked gdata-java and base64 and refuses [1] to
# consider replacing them by external dependencies. Bundled libraries
@@ -20,13 +21,19 @@ Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patc
BuildArch: noarch
-BuildRequires: maven-local
-BuildRequires: cobertura
-BuildRequires: joda-time
-BuildRequires: gnu-getopt
-BuildRequires: base64coder
-BuildRequires: apache-commons-codec
-%{?fedora:BuildRequires: springframework}
+BuildRequires: maven-local
+BuildRequires: mvn(biz.source_code:base64coder)
+BuildRequires: mvn(commons-codec:commons-codec)
+BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin)
+BuildRequires: mvn(joda-time:joda-time)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(net.sourceforge.cobertura:cobertura)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-changes-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-eclipse-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(org.springframework:spring-core)
%description
SnakeYAML features:
@@ -46,7 +53,7 @@ Summary: API documentation for %{name}
This package contains %{summary}.
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{vertag}
%patch0 -p1
%patch1 -p1
@@ -68,7 +75,7 @@ rm -rf src/main/java/org/yaml/snakeyaml/external
sed -i 's/\r//g' LICENSE.txt
%build
-%mvn_build %{!?fedora:-f}
+%mvn_build
%install
%mvn_install
@@ -80,6 +87,9 @@ sed -i 's/\r//g' LICENSE.txt
%doc LICENSE.txt
%changelog
+* Mon Sep 30 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.13-1
+- Update to upstream version 1.13
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 856e15e..0e59001 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a11deea0650701720b474c110693df4 SnakeYAML-all-1.11.zip
+c636f28d1da335bd125457dbf739ff12 snakeyaml-1.13.zip
10 years, 7 months
[javapackages] Bail during maven.req if artifacts are not installed but required
by Stanislav Ochotnicky
commit 34b39a97c57754205b6a7437614f8b7207ebde6c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Sep 30 15:53:42 2013 +0200
Bail during maven.req if artifacts are not installed but required
If some artifact is not installed in multi-module project, but other artifacts
require it we should fail the build to make sure we don't produce broken
dependencies.
depgenerators/maven.req | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 55117b6..f46e4ec 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -45,7 +45,8 @@ class TagBuilder:
paths = map (lambda x: x.rstrip (), filelist.readlines ())
# this is always required because jpackage-utils owns the directory
print("jpackage-utils")
- provided = []
+ self.provided_artifacts = []
+ self.skipped_artifacts = []
if paths:
# let's first read all fragment files for provided artifacts
fragment_dir = os.path.dirname(paths[0])
@@ -54,16 +55,24 @@ class TagBuilder:
if filename.endswith(".pom"):
continue
depmap = Depmap(os.path.join(dirname, filename))
- provided.extend(depmap.get_provided_artifacts())
+ self.provided_artifacts.extend(depmap.get_provided_artifacts())
+ self.skipped_artifacts.extend(depmap.get_skipped_artifacts())
for path in paths:
if path.endswith(".pom"):
continue
- self.print_mvn_requires(path, provided)
+ self.print_mvn_requires(path)
- def print_mvn_requires(self, path, providedArtifacts):
+ def print_mvn_requires(self, path):
depmap = Depmap(path)
+ skipped_but_required = []
for dependency in depmap.get_required_artifacts():
- for provided in providedArtifacts:
+ for skipped in self.skipped_artifacts:
+ if (skipped.groupId == dependency.groupId and
+ skipped.artifactId == dependency.artifactId and
+ skipped.classifier == dependency.classifier and
+ skipped.extension == dependency.extension):
+ skipped_but_required.append(skipped)
+ for provided in self.provided_artifacts:
if (provided.groupId == dependency.groupId and
provided.artifactId == dependency.artifactId and
provided.classifier == dependency.classifier and
@@ -80,6 +89,16 @@ class TagBuilder:
dependency.extension = ""
print(dependency.get_rpm_str(dependency.version))
+ if skipped_but_required:
+ skipped_msg = "Following artifacts were built " \
+ "but are not being installed however other " \
+ "artifacts require them. Either package these " \
+ "artifacts or do not build them. To package " \
+ "call %mvn_package in %prep:\n"
+ for skipped in skipped_but_required:
+ skipped_msg = skipped_msg + \
+ "%mvn_package {art} <package_name>\n".format(art=skipped)
+ raise Exception(skipped_msg)
jreq = depmap.get_java_requires()
if jreq is not None:
@@ -107,4 +126,4 @@ if __name__ == "__main__":
sys.stderr.write(str(e))
# rpmbuild ignores non-zero exit codes but this that is bad. Make sure
# the build fails and doesn't silently ignore problems
- os.kill(os.getppid(), signal.SIGKILL)
+ os.kill(os.getppid(), signal.SIGTERM)
10 years, 7 months