diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7c3b1c9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/javapackages-3.4.1.tar.xz diff --git a/.javapackages-tools.metadata b/.javapackages-tools.metadata new file mode 100644 index 0000000..de073f7 --- /dev/null +++ b/.javapackages-tools.metadata @@ -0,0 +1 @@ +42db8f0afa0dda7783e23934475e7837547b46d1 SOURCES/javapackages-3.4.1.tar.xz diff --git a/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch b/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch new file mode 100644 index 0000000..107ee22 --- /dev/null +++ b/SOURCES/0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch @@ -0,0 +1,154 @@ +From 6405dfa42ff8d12fb6f810041aa89243f6ae7433 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Wed, 4 Dec 2013 17:47:06 +0100 +Subject: [PATCH 1/3] Support absolute symlinks in SCLs in mvn_file + (rhbz#1038553) + +--- + java-utils/mvn_file.py | 11 +++++------ + python/javapackages/xmvn_config.py | 10 ++++++---- + test/data/mvn_file/absolute1_00001.xml | 3 ++- + test/mvn_file_test.py | 27 +++++---------------------- + 4 files changed, 18 insertions(+), 33 deletions(-) + +diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py +index e059129..c59ed6c 100644 +--- a/java-utils/mvn_file.py ++++ b/java-utils/mvn_file.py +@@ -35,7 +35,7 @@ import sys + + from javapackages.artifact import (Artifact, ArtifactFormatException, + ArtifactValidationException) +-from javapackages.xmvn_config import XMvnConfig ++from javapackages.xmvn_config import XMvnConfig, XMvnConfigException + + class SaneParser(optparse.OptionParser): + def format_epilog(self, formatter): +@@ -61,10 +61,6 @@ commons-lang:commons-lang:war:test-jar:3.1 + if __name__ == "__main__": + parser = SaneParser(usage=usage, + epilog=epilog) +- parser.add_option("-p", "--prefix", +- help="Set prefix for converting absolute paths to "+ +- "relative", +- default="/usr/share/java") + for index, arg in enumerate(sys.argv): + sys.argv[index] = arg.decode(sys.getfilesystemencoding()) + +@@ -75,8 +71,11 @@ if __name__ == "__main__": + try: + orig = Artifact.from_mvn_str(args[0]) + orig.validate(allow_backref=False) +- XMvnConfig().add_file_mapping(orig, args[1:], options.prefix) ++ XMvnConfig().add_file_mapping(orig, args[1:]) + except (ArtifactValidationException, ArtifactFormatException), e: + parser.error("{e}: Provided artifact strings were invalid. " + "Please see help and check your arguments".format(e=e)) + sys.exit(1) ++ except XMvnConfigException, e: ++ parser.error("Incorrect configuration: {e}".format(e=e)) ++ sys.exit(1) +diff --git a/python/javapackages/xmvn_config.py b/python/javapackages/xmvn_config.py +index 838bde9..da22f0b 100644 +--- a/python/javapackages/xmvn_config.py ++++ b/python/javapackages/xmvn_config.py +@@ -43,6 +43,9 @@ from lxml.etree import ElementTree, Element, SubElement + + from javapackages.artifact import ArtifactValidationException + ++class XMvnConfigException(Exception): ++ pass ++ + class XMvnConfig(object): + """ + Class for modifying XMvn configuration +@@ -205,7 +208,7 @@ class XMvnConfig(object): + elems.append(velem) + self.__add_config("artifactManagement", "rule", content=elems) + +- def add_file_mapping(self, artifact, paths, prefix="/"): ++ def add_file_mapping(self, artifact, paths): + """ + Change where on filesystem given artifact is installed + +@@ -217,6 +220,8 @@ class XMvnConfig(object): + main = artifact.get_xml_element(root="artifactGlob") + elems = [main] + felem = Element("files") ++ if not [path for path in paths if not os.path.isabs(path)]: ++ raise XMvnConfigException("At least one path must be relative") + for path in paths: + backrefs = self.__count_backreferences(path) + if backrefs > wild_groups: +@@ -224,9 +229,6 @@ class XMvnConfig(object): + "is higher than wildcard " + "groups.") + pe = SubElement(felem, "file") +- +- if os.path.isabs(path): +- path = os.path.relpath(path, prefix) + pe.text = path + elems.append(felem) + self.__add_config("artifactManagement", "rule", content=elems) +diff --git a/test/data/mvn_file/absolute1_00001.xml b/test/data/mvn_file/absolute1_00001.xml +index 82aeba1..2a56449 100644 +--- a/test/data/mvn_file/absolute1_00001.xml ++++ b/test/data/mvn_file/absolute1_00001.xml +@@ -11,7 +11,8 @@ + a + + +- sym ++ file ++ /usr/share/java/sym + + + +diff --git a/test/mvn_file_test.py b/test/mvn_file_test.py +index 09a2648..4792497 100644 +--- a/test/mvn_file_test.py ++++ b/test/mvn_file_test.py +@@ -234,7 +234,7 @@ class TestMvnFile(unittest.TestCase): + ['artifactGlob']) + self.assertFalse(report, '\n' + report) + +- @xmvnconfig('mvn_file',['a:b', '/usr/share/java/sym', ]) ++ @xmvnconfig('mvn_file',['a:b', 'file', '/usr/share/java/sym']) + def test_absolute1(self, stdout, stderr, return_value): + self.assertEquals(return_value, 0) + filelist = get_config_file_list() +@@ -245,27 +245,10 @@ class TestMvnFile(unittest.TestCase): + ['artifactGlob']) + self.assertFalse(report, '\n' + report) + +- @xmvnconfig('mvn_file',['-p', '/usr/share/', 'a:b', '/usr/share/sym', ]) +- def test_prefix1(self, stdout, stderr, return_value): +- self.assertEquals(return_value, 0) +- filelist = get_config_file_list() +- self.assertEquals(len(filelist), 1) +- for filename in filelist: +- report = compare_xml_files(get_actual_config(filename), +- get_expected_config(filename, 'mvn_file', 'prefix1'), +- ['artifactGlob']) +- self.assertFalse(report, '\n' + report) +- +- @xmvnconfig('mvn_file',['-p', '/usr', 'a:b', '/usr/share/sym', ]) +- def test_prefix2(self, stdout, stderr, return_value): +- self.assertEquals(return_value, 0) +- filelist = get_config_file_list() +- self.assertEquals(len(filelist), 1) +- for filename in filelist: +- report = compare_xml_files(get_actual_config(filename), +- get_expected_config(filename, 'mvn_file', 'prefix2'), +- ['artifactGlob']) +- self.assertFalse(report, '\n' + report) ++ @xmvnconfig('mvn_file',['a:b', '/usr/share/java/sym', ]) ++ def test_absolute2(self, stdout, stderr, return_value): ++ self.assertNotEqual(return_value, 0) ++ self.assertTrue(stderr) + + if __name__ == '__main__': + unittest.main() +-- +1.9.0 + diff --git a/SOURCES/0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch b/SOURCES/0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch new file mode 100644 index 0000000..51a185e --- /dev/null +++ b/SOURCES/0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch @@ -0,0 +1,38 @@ +From cf8978c21d0a6f0bf9a00983f123597c8bb331b6 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 12 Feb 2014 18:24:13 +0100 +Subject: [PATCH 2/3] [macros] Fix add_maven_depmap for SCL usage + +Use %{pkg_name} when calling without arguments +Let's make sure we install fragment file without prefix +--- + etc/macros.fjava | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/etc/macros.fjava b/etc/macros.fjava +index bdfd624..e2a41e6 100644 +--- a/etc/macros.fjava ++++ b/etc/macros.fjava +@@ -52,8 +52,8 @@ + set -e \ + # default values \ + %if %# == 0 \ +- _pompart="JPP-%{name}.pom" \ +- _jarpart="%{name}.jar" \ ++ _pompart="JPP-%{?scl:%{pkg_name}}%{!?scl:%{name}}.pom" \ ++ _jarpart="%{?scl:%{pkg_name}}%{!?scl:%{name}}.jar" \ + %else \ + _pompart="%1" \ + _jarpart="%2" \ +@@ -67,7 +67,7 @@ for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \ + done \ + python -m %{javadir}-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\ + -p "%{_prefix}" -n "%{?scl}" \\\ +- %{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\ ++ %{buildroot}%{_mavendepmapfragdir}/%{?scl:%{pkg_name}}%{!?scl:%{name}}%{-f*:-%{-f*}} \\\ + %{buildroot}%{_mavenpomdir}/$_pompart \\\ + %if %# == 2 \ + "${_jpath}" \\\ +-- +1.9.0 + diff --git a/SOURCES/0003-macros-Fix-xmvn-install-for-SCL-usage.patch b/SOURCES/0003-macros-Fix-xmvn-install-for-SCL-usage.patch new file mode 100644 index 0000000..0a8cd69 --- /dev/null +++ b/SOURCES/0003-macros-Fix-xmvn-install-for-SCL-usage.patch @@ -0,0 +1,26 @@ +From 8c19c2aeaf637d39ade97c6b644ca174b3a8a8d0 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Tue, 11 Feb 2014 11:33:17 +0100 +Subject: [PATCH 3/3] [macros] Fix xmvn-install for SCL usage + +The passed package name was incorrect for xmvn-install +--- + etc/macros.xmvn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/macros.xmvn b/etc/macros.xmvn +index 5ec8123..707dac2 100644 +--- a/etc/macros.xmvn ++++ b/etc/macros.xmvn +@@ -141,7 +141,7 @@ + # buildroot. It is intended to be placed in %install section of spec file. + # + %mvn_install(J:X) \ +-xmvn-install %{?-X} -R .xmvn-reactor -n "${RPM_PACKAGE_NAME}" -d "%{buildroot}" \ ++xmvn-install %{?-X} -R .xmvn-reactor -n %{?scl:%{pkg_name}}%{!?scl:%{name}} -d "%{buildroot}" \ + jdir="%{-J*:%{-J*}}%{!-J*:target/site/apidocs}" \ + if [ -d "${jdir}" ]; then \ + install -dm755 %{buildroot}%{_javadocdir}/%{name} \ +-- +1.9.0 + diff --git a/SOURCES/0004-Fix-hardlink-creation.patch b/SOURCES/0004-Fix-hardlink-creation.patch new file mode 100644 index 0000000..bc5c264 --- /dev/null +++ b/SOURCES/0004-Fix-hardlink-creation.patch @@ -0,0 +1,25 @@ +From 381e82dc6f28448642299a073b60946fe2f114b3 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 12 May 2015 10:02:34 +0200 +Subject: [PATCH 4/4] Fix hardlink creation + +--- + java-utils/java-functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/java-utils/java-functions b/java-utils/java-functions +index dc8aa1b..c827042 100644 +--- a/java-utils/java-functions ++++ b/java-utils/java-functions +@@ -333,7 +333,7 @@ link_jar_repository() { + while [ $# -gt 0 ] ; do + case "$1" in + -h|--hard) +- _LINK_CMD="ln -f" ++ _LINK_CMD="ln -fL" + ;; + -s|--soft|--symbolic) + _LINK_CMD="ln -fs" +-- +2.1.0 + diff --git a/SOURCES/0005-Add-abrt-java-connector-bits.patch b/SOURCES/0005-Add-abrt-java-connector-bits.patch new file mode 100644 index 0000000..92f7e70 --- /dev/null +++ b/SOURCES/0005-Add-abrt-java-connector-bits.patch @@ -0,0 +1,183 @@ +From be3d32fe7a2b59f682e27022931a27fa552d052d Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 17 Jun 2014 14:51:08 +0200 +Subject: [PATCH] Add abrt-java-connector bits + +Honor JAVACMD_OPTS with a path to the abrt connector agent when: + 1. JAVA_ABRT environment variable does not hold 'off' + 2. the connector's library exists + 3. abrtd is running + +We have to use JAVACMD_OTPS variable instead of FLAGS and OPTIONS +because applications (i.e. ant) migth use the following workflow: + . /usr/share/java-utils/java-functions + set_javacmd + $JAVACMD MyClass + +FLAGS and OPTIONS variables are used only from run() function. + +Use architecture-independent location of abrt-java-connector + +The connector's library has been moved to architecture-independent +directory /usr/lib/abrt-java-connector/, because Java does not +officially support multilib and having the connector installed the arch +specific directory was causing us problems if Java package doesn't match +host architecture (e.g. Java i386 on host x86_64). + +Signed-off-by: Jakub Filak + +Use wrapper script to inject extra JVM arguments (rhbz#1153652) + +Add JAVA_ABRT=off to java.conf template + +Log injecting ABRT agent +--- + build | 2 ++ + configure | 6 ++++++ + etc/java.conf | 4 ++++ + install | 1 + + java-utils/java-functions | 22 ++++++++++++++++++++-- + java-utils/java-wrapper | 8 ++++++++ + 6 files changed, 41 insertions(+), 2 deletions(-) + create mode 100644 java-utils/java-wrapper + +diff --git a/build b/build +index 23cbb90..4e974c0 100755 +--- a/build ++++ b/build +@@ -61,7 +61,9 @@ expand() + -e "s|%{jvmdir}|${jvmdir}|" \ + -e "s|%{m2home}|${m2home}|" \ + -e "s|%{prefix}|${prefix}|" \ ++ -e "s|%{rundir}|${rundir}|" \ + -e "s|%{sysconfdir}|${sysconfdir}|" \ ++ -e "s|%{abrtlibdir}|${abrtlibdir}|" \ + "${1}" >"${target}" + } + +diff --git a/configure b/configure +index 3288fda..4f22ceb 100755 +--- a/configure ++++ b/configure +@@ -35,8 +35,10 @@ set -e + vars=" + bindir + datadir ++localstatedir + mandir + prefix ++rundir + sysconfdir + rpmconfigdir + +@@ -58,6 +60,7 @@ jvmsysconfdir + mavendepmapdir + mavendepmapfragdir + mavenpomdir ++abrtlibdir + " + + vars_re=$(echo $vars | sed 's/ /\\|/g') +@@ -68,11 +71,14 @@ eval $(for _; do echo "$_"; done | + test -z "${prefix}" && prefix="/usr/local" + test -z "${bindir}" && bindir="${prefix}/bin" + test -z "${datadir}" && datadir="${prefix}/share" ++test -z "${localstatedir}" && localstatedir="${prefix}/var" + test -z "${mandir}" && mandir="${datadir}/man" ++test -z "${rundir}" && rundir="${localstatedir}/run" + test -z "${sysconfdir}" && sysconfdir="${prefix}/etc" + test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" + + test -z "${m2home}" && m2home="${datadir}/xmvn" ++test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector" + + eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' etc/macros.jpackage) + +diff --git a/etc/java.conf b/etc/java.conf +index fa0a989..042e9ad 100644 +--- a/etc/java.conf ++++ b/etc/java.conf +@@ -22,3 +22,7 @@ JVM_ROOT=%{jvmdir} + + # Options to pass to the java interpreter + #JAVACMD_OPTS= ++ ++# You can disable ABRT Java Connector by setting JAVA_ABRT to "off". ++# See: https://github.com/jfilak/abrt-java-connector/ ++#JAVA_ABRT=off +diff --git a/install b/install +index d0b941a..33690ed 100755 +--- a/install ++++ b/install +@@ -118,6 +118,7 @@ inst_config etc/font.properties "${javaconfdir}" + inst_config target/java.conf "${javaconfdir}" + + inst_data target/java-functions "${javadir}-utils" ++inst_exec java-utils/java-wrapper "${javadir}-utils" + inst_data java-utils/maven_depmap.py "${javadir}-utils" + inst_data java-utils/pom_editor.sh "${javadir}-utils" + +diff --git a/java-utils/java-functions b/java-utils/java-functions +index dc8aa1b..e9a763a 100644 +--- a/java-utils/java-functions ++++ b/java-utils/java-functions +@@ -109,6 +109,14 @@ _load_java_conf() + if [ -n "${java_opts_save}" ]; then + JAVACMD_OPTS="${java_opts_save}" + fi ++ ++ if [ "_${JAVA_ABRT}" != "_off" -a -f "%{abrtlibdir}/libabrt-java-connector.so" -a -f "%{rundir}/abrt/abrtd.pid" ]; then ++ _log "ABRT Java connector was enabled" ++ _log "Using ABRT Java agent: %{abrtlibdir}/libabrt-java-connector.so" ++ JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:%{abrtlibdir}/libabrt-java-connector.so=abrt=on" ++ else ++ _log "ABRT Java connector is disabled" ++ fi + } + + +@@ -224,7 +232,12 @@ set_javacmd() + JAVACMD="${JAVA_HOME}/${cmd}" + if [ -x "${JAVACMD}" ]; then + _log "Using configured JAVACMD: $JAVACMD" +- JAVACMD="${JAVACMD}${JAVACMD_OPTS:+ }${JAVACMD_OPTS}" ++ if [ -n "${JAVACMD_OPTS}" ]; then ++ _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" ++ export _JP_JAVACMD="${JAVACMD}" ++ export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" ++ JAVACMD="%{javadir}-utils/java-wrapper" ++ fi + return 0 + fi + done +@@ -232,7 +245,12 @@ set_javacmd() + JAVACMD=$(which java 2>/dev/null || :) + if [ -x "${JAVACMD}" ]; then + _log "Using JAVACMD from PATH: $JAVACMD" +- JAVACMD="${JAVACMD}${JAVACMD_OPTS:+ }${JAVACMD_OPTS}" ++ if [ -n "${JAVACMD_OPTS}" ]; then ++ _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" ++ export _JP_JAVACMD="${JAVACMD}" ++ export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" ++ JAVACMD="%{javadir}-utils/java-wrapper" ++ fi + return 0 + fi + +diff --git a/java-utils/java-wrapper b/java-utils/java-wrapper +new file mode 100644 +index 0000000..29b3143 +--- /dev/null ++++ b/java-utils/java-wrapper +@@ -0,0 +1,8 @@ ++#!/bin/sh ++ ++JAVACMD="${_JP_JAVACMD}" ++JAVACMD_OPTS="${_JP_JAVACMD_OPTS}" ++unset _JP_JAVACMD ++unset _JP_JAVACMD_OPTS ++ ++exec "${JAVACMD}" ${JAVACMD_OPTS} "${@}" +-- +2.4.3 + diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec new file mode 100644 index 0000000..c05ba83 --- /dev/null +++ b/SPECS/javapackages-tools.spec @@ -0,0 +1,464 @@ +Name: javapackages-tools +Version: 3.4.1 +Release: 11%{?dist} + +Summary: Macros and scripts for Java packaging support + +License: BSD +URL: https://fedorahosted.org/javapackages/ +Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz + +# rhbz 1038553 +Patch1: 0001-Support-absolute-symlinks-in-SCLs-in-mvn_file-rhbz-1.patch +# rhbz 1098523 (two patches) +Patch2: 0002-macros-Fix-add_maven_depmap-for-SCL-usage.patch +Patch3: 0003-macros-Fix-xmvn-install-for-SCL-usage.patch +# rhbz 1220469 +Patch4: 0004-Fix-hardlink-creation.patch +# rhbz 1117848 +Patch5: 0005-Add-abrt-java-connector-bits.patch + +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: asciidoc +BuildRequires: xmlto +BuildRequires: python-lxml +BuildRequires: python2-devel +BuildRequires: python-setuptools + +Requires: coreutils +Requires: libxslt +Requires: lua +Requires: python +Requires: python-javapackages = %{version}-%{release} + +Provides: jpackage-utils = %{version}-%{release} +Obsoletes: jpackage-utils < %{version}-%{release} + +%description +This package provides macros and scripts to support Java packaging. + +%package -n maven-local +Summary: Macros and scripts for Maven packaging support +Requires: %{name} = %{version}-%{release} +Requires: maven +Requires: xmvn >= 1.0.0-0.1 +# POM files needed by maven itself +Requires: apache-commons-parent +Requires: apache-parent +Requires: geronimo-parent-poms +Requires: httpcomponents-project +Requires: jboss-parent +Requires: jvnet-parent +Requires: maven-parent +Requires: maven-plugins-pom +Requires: mojo-parent +Requires: plexus-components-pom +Requires: plexus-pom +Requires: plexus-tools-pom +Requires: sonatype-oss-parent +Requires: weld-parent +# Common Maven plugins required by almost every build. It wouldn't make +# sense to explicitly require them in every package built with Maven. +Requires: maven-assembly-plugin +Requires: maven-compiler-plugin +Requires: maven-enforcer-plugin +Requires: maven-jar-plugin +Requires: maven-javadoc-plugin +Requires: maven-resources-plugin +Requires: maven-surefire-plugin +# Tests based on JUnit are very common and JUnit itself is small. +# Include JUnit provider for Surefire just for convenience. +Requires: maven-surefire-provider-junit +# testng is quite common as well +Requires: maven-surefire-provider-testng + +%description -n maven-local +This package provides macros and scripts to support packaging Maven artifacts. + +%package -n python-javapackages +Summary: Module for handling various files for Java packaging +Requires: python-lxml + +%description -n python-javapackages +Module for handling, querying and manipulating of various files for Java +packaging in Linux distributions + + + +%prep +%setup -q -n javapackages-%{version} + +sed -i '/fedora-review/d' install +sed -i 's:\(inst_exec target/mvn-local\).*:\1 ${javadir}-utils:' install + +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 + +%build +%configure +./build +pushd python +%{__python} setup.py build +popd + +%install +./install +sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* + +pushd python +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +popd + +# no fedora-review in RHEL 7 +rm -rf %{buildroot}/%{_datadir}/fedora-review/ + +%check +# We need formencode for tests +#pushd python +#%{__python} setup.py test +#popd +#pushd test +#%{__python} -m unittest discover -p '*_test.py' +#popd + + + +%files -f files-common +%doc LICENSE + +%files -n maven-local -f files-maven + +%files -n python-javapackages +%doc LICENSE +%{python_sitelib}/javapackages* + + +%changelog +* Wed Jun 24 2015 Michal Srb - 3.4.1-11 +- Add support for abrt-java-connector +- Resolves: rhbz#1117848 + +* Tue May 12 2015 Mikolaj Izdebski - 3.4.1-10 +- Fix hardlink creation +- Resolves: rhbz#1220469 + +* Fri Jul 25 2014 Michal Srb - 3.4.1-9 +- Bump release +- Resolves: rhbz#1098523 + +* Fri May 16 2014 Mikolaj Izdebski - 3.4.1-6 +- Fix add_maven_depmap and xmvn-install for SCL usage +- Resolves: rhbz#1098523 + +* Fri Dec 27 2013 Daniel Mach - 3.4.1-5 +- Mass rebuild 2013-12-27 + +* Mon Dec 16 2013 Stanislav Ochotnicky - 3.4.1-4 +- Support absolute symlinks in SCLs in mvn_file +- Resolves: rhbz#1038553 + +* Thu Dec 12 2013 Stanislav Ochotnicky - 3.4.1-3 +- Move mvn-local out of bindir +- Resolves: rhbz#1015422 + +* Thu Nov 14 2013 Mikolaj Izdebski - 3.4.1-2 +- Add versioned requires on python-javapackages + +* Wed Nov 06 2013 Stanislav Ochotnicky - 3.4.1-1 +- Rebase to bugfix release 3.4.1 +- Related: rhbz#1015158 + +* Tue Oct 08 2013 Stanislav Ochotnicky - 3.3.1-2 +- Remove workaround for guice-no_aop +- Remove fedora-review subpackage +- Resolves: rhbz#1016667 +- Related: rhbz#1015158 + +* Wed Oct 2 2013 Mikolaj Izdebski - 3.3.1-1 +- Update to upstream version 3.3.1 +- Remove workaround for sisu-guice no_aop + +* Tue Oct 01 2013 Stanislav Ochotnicky - 3.3.0-1 +- Update to upstream version 3.3.0 + +* Wed Sep 25 2013 Stanislav Ochotnicky - 3.2.4-2 +- Fix installation of artifacts with classifier + +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.4-1 +- Update to upstream version 3.2.4 + +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.3-1 +- Update to upstream version 3.2.3 + +* Fri Sep 20 2013 Michal Srb - 3.2.2-1 +- Update to upstream version 3.2.2 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.1-1 +- Update to upstream version 3.2.1 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.1.2-1 +- Update to upstream version 3.1.2 + +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.1-1 +- Update to upstream version 3.1.1 + +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Mon Sep 16 2013 Mikolaj Izdebski - 3.0.4-2 +- Add depmap for sun.jdk:jconsole + +* Fri Sep 13 2013 Stanislav Ochotnicky - 3.0.4-1 +- Update to upstream version 3.0.4 + +* Wed Sep 11 2013 Stanislav Ochotnicky - 3.0.3-1 +- Update to upstream version 3.0.3 + +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-3 +- Fix a typo in temporary depmap + +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-2 +- Make sure we do not provide google guice mapping + +* Tue Sep 10 2013 Stanislav Ochotnicky 3.0.2-1 +- Update to upstream version 3.0.2 +- Add separate python-javapackages subpackage +- Add separate fedora-review-plugin-java subpackage +- Enable part of unit tests + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.2 +- Fix javadoc directory override + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.1 +- Update to upstream pre-release version 3.0.0 + +* Fri Jul 26 2013 Mikolaj Izdebski - 2.0.1-1 +- Update to upstream version 2.0.1 +- Fix creation of artifact aliases, resolves: rhbz#988462 + +* Thu Jul 25 2013 Mikolaj Izdebski - 2.0.0-2 +- Require maven-resources-plugin by maven-local + +* Thu Jul 11 2013 Mikolaj Izdebski - 2.0.0-1 +- Update to upstream version 2.0.0 +- Merge functionality of jpackage-utils +- Provide and obsolete jpackage-utils +- %%add_maven_depmap macro now injects pom.properties to every JAR +- %%add_to_maven_depmap and %%update_maven_depmap macros were removed +- maven2jpp-mapdeps.xsl template has been removed +- Macros related to installation of icons and desktop files were removed +- 14 new manual pages were added +- Documentation specific to JPackage was removed +- Add BuildRequires: asciidoc, xmlto + +* Mon Jul 1 2013 Mikolaj Izdebski - 0.15.0-2 +- Add R: jvnet-parent + +* Wed Jun 5 2013 Mikolaj Izdebski - 0.15.0-1 +- Update to upstream version 0.15.0 +- Added depmap for tools.jar +- Added support for versioned autorequires +- New plugin metadata from Maven Central + +* Tue Jun 4 2013 Stanislav Ochotnicky - 0.14.1-2 +- Add several maven plugins to maven-local requires + +* Wed May 29 2013 Stanislav Ochotnicky - 0.14.1-1 +- Update to upstream version 0.14.1 with disabled debugging + +* Tue Apr 09 2013 Michal Srb - 0.14.0-1 +- Update to upstream version 0.14.0 + +* Mon Apr 8 2013 Mikolaj Izdebski - 0.13.7-2 +- Add R: maven-surefire-provider-junit4 to maven-local + +* Fri Mar 22 2013 Mikolaj Izdebski - 0.13.7-1 +- Update to upstream version 0.13.7 + +* Wed Mar 20 2013 Mikolaj Izdebski - 0.13.6-4 +- Add geronimo-parent-poms to common POMs + +* Wed Mar 20 2013 Mikolaj Izdebski - 0.13.6-3 +- Add weld-parent to common POMs + +* Wed Mar 20 2013 Stanislav Ochotnicky - 0.13.6-2 +- Fix conditional macro to evaluate properly when fedora is not defined + +* Mon Mar 18 2013 Mikolaj Izdebski - 0.13.6-1 +- Update to upstream version 0.13.6 + +* Wed Mar 13 2013 Mikolaj Izdebski - 0.13.5-1 +- Update to upstream version 0.13.5 + +* Wed Mar 13 2013 Mikolaj Izdebski - 0.13.4-1 +- Update to upstream version 0.13.4 + +* Tue Mar 12 2013 Mikolaj Izdebski - 0.13.3-1 +- Update to upstream version 0.13.3 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0.13.2-1 +- Update to upstream version 0.13.2 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0.13.1-1 +- Update to upstream version 0.13.1 + +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-1 +- Update to upstream version 0.13.0 + +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-0.1.git2f13366 +- Upate to upstream pre-release snapshot 2f13366 + +* Mon Mar 4 2013 Mikolaj Izdebski - 0.12.6-1 +- Update to upstream version 0.12.6 +- Resolves: rhbz#917618 (remove jetty orbit provides) +- Resolves: rhbz#917647 (system.bundle into autogenerated deps) + +* Fri Mar 1 2013 Stanislav Ochotnicky - 0.12.5-1 +- Update to upstream version 0.12.5 +- Resolves problems with compat package provides and automatic requires + +* Wed Feb 27 2013 Mikolaj Izdebski - 0.12.4-2 +- Don't mark RPM macro files as configuration + +* Mon Feb 25 2013 Mikolaj Izdebski - 0.12.4-1 +- Update to upstream version 0.12.4 +- Resolves: rhbz#913630 (versioned requires between subpackages) + +* Fri Feb 22 2013 Mikolaj Izdebski - 0.12.3-1 +- Update to upstream version 0.12.3 +- Resolves: rhbz#913694 (No plugin found for prefix 'X') + +* Wed Feb 20 2013 Mikolaj Izdebski - 0.12.2-1 +- Update to upstream version 0.12.2 +- Resolves: rhbz#913120 (MAVEN_OPTS are not passed to Maven) + +* Mon Feb 18 2013 Mikolaj Izdebski - 0.12.1-1 +- Update to upstream version 0.12.1 +- Resolves: rhbz#912333 (M2_HOME is not exported) + +* Fri Feb 15 2013 Mikolaj Izdebski - 0.12.0-1 +- Update to upstream version 0.12.0 +- Implement new pom macros: xpath_replace and xpath_set +- Remove Support-local-depmaps.patch (accepted upstream) + +* Fri Feb 15 2013 Mikolaj Izdebski - 0.11.2-6 +- Support local depmaps + +* Thu Feb 14 2013 Mikolaj Izdebski - 0.11.2-5 +- Add some maven-local Requires for convenience + +* Thu Feb 7 2013 Mikolaj Izdebski - 0.11.2-4 +- Add missing R: httpcomponents-project + +* Thu Feb 7 2013 Mikolaj Izdebski - 0.11.2-3 +- Add missing R: jboss-patent + +* Wed Feb 6 2013 Mikolaj Izdebski - 0.11.2-2 +- Don't install mvn-local and mvn-rpmbuild on F18 + +* Wed Jan 30 2013 Mikolaj Izdebski - 0.11.2-1 +- Update to upstream version 0.11.2 + +* Wed Jan 30 2013 Mikolaj Izdebski - 0.11.1-1 +- Update to upstream version 0.11.1 + +* Wed Jan 23 2013 Mikolaj Izdebski - 0.11.0-1 +- Update to upstream version 0.11.0 +- Add mvn-local and mvn-rpmbuild scripts + +* Mon Jan 21 2013 Mikolaj Izdebski - 0.10.1-1 +- Update to upstream version 0.10.1 + +* Mon Jan 7 2013 Mikolaj Izdebski - 0.10.0-1 +- Update to upstream version 0.10.0 +- Implement %%xmvn_alias, %%xmvn_file and %%xmvn_package macros +- Fix regex in osgi.attr +- Add support for pre- and post-goals in mvn-build script + +* Mon Dec 10 2012 Mikolaj Izdebski - 0.9.1-1 +- Update to upstream version 0.9.1 +- Resolves: rhbz#885636 + +* Thu Dec 6 2012 Stanislav Ochotnicky - 0.9.0-1 +- Update to latest upstream version +- Enable maven requires generator for xmvn packages +- Enable requires generator for javadoc packages + +* Wed Dec 5 2012 Stanislav Ochotnicky - 0.8.3-1 +- Update to upstream version 0.8.3 +- Fix maven provides generator for new XML valid fragments + +* Fri Nov 30 2012 Mikolaj Izdebski - 0.8.2-1 +- Update to upstream version 0.8.2 + +* Fri Nov 30 2012 Mikolaj Izdebski - 0.8.1-1 +- Update to upstream version 0.8.1 + +* Wed Nov 28 2012 Mikolaj Izdebski - 0.8.0-1 +- Update to upstream version 0.8.0 +- Add xmvn macros + +* Tue Nov 27 2012 Mikolaj Izdebski - 0.7.5-3 +- Add BR: jpackage-utils + +* Tue Nov 27 2012 Mikolaj Izdebski - 0.7.5-2 +- Add maven-local subpackage + +* Thu Nov 08 2012 Stanislav Ochotnicky - 0.7.5-1 +- Fix versioned pom installation by quoting _jpath + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.4-1 +- Shorten maven filelist filenames + +* Wed Oct 31 2012 Mikolaj Izdebski - 0.7.3-1 +- Update to upstream version 0.7.3 + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.2-1 +- Make sure add_maven_depmap fails when python tracebacks + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.1-1 +- Fix problem with exception in default add_maven_depmap invocation + +* Tue Oct 30 2012 Stanislav Ochotnicky - 0.7.0-1 +- Update to latest upstream +- Full support for compat depmap generation +- Generate maven-files-%%{name} with a list of files to package +- Add support for maven repo generation (alpha version) + +* Mon Jul 30 2012 Stanislav Ochotnicky - 0.6.0-1 +- Update to upstream version 0.6.0 +- Make maven provides versioned +- Add additional pom_ macros to simplify additional pom editing + +* Wed Jul 25 2012 Stanislav Ochotnicky - 0.5.0-1 +- Update to upstream version 0.5.0 - add support for add_maven_depmap -v + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 9 2012 Mikolaj Izdebski - 0.4.1-1 +- Update to upstream version 0.4.1 +- Fixes #837203 + +* Wed Jun 27 2012 Mikolaj Izdebski - 0.4.0-1 +- Update to upstream version 0.4.0 + +* Tue Mar 6 2012 Stanislav Ochotnicky - 0.3.1-1 +- Create maven provides from fragments instead of poms + +* Thu Feb 16 2012 Stanislav Ochotnicky - 0.3.0-3 +- Fix maven_depmap installation + +* Wed Feb 15 2012 Stanislav Ochotnicky - 0.3.0-2 +- Add conflicts with older jpackage-utils + +* Wed Feb 15 2012 Stanislav Ochotnicky - 0.3.0-1 +- Initial version split from jpackage-utils