[maven-doxia-tools] Install NOTICE file with javadoc package
by Mikolaj Izdebski
commit e27d7ce87194a454c1950c27c4361aa70191305d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 1 18:44:35 2013 +0200
Install NOTICE file with javadoc package
- Update to current packaging guidelines
- Fix BuildRequires
maven-doxia-tools.spec | 113 +++++++++++++++++++-----------------------------
1 files changed, 45 insertions(+), 68 deletions(-)
---
diff --git a/maven-doxia-tools.spec b/maven-doxia-tools.spec
index a23291a..c46ee3a 100644
--- a/maven-doxia-tools.spec
+++ b/maven-doxia-tools.spec
@@ -1,91 +1,68 @@
-Name: maven-doxia-tools
-Version: 1.4
-Release: 12%{?dist}
-Summary: Maven Doxia Integration Tools
-
-Group: Development/Libraries
-License: ASL 2.0
-URL: http://maven.apache.org/shared/maven-doxia-tools/
-Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/...
-Patch0: %{name}-migration-to-component-metadata.patch
-
-BuildRequires: apache-commons-io >= 1.4
-BuildRequires: apache-commons-logging
-BuildRequires: plexus-utils
-BuildRequires: plexus-interpolation
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-i18n
-BuildRequires: maven-local
-BuildRequires: maven-doxia-logging-api
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-shared-reporting-impl
-BuildRequires: plexus-containers-component-metadata
-BuildRequires: java-devel >= 1:1.6.0
-
-BuildArch: noarch
-
-Requires: apache-commons-io >= 1.4
-Requires: plexus-utils
-Requires: plexus-interpolation
-Requires: plexus-containers-container-default
-Requires: plexus-i18n
-Requires: maven-doxia-logging-api
-Requires: maven-doxia-sitetools
-
-Requires: jpackage-utils
+Name: maven-doxia-tools
+Version: 1.4
+Release: 13%{?dist}
+Summary: Maven Doxia Integration Tools
+License: ASL 2.0
+URL: http://maven.apache.org/shared/maven-doxia-tools/
+BuildArch: noarch
+
+Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/...
+
+Patch0: %{name}-migration-to-component-metadata.patch
+
+BuildRequires: maven-local
+BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-logging-api)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires: mvn(org.codehaus.plexus:plexus-i18n)
+BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
%description
A collection of tools to help the integration of Doxia in Maven plugins.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
-Requires: jpackage-utils
+Summary: API documentation for %{name}
%description javadoc
-API documentation for %{name}.
+This package contains %{summary}.
%prep
%setup -q
%patch0 -b .sav
%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
+%mvn_file : %{name}
+%mvn_alias : org.apache.maven.doxia:doxia-integration-tools
+
%build
-mvn-rpmbuild \
- -Dmaven.test.skip=true \
- install javadoc:aggregate
+%mvn_build -f
%install
-# jars
-install -Dm 644 target/%{name}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
-
-# poms
-install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.apache.maven.doxia:doxia-integration-tools
+%files -f .mfiles
+%doc LICENSE NOTICE
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE NOTICE DEPENDENCIES
-
-%files javadoc
-%doc %{_javadocdir}/*
-%doc LICENSE
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Tue Oct 1 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.4-13
+- Install NOTICE file with javadoc package
+- Update to current packaging guidelines
+- Fix BuildRequires
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 6 months
[annotation-indexer] Backport upstream patch. It helps to identify root problem when build fails
by Michal Srb
commit 1ebd207a2d1daa03c707063545ce6972ec6b6f6a
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Oct 1 15:46:08 2013 +0200
Backport upstream patch. It helps to identify root problem when build fails
...urce-tree-contains-a-compilation-error-it.patch | 42 ++++++++++++++++++++
annotation-indexer.spec | 10 ++++-
2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/0001-when-the-source-tree-contains-a-compilation-error-it.patch b/0001-when-the-source-tree-contains-a-compilation-error-it.patch
new file mode 100644
index 0000000..8fea497
--- /dev/null
+++ b/0001-when-the-source-tree-contains-a-compilation-error-it.patch
@@ -0,0 +1,42 @@
+From 72d8ad1ce5d8dc6f301b6acc7602fbba3a0299dc Mon Sep 17 00:00:00 2001
+From: Kohsuke Kawaguchi <kk(a)kohsuke.org>
+Date: Wed, 27 Mar 2013 16:22:24 -0700
+Subject: [PATCH] when the source tree contains a compilation error, it could
+ end up here.
+
+I observed that when there's a compilation error where a constructor has unresolvable annotation like the following, then that ends up in here, masking the root problem.
+
+class Foo {
+ @ThereIsNoSuchAnnotation
+ public Foo() { ... }
+}
+---
+ .../org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java b/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java
+index 0d64636..ec46fd8 100644
+--- a/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java
++++ b/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java
+@@ -82,7 +82,8 @@ public class AnnotationProcessorImpl extends AbstractProcessor {
+ t = (TypeElement) elt.getEnclosingElement();
+ break;
+ default:
+- throw new AssertionError(elt.getKind());
++// throw new AssertionError(elt.getKind());
++ return;
+ }
+ classes.add(getElementUtils().getBinaryName(t).toString());
+ }
+@@ -138,7 +139,7 @@ public class AnnotationProcessorImpl extends AbstractProcessor {
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+- if (roundEnv.processingOver())
++ if (roundEnv.processingOver() || roundEnv.errorRaised())
+ return false;
+
+ // map from indexable annotation names, to actual uses
+--
+1.8.3.1
+
diff --git a/annotation-indexer.spec b/annotation-indexer.spec
index de0ad2e..183fb8f 100644
--- a/annotation-indexer.spec
+++ b/annotation-indexer.spec
@@ -1,6 +1,6 @@
Name: annotation-indexer
Version: 1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jenkins annotation-indexer library
# License is specified in pom file
@@ -9,6 +9,9 @@ URL: https://github.com/jenkinsci/lib-annotation-indexer
Source0: https://github.com/jenkinsci/lib-%{name}/archive/%{name}-%{version}.tar.gz
Source1: https://raw.github.com/jenkinsci/jenkins/jenkins-1.510/LICENSE.txt
+# Backported upstream patch, this can be removed if %%{version} > 1.4
+Patch0: 0001-when-the-source-tree-contains-a-compilation-error-it.patch
+
BuildArch: noarch
BuildRequires: maven-local
@@ -28,6 +31,8 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n lib-%{name}-%{name}-%{version}
+%patch0 -p1
+
cp %{SOURCE1} LICENSE
# Nothing really interesting in parent
@@ -48,6 +53,9 @@ cp %{SOURCE1} LICENSE
%doc LICENSE
%changelog
+* Tue Oct 01 2013 Michal Srb <msrb(a)redhat.com> - 1.4-3
+- Backport upstream patch. It helps to identify root problem when build fails
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 6 months
[javapackages] Update TODO
by Michal Srb
commit a918aa1faed47250bd85ecc92025069fdcd4b59c
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Oct 1 14:53:07 2013 +0200
Update TODO
- new bug: man pages for build-classpath and build-jar-repository are
outdated
TODO | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/TODO b/TODO
index 30f5b6f..ff4d5f3 100644
--- a/TODO
+++ b/TODO
@@ -15,7 +15,7 @@
File "/usr/lib/python2.7/site-packages/javapackages/artifact.py", line 193, in from_xml_element
parts[key] = node.text.strip()
-** add more tests for maven.prov (see rhbz#1012059)
+** Fix man pages for build-classpath and build-jar-repository
* FEATURES
10 years, 6 months
[javapackages-tools] Update to upstream version 3.3.0
by Stanislav Ochotnicky
commit 2648c4bf8f84ce537770aea29f756ffc06d23a20
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 1 09:57:40 2013 +0200
Update to upstream version 3.3.0
.gitignore | 1 +
0001-Add-depmap-for-sun.jdk-jconsole.patch | 33 -------
...-add-support-for-optional-rule-in-add_pac.patch | 37 --------
...o-not-install-artifacts-with-classifiers-.patch | 27 ------
...-test-Update-data-for-singleton-packaging.patch | 93 --------------------
javapackages-tools.spec | 14 +--
sources | 2 +-
7 files changed, 7 insertions(+), 200 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e07d02a..5e6eead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
/javapackages-3.2.2.tar.xz
/javapackages-3.2.3.tar.xz
/javapackages-3.2.4.tar.xz
+/javapackages-3.3.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index b14f476..d6d9a81 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
-Version: 3.2.4
-Release: 2%{?dist}
+Version: 3.3.0
+Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -11,10 +11,6 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve
# temporary for rebuild with classifier support
Source1: google-guice-sisu-guice-noaop.xml
-Patch001: 0001-xmvn_config-add-support-for-optional-rule-in-add_pac.patch
-Patch002: 0002-mvn_build-Do-not-install-artifacts-with-classifiers-.patch
-Patch003: 0003-test-Update-data-for-singleton-packaging.patch
-
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -95,9 +91,6 @@ Requires: fedora-review
%prep
%setup -q -n javapackages-%{version}
-%patch001 -p1
-%patch002 -p1
-%patch003 -p1
%build
%configure
@@ -141,6 +134,9 @@ popd
%changelog
+* Tue Oct 01 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.3.0-1
+- Update to upstream version 3.3.0
+
* Wed Sep 25 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.2.4-2
- Fix installation of artifacts with classifier
diff --git a/sources b/sources
index 25cc136..3d07ae5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b80566ad2f224ca39e7f0d408ec284c6 javapackages-3.2.4.tar.xz
+3c04d11c00a4510eb5db91782c353b18 javapackages-3.3.0.tar.xz
10 years, 6 months
[javapackages] Add basic test for xmvn_config with XML content
by Stanislav Ochotnicky
commit 76cca80a8ebd3208e5365eaa601b441a776ef5ae
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 1 09:36:55 2013 +0200
Add basic test for xmvn_config with XML content
TODO | 2 --
python/test/xmvn_config_test.py | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/TODO b/TODO
index e416260..30f5b6f 100644
--- a/TODO
+++ b/TODO
@@ -15,8 +15,6 @@
File "/usr/lib/python2.7/site-packages/javapackages/artifact.py", line 193, in from_xml_element
parts[key] = node.text.strip()
-** add tests for xmvn_config.add_custom_option with xml content
-
** add more tests for maven.prov (see rhbz#1012059)
* FEATURES
diff --git a/python/test/xmvn_config_test.py b/python/test/xmvn_config_test.py
index 4e36851..9323782 100644
--- a/python/test/xmvn_config_test.py
+++ b/python/test/xmvn_config_test.py
@@ -146,6 +146,23 @@ class TestXMvnConfig(unittest.TestCase):
cs = self.__find(root, "xmvn:buildSettings/xmvn:compilerSource")
self.assertEqual(cs.text, "1.5")
+ def test_custom_config_xml(self):
+ xc = XMvnConfig()
+ xc.add_custom_option("buildSettings/compilerSource",
+ """<versions>
+ <version>1.5</version>
+ <version>1.6</version>
+ </versions>
+ """)
+ et = self._read_current_conf()
+ root = et.getroot()
+ versions = self.__find(root,
+ "xmvn:buildSettings/xmvn:compilerSource/xmvn:versions")
+ self.assertEqual(len(versions), 2)
+ v1, v2 = self.__findall(versions, "xmvn:version")
+ self.assertEqual(v1.text, "1.5")
+ self.assertEqual(v2.text, "1.6")
+
if __name__ == '__main__':
unittest.main()
10 years, 6 months
[javapackages] TODO: cleanup finished tasks
by Stanislav Ochotnicky
commit 83eebf331dbb99469ad51369c085153de315a918
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 1 09:28:30 2013 +0200
TODO: cleanup finished tasks
TODO | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/TODO b/TODO
index bb46991..e416260 100644
--- a/TODO
+++ b/TODO
@@ -3,17 +3,10 @@
* BUGS
-** Unable to install jar to directory outside %{_javadir} via mvn_file
-
- rhbz#986909
- https://bugzilla.redhat.com/show_bug.cgi?id=986909
-
** Add testcase for pom properties with whitespace
** Fix version in python/setup.py
-** mvn_artifact: add man page
-
** builddep.py bug
Traceback (most recent call last):
@@ -22,8 +15,6 @@
File "/usr/lib/python2.7/site-packages/javapackages/artifact.py", line 193, in from_xml_element
parts[key] = node.text.strip()
-** expand 2 lonely maven_depmap.py tests
-
** add tests for xmvn_config.add_custom_option with xml content
** add more tests for maven.prov (see rhbz#1012059)
10 years, 6 months