[maven-doxia] Forwardable patches forwarded
by Mikolaj Izdebski
commit e1938e63b5383b88a55a6fbda594db1214ca0267
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 7 08:40:38 2013 +0100
Forwardable patches forwarded
maven-doxia.spec | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 802f3d6..9e4970a 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -45,17 +45,19 @@ URL: http://maven.apache.org/doxia/
Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/dox...
-# TODO: push upstream
# abstract class should not be annotated as component because maven
# will pick it up and try to instantiate
+# Forwarded upstream: DOXIA-503
Patch1: 0001-doxia-core-remove-plexus-component-annotation.patch
# Build against iText 2.x
# http://jira.codehaus.org/browse/DOXIA-53
Patch2: 0004-Fix-itext-dependency.patch
+# Forwarded upstream: DOXIA-504
Patch3: 0001-Update-to-Plexus-Container-1.5.5.patch
+# Forwarded upstream: DOXIA-505
Patch4: 0001-Update-to-Commons-Collections-1.10.patch
BuildArch: noarch
10 years, 6 months
[maven-doxia] Port to Commons Collections 1.10
by Mikolaj Izdebski
commit 6fb838be228b617f4d9b042a2aea26ea60bd5fbb
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 7 08:26:09 2013 +0100
Port to Commons Collections 1.10
0001-Update-to-Commons-Collections-1.10.patch | 32 +++++++++++++++++++++++++
maven-doxia.spec | 8 +++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0001-Update-to-Commons-Collections-1.10.patch b/0001-Update-to-Commons-Collections-1.10.patch
new file mode 100644
index 0000000..769efb9
--- /dev/null
+++ b/0001-Update-to-Commons-Collections-1.10.patch
@@ -0,0 +1,32 @@
+From 81d4838fefbf7a87dc46eb5a55b18e77320b7884 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Thu, 7 Nov 2013 08:24:01 +0100
+Subject: [PATCH] Update to Commons Collections 1.10
+
+---
+ doxia-modules/doxia-module-fo/pom.xml | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml
+index 1adb4f0..75ff692 100644
+--- a/doxia-modules/doxia-module-fo/pom.xml
++++ b/doxia-modules/doxia-module-fo/pom.xml
+@@ -73,7 +73,14 @@ under the License.
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+- <version>1.6</version>
++ <version>1.10</version>
++ </dependency>
++ <dependency>
++ <groupId>commons-collections</groupId>
++ <artifactId>commons-collections</artifactId>
++ <version>3.2.1</version>
++ <!-- runtime dep for commons-configuration -->
++ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+--
+1.8.1.4
+
diff --git a/maven-doxia.spec b/maven-doxia.spec
index da438ae..802f3d6 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -35,7 +35,7 @@
Name: maven-doxia
Version: 1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
@@ -56,6 +56,8 @@ Patch2: 0004-Fix-itext-dependency.patch
Patch3: 0001-Update-to-Plexus-Container-1.5.5.patch
+Patch4: 0001-Update-to-Commons-Collections-1.10.patch
+
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
@@ -245,6 +247,7 @@ API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# we don't have clirr-maven-plugin
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@@ -303,6 +306,9 @@ API documentation for %{name}.
%changelog
+* Thu Nov 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.4-4
+- Port to Commons Collections 1.10
+
* Wed Nov 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.4-3
- Enable tests
10 years, 6 months
[javapackages] [test] Fix pom_remove_plugin test
by Michal Srb
commit d3c974c9c138f586e10a52078d38b8e63de16882
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 08:16:59 2013 +0100
[test] Fix pom_remove_plugin test
.../pom_macros/pom_remove_plugin_nons.xml-want | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/test/data/pom_macros/pom_remove_plugin_nons.xml-want b/test/data/pom_macros/pom_remove_plugin_nons.xml-want
index c5c886d..17436b1 100644
--- a/test/data/pom_macros/pom_remove_plugin_nons.xml-want
+++ b/test/data/pom_macros/pom_remove_plugin_nons.xml-want
@@ -1,4 +1,4 @@
-<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">
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
@@ -12,10 +12,7 @@
<build>
<plugins>
- <plugin>
- <groupId>my.group</groupId>
- <artifactId>my-plugin</artifactId>
- </plugin>
+ <!-- plugin disabled by maintainer: my.group:my-plugin -->
<plugin>
<groupId>my.group</groupId>
<artifactId>My-plugin</artifactId>
10 years, 6 months
[Bug 1019086] New: javapackages-tools: Don't prefix XMvn package name with %{?scl_prefix}
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1019086
Bug ID: 1019086
Summary: javapackages-tools: Don't prefix XMvn package name
with %{?scl_prefix}
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:
In SCL %mvn_build should set XMvn package name to %{pkg_name}, not %{name}.
In current state porting packages to SCL is more difficult and time consuming
as generated packages have different paths and therefore things like:
build-classpath foo
need to be changed to:
build-classpath %{?scl_prefix}foo
Besides that the SCL prefix is repeated in some places which does not help with
anything, but only makes paths longer.
Version-Release number of selected component (if applicable):
3.4.0-2
--
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=2NVMR052tr&a=cc_unsubscribe
10 years, 6 months
[Bug 1017701] New: javapackages-tools: Incorrect versioned requires
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1017701
Bug ID: 1017701
Summary: javapackages-tools: Incorrect versioned requires
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:
In some cases generated requires are versioned when they should be versionless.
Version-Release number of selected component (if applicable):
3.3.1-1
Steps to Reproduce:
Run autorequires generator for package with the following two fragments:
$ cat api.xml
<?xml version="1.0" encoding="US-ASCII"?>
<!-- This depmap file was generated by XMvn -->
<dependencyMap>
<dependency>
<maven>
<namespace>maven31</namespace>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>0.9.0.M3</version>
</maven>
<jpp>
<namespace>maven31</namespace>
<groupId>JPP/maven31-aether</groupId>
<artifactId>aether-api</artifactId>
</jpp>
</dependency>
</dependencyMap>
$ cat spi.xml
<?xml version="1.0" encoding="US-ASCII"?>
<!-- This depmap file was generated by XMvn -->
<dependencyMap>
<dependency>
<maven>
<namespace>maven31</namespace>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>0.9.0.M3</version>
</maven>
<jpp>
<namespace>maven31</namespace>
<groupId>JPP/maven31-aether</groupId>
<artifactId>aether-spi</artifactId>
</jpp>
</dependency>
<autoRequires>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
</autoRequires>
</dependencyMap>
Actual results:
Generated Requires is:
mvn(org.eclipse.aether:aether-api) = 0.9.0.M3
Expected results:
Generated Requires should be:
mvn(org.eclipse.aether:aether-api)
--
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=IDltqEtgcQ&a=cc_unsubscribe
10 years, 6 months
[Bug 977980] New: javapackages-tools: mvn-rpmbuild should be marked as deprecated
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=977980
Bug ID: 977980
Summary: javapackages-tools: mvn-rpmbuild should be marked as
deprecated
Product: Fedora
Version: rawhide
Component: javapackages-tools
Keywords: FutureFeature, Triaged
Severity: unspecified
Priority: medium
Assignee: mizdebsk(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, tradej(a)redhat.com
Description of problem:
mvn-rpmbuild should be deprecated (but not removed yet). Ideally the script
itself would print a warning saying that it's not supposed to be used any
longer and that users should mograte to other ways of building packages.
Version-Release number of selected component (if applicable):
0.15.0-1
--
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=xG4d81UWhR&a=cc_unsubscribe
10 years, 6 months
[javapackages] [doc] Fix typo
by Michal Srb
commit 1757e8819d632b22f5f70d96e476b39c579c486d
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Nov 6 15:17:30 2013 +0100
[doc] Fix typo
doc/fedora_java_specifics.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/doc/fedora_java_specifics.txt b/doc/fedora_java_specifics.txt
index 110da35..e762289 100644
--- a/doc/fedora_java_specifics.txt
+++ b/doc/fedora_java_specifics.txt
@@ -15,7 +15,7 @@ $ java org/fedoraproject/helloworld/HelloWorld.class
--------
For developers, `javac` command is probably one of the most important
-tools from OpenJDK. It's a Java compiler which tranaslates source files
+tools from OpenJDK. It's a Java compiler which translates source files
to Java bytecode, which can be later interpreted by JVM. Other
interesting tools are `javadoc` and `javap`. `javadoc` is a tool for
generating Javadoc documentation and `javap` can be used for
10 years, 6 months
[javapackages] [doc] Improve "Introduction for packagers" section
by Michal Srb
commit a47380d9b102ccb60a46c1e258f96bfc14d4c32a
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Nov 6 15:11:59 2013 +0100
[doc] Improve "Introduction for packagers" section
doc/introduction_for_packagers.txt | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/doc/introduction_for_packagers.txt b/doc/introduction_for_packagers.txt
index 59682b7..997a62b 100644
--- a/doc/introduction_for_packagers.txt
+++ b/doc/introduction_for_packagers.txt
@@ -84,6 +84,27 @@ all Java applications have to use wrapper shell scripts to setup the environment
before invoking the JVM and running the application itself. Note that this is
not necessary for libraries.
+The sample project can be compiled to a bytecode by Java compiler. Java
+compiler can be typically invoked from command line by command `javac`.
+
+[source,shell]
+------
+$ javac `find . -name *.java`
+------
+
+For every `.java` file corresponding `.class` file will be created. The
+`.class` files contain Java bytecode which is meant to be executed on
+JVM.
+
+One could put invocation of `javac` to Makefile and simplify the
+compilation a bit. It might be sufficient for such a simple project, but
+it would quickly become hard to build more complex projects with this
+approach. Java world knows several high-level build systems which can
+highly simplify building of Java projects. Among the others, probably
+most known are http://maven.apache.org/[Apache Maven],
+http://ant.apache.org/[Apache Ant] and http://www.gradle.org/[Gradle].
+
+
[[classpath]]
==== Class path
10 years, 6 months