commit aacb85b8f7760bf504921fc4cd5b363f26917496
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 23 14:33:23 2011 +0200
Add second groupId for reporting-api to add compatibility
- Versionless javadocs and remove defattr macros (not needed anymore)
- Use new maven2 compatibility packages
- Remove old patches
maven-ant-pom_xml.patch | 24 -----
maven-artifact-resolver-pom.patch | 14 ---
maven-dependency-tree-pom.patch | 18 ----
maven-osgi-pom.patch | 14 ---
maven-repository-build-pom.patch | 19 ----
maven-runtime-pom.patch | 19 ----
maven-shared-jpp-depmap.xml | 9 +-
maven-shared-maven3.patch | 169 +++++++++++++++++++++++++++++++++++++
maven-shared.spec | 106 +++++++++++++----------
9 files changed, 233 insertions(+), 159 deletions(-)
---
diff --git a/maven-shared-jpp-depmap.xml b/maven-shared-jpp-depmap.xml
index bcb8517..e457605 100644
--- a/maven-shared-jpp-depmap.xml
+++ b/maven-shared-jpp-depmap.xml
@@ -15,14 +15,15 @@
</dependency>
<dependency>
<maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model-v3</artifactId>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
<version>2.0</version>
</maven>
<jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>maven-model</artifactId>
+ <groupId>JPP/maven-shared</groupId>
+ <artifactId>reporting-api</artifactId>
<version>2.0.8</version>
</jpp>
</dependency>
+
</dependencies>
diff --git a/maven-shared-maven3.patch b/maven-shared-maven3.patch
new file mode 100644
index 0000000..694409f
--- /dev/null
+++ b/maven-shared-maven3.patch
@@ -0,0 +1,169 @@
+From 3b8e3f12500fb77db54e7dd672b77bdab3cf82ad Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Fri, 24 Jun 2011 15:08:57 +0200
+Subject: [PATCH] Add maven3 compatibility deps
+
+---
+ maven-ant/pom.xml | 5 +++++
+ maven-artifact-resolver/pom.xml | 5 +++++
+ maven-dependency-tree/pom.xml | 10 ++++++++++
+ .../tree/DefaultDependencyTreeBuilder.java | 7 ++-----
+ .../tree/DependencyTreeResolutionListener.java | 5 +++++
+ maven-downloader/pom.xml | 10 ++++++++++
+ maven-repository-builder/pom.xml | 5 +++++
+ maven-shared-io/pom.xml | 5 +++++
+ 8 files changed, 47 insertions(+), 5 deletions(-)
+
+diff --git a/maven-ant/pom.xml b/maven-ant/pom.xml
+index 3abab27..22ba05f 100644
+--- a/maven-ant/pom.xml
++++ b/maven-ant/pom.xml
+@@ -59,6 +59,11 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+diff --git a/maven-artifact-resolver/pom.xml b/maven-artifact-resolver/pom.xml
+index 307dc69..b94028e 100644
+--- a/maven-artifact-resolver/pom.xml
++++ b/maven-artifact-resolver/pom.xml
+@@ -43,6 +43,11 @@ under the License.
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+diff --git a/maven-dependency-tree/pom.xml b/maven-dependency-tree/pom.xml
+index 0710791..4ed5c7f 100644
+--- a/maven-dependency-tree/pom.xml
++++ b/maven-dependency-tree/pom.xml
+@@ -55,6 +55,16 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+diff --git
a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
+index bfce140..f1a0ec8 100644
+---
a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
++++
b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
+@@ -29,6 +29,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.artifact.resolver.ArtifactCollector;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
++import org.apache.maven.artifact.resolver.ResolutionListener;
+ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+@@ -96,14 +97,10 @@ public class DefaultDependencyTreeBuilder extends AbstractLogEnabled
implements
+
+ result = collector.collect( dependencyArtifacts, project.getArtifact(),
managedVersions, repository,
+ project.getRemoteArtifactRepositories(), metadataSource,
filter,
+- Collections.singletonList( listener ) );
++ Collections.singletonList((ResolutionListener) listener )
);
+
+ return listener.getRootNode();
+ }
+- catch ( ArtifactResolutionException exception )
+- {
+- throw new DependencyTreeBuilderException( "Cannot build project
dependency tree", exception );
+- }
+ catch ( InvalidDependencyVersionException e )
+ {
+ throw new DependencyTreeBuilderException( "Invalid dependency version
for artifact "
+diff --git
a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
+index 492f382..0d6b483 100644
+---
a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
++++
b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
+@@ -362,6 +362,11 @@ public class DependencyTreeResolutionListener implements
ResolutionListener, Res
+ managedScopes.put( replacement.getId(), artifact.getScope() );
+ }
+ }
++
++ public void manageArtifactSystemPath( Artifact artifact, Artifact replacement )
++ {
++ throw new UnsupportedOperationException();
++ }
+
+ // public methods ---------------------------------------------------------
+
+diff --git a/maven-downloader/pom.xml b/maven-downloader/pom.xml
+index d9b6a45..f03a4c8 100644
+--- a/maven-downloader/pom.xml
++++ b/maven-downloader/pom.xml
+@@ -48,6 +48,16 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+diff --git a/maven-repository-builder/pom.xml b/maven-repository-builder/pom.xml
+index 695d859..17c2476 100644
+--- a/maven-repository-builder/pom.xml
++++ b/maven-repository-builder/pom.xml
+@@ -50,6 +50,11 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+diff --git a/maven-shared-io/pom.xml b/maven-shared-io/pom.xml
+index 325cdd0..743e37a 100644
+--- a/maven-shared-io/pom.xml
++++ b/maven-shared-io/pom.xml
+@@ -53,6 +53,11 @@
+ <!-- Maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+--
+1.7.5.4
+
diff --git a/maven-shared.spec b/maven-shared.spec
index dc4c4ac..0ce96d6 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,7 +67,7 @@ Summary: Maven Shared Components
URL:
http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 15%{?dist}
+Release: 16%{?dist}
License: ASL 2.0
Group: Development/Libraries
@@ -78,13 +78,8 @@ Source0: maven-shared-components-%{version}.tar.gz
Source1: %{name}-jpp-depmap.xml
Patch0: %{name}-pom.patch
-Patch1: maven-ant-pom_xml.patch
-Patch2: maven-dependency-tree-pom.patch
-Patch3: maven-osgi-pom.patch
-Patch4: maven-repository-build-pom.patch
-Patch5: maven-runtime-pom.patch
+Patch1: %{name}-maven3.patch
Patch6: maven-runtime-XMLMavenRuntimeVisitor.patch
-Patch7: maven-artifact-resolver-pom.patch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant
@@ -103,6 +98,7 @@ BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-shared-file-management
BuildRequires: maven-plugin-testing-tools
BuildRequires: maven-test-tools
BuildRequires: plexus-maven-plugin
@@ -117,8 +113,15 @@ BuildRequires: modello
BuildRequires: easymock2
BuildRequires: objectweb-asm
BuildRequires: dom4j
-BuildRequires: aqute-bndlib
+BuildRequires: aqute-bndlib
BuildRequires: maven-wagon
+BuildRequires: maven-artifact-manager
+BuildRequires: maven-project
+BuildRequires: maven-profile
+#BuildRequires: maven-plugin-registry
+BuildRequires: maven-monitor
+BuildRequires: maven-model
+
Requires: ant
Requires: maven
@@ -160,7 +163,7 @@ Group: Development/Libraries
Version: %{osgi_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: aqute-bndlib
-Requires: maven
+Requires: maven-project
%description osgi
Library for Maven-OSGi integration
@@ -171,8 +174,9 @@ Group: Development/Libraries
Version: %{ant_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven
Requires: plexus-containers-container-default
+Requires: maven-project
+Requires: maven
%description ant
Runs ant scripts embedded in the POM.
@@ -184,8 +188,10 @@ Version: %{common_artifact_filters_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-test-tools >= 0:%{test_tools_version}-%{release}
Requires: junit
-Requires: maven
Requires: plexus-container-default
+Requires: plexus-utils
+Requires: maven-project
+Requires: maven
%description common-artifact-filters
%{summary}.
@@ -197,6 +203,7 @@ Version: %{dependency_tree_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-plugin-testing-harness >=
0:%{plugin_testing_harness_version}-%{release}
Requires: maven
+Requires: maven-project
%description dependency-tree
%{summary}.
@@ -207,6 +214,7 @@ Group: Development/Libraries
Version: %{downloader_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: maven-artifact-manager
%description downloader
Provide a super simple interface for downloading a
@@ -218,7 +226,9 @@ Group: Development/Libraries
Version: %{dependency_analyzer_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: maven-project
Requires: objectweb-asm
+Requires: plexus-utils
%description dependency-analyzer
%{summary}.
@@ -242,6 +252,7 @@ Version: %{model_converter_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: dom4j
Requires: maven
+Requires: maven-model
Requires: plexus-container-default
Requires: plexus-utils
@@ -256,7 +267,10 @@ Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: jakarta-commons-validator
Requires: jakarta-oro
Requires: maven
+Requires: maven-project
Requires: maven-doxia
+Requires: apache-commons-validator
+Requires: plexus-utils
%description reporting-impl
%{summary}.
@@ -268,6 +282,8 @@ Version: %{repository_builder_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-common-artifact-filters =
0:%{common_artifact_filters_version}-%{release}
Requires: maven
+Requires: maven-artifact-manager
+Requires: maven-project
%description repository-builder
%{summary}.
@@ -278,6 +294,7 @@ Group: Development/Libraries
Version: %{io_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: maven-artifact-manager
Requires: maven-wagon
Requires: plexus-utils
Requires: plexus-container-default
@@ -291,6 +308,9 @@ Group: Development/Libraries
Version: %{jar_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: plexus-digest
+Requires: bcel
+Requires: apache-commons-collections
%description jar
Utilities that help identify the contents of a JAR,
@@ -336,6 +356,8 @@ Version: %{artifact_resolver_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-artifact-manager
+Requires: maven-project
%description artifact-resolver
Provides a component for plugins to easily resolve project dependencies.
@@ -347,6 +369,12 @@ Version: %{filtering_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-project
+# this is not shared-monitor!
+Requires: maven-monitor
+Requires: plexus-utils
+Requires: plexus-build-api
+Requires: plexus-interpolation
%description filtering
A component to assist in filtering of resource files with properties from a Maven
project.
@@ -358,6 +386,7 @@ Version: %{reporting_api_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-doxia
%description reporting-api
Maven Reporting API.
@@ -369,6 +398,7 @@ Version: %{runtime_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-project
%description runtime
Maven Runtime allows introspection of Maven project metadata at runtime. Basic artifact
information or full Maven
@@ -379,13 +409,8 @@ order, and also for a given class within a project.
%setup -q -n %{name}-components-%{shared_components_version}
chmod -R go=u-w *
%patch0 -b .sav0
-%patch1 -b .sav1
-%patch2 -b .sav2
-%patch3 -b .sav3
-%patch4 -b .sav4
-%patch5 -b .sav5
+%patch1 -p1 -b .sav1
%patch6 -b .sav6
-%patch7 -b .sav7
# need namespace for new version modello
sed -i "s|<model>|<model
xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\"
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0
http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\"
xml.schemaLocation=\"..\" xsd.namespace=\"..\"
xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
@@ -401,10 +426,9 @@ rm -f
maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency
%build
export MAVEN_OPTS="-XX:MaxPermSize=256m"
-mvn-rpmbuild \
+mvn-rpmbuild -X \
-Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
- -Dmaven.test.failure.ignore=true \
install javadoc:aggregate
%install
@@ -503,9 +527,10 @@ install -p -m 0644
maven-filtering/target/maven-filtering-%{filtering_version}-b
$RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering.jar
install -pm 644 maven-reporting-api/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
-%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version}
JPP/maven-shared reporting-api
install -p -m 0644
maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api.jar
+%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version}
JPP/maven-shared reporting-api
+%add_to_maven_depmap org.apache.maven.reporting maven-reporting-api
%{reporting_api_version} JPP/maven-shared reporting-api
install -pm 644 maven-runtime/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-runtime.pom
%add_to_maven_depmap org.apache.maven.shared maven-runtime %{runtime_version}
JPP/maven-shared runtime
@@ -513,11 +538,14 @@ install -p -m 0644
maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3
$RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -526,115 +554,99 @@ ln -s %{name}-%{shared_components_version}
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%dir %{_javadir}/maven-shared
%dir %{_mavenpomdir}
%{_mavenpomdir}/JPP.maven-shared-components-parent.pom
%{_mavendepmapfragdir}
%files file-management
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/file-management*.jar
%{_mavenpomdir}/JPP.maven-shared-file-management.pom
%files osgi
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/osgi*.jar
%{_mavenpomdir}/JPP.maven-shared-osgi.pom
%files ant
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/ant*.jar
%{_mavenpomdir}/JPP.maven-shared-ant.pom
%files common-artifact-filters
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/common-artifact-filters*.jar
%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
%files dependency-analyzer
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/dependency-analyzer*.jar
%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
%files dependency-tree
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/dependency-tree*.jar
%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
%files downloader
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/downloader*.jar
%{_mavenpomdir}/JPP.maven-shared-downloader.pom
%files invoker
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/invoker*.jar
%{_mavenpomdir}/JPP.maven-shared-invoker.pom
%files model-converter
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/model-converter*.jar
%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
%files reporting-impl
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/reporting-impl*.jar
%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
%files repository-builder
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/repository-builder*.jar
%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
%files io
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/io*.jar
%{_mavenpomdir}/JPP.maven-shared-io.pom
%files jar
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/jar*.jar
%{_mavenpomdir}/JPP.maven-shared-jar.pom
%files monitor
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/monitor*.jar
%{_mavenpomdir}/JPP.maven-shared-monitor.pom
%files verifier
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/verifier*.jar
%{_mavenpomdir}/JPP.maven-shared-verifier.pom
%files artifact-resolver
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/artifact-resolver*.jar
%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
%files filtering
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/filtering*.jar
%{_mavenpomdir}/JPP.maven-shared-filtering.pom
%files reporting-api
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/reporting-api*.jar
%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
%files runtime
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/runtime*.jar
%{_mavenpomdir}/JPP.maven-shared-runtime.pom
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{shared_components_version}
-%doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
%changelog
-* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-15
+* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 15-16
+- Add second groupId for reporting-api to add compatibility
+- Versionless javadocs and remove defattr macros (not needed anymore)
+- Use new maven2 compatibility packages
+- Remove old patches
+
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 15-15
- Require maven not maven2 now.
- Adapt to current guidelines.