[maven-plugin-tools] Use Maven 3.x APIs
by Mikolaj Izdebski
commit b153c8a76f172fcc658e024b42f7a4b658e87f2a
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 27 11:15:26 2014 +0100
Use Maven 3.x APIs
maven-plugin-tools-maven-3.1.1.patch | 244 ++++++++++++++++++++++++++++++++++
maven-plugin-tools.spec | 28 +++--
2 files changed, 262 insertions(+), 10 deletions(-)
---
diff --git a/maven-plugin-tools-maven-3.1.1.patch b/maven-plugin-tools-maven-3.1.1.patch
new file mode 100644
index 0000000..662ba36
--- /dev/null
+++ b/maven-plugin-tools-maven-3.1.1.patch
@@ -0,0 +1,244 @@
+From 84ce30d4677ad55d7b0253a2e67f08fc98795224 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 27 Jan 2014 10:40:41 +0100
+Subject: [PATCH] Update to Maven 3.1.1
+
+---
+ maven-plugin-plugin/pom.xml | 18 ------------------
+ maven-plugin-tools-annotations/pom.xml | 4 ++--
+ maven-plugin-tools-ant/pom.xml | 6 +-----
+ maven-plugin-tools-api/pom.xml | 6 +-----
+ maven-plugin-tools-beanshell/pom.xml | 8 ++++----
+ maven-plugin-tools-generators/pom.xml | 8 --------
+ maven-plugin-tools-java/pom.xml | 6 +-----
+ maven-plugin-tools-model/pom.xml | 2 +-
+ maven-script/maven-script-ant/pom.xml | 8 --------
+ pom.xml | 9 ++-------
+ 10 files changed, 12 insertions(+), 63 deletions(-)
+
+diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
+index 463b6d1..7e064e8 100644
+--- a/maven-plugin-plugin/pom.xml
++++ b/maven-plugin-plugin/pom.xml
+@@ -91,19 +91,6 @@
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-registry</artifactId>
+- <version>${mavenVersion}</version>
+- </dependency>
+- <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ </dependency>
+@@ -114,11 +101,6 @@
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-artifact-manager</artifactId>
+- <version>${mavenVersion}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+
+diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
+index 792a608..440d73d 100644
+--- a/maven-plugin-tools-annotations/pom.xml
++++ b/maven-plugin-tools-annotations/pom.xml
+@@ -34,7 +34,7 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
++ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+@@ -42,7 +42,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
+index bad49ce..bba4bf5 100644
+--- a/maven-plugin-tools-ant/pom.xml
++++ b/maven-plugin-tools-ant/pom.xml
+@@ -37,11 +37,7 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
+index 8c76482..4f10e07 100644
+--- a/maven-plugin-tools-api/pom.xml
++++ b/maven-plugin-tools-api/pom.xml
+@@ -37,7 +37,7 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
++ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+@@ -51,10 +51,6 @@
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
+- </dependency>
+
+ <!-- plexus -->
+ <dependency>
+diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
+index 598bb01..bcbb3f8 100644
+--- a/maven-plugin-tools-beanshell/pom.xml
++++ b/maven-plugin-tools-beanshell/pom.xml
+@@ -36,12 +36,12 @@
+ <dependencies>
+ <!-- maven -->
+ <dependency>
+- <groupId>org.apache.maven.plugin-tools</groupId>
+- <artifactId>maven-plugin-tools-api</artifactId>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <groupId>org.apache.maven.plugin-tools</groupId>
++ <artifactId>maven-plugin-tools-api</artifactId>
+ </dependency>
+
+ <dependency>
+diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
+index fadf80e..499032d 100644
+--- a/maven-plugin-tools-generators/pom.xml
++++ b/maven-plugin-tools-generators/pom.xml
+@@ -42,16 +42,8 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
+- </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
+index e954e92..8d2faa9 100644
+--- a/maven-plugin-tools-java/pom.xml
++++ b/maven-plugin-tools-java/pom.xml
+@@ -43,17 +43,13 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
++ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
+- </dependency>
+- <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ </dependency>
+diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
+index 5afb8fb..aa2f81f 100644
+--- a/maven-plugin-tools-model/pom.xml
++++ b/maven-plugin-tools-model/pom.xml
+@@ -37,7 +37,7 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+
+ <!-- plexus -->
+diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml
+index e11e009..721d547 100644
+--- a/maven-script/maven-script-ant/pom.xml
++++ b/maven-script/maven-script-ant/pom.xml
+@@ -56,14 +56,6 @@ under the License.
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
+- </dependency>
+- <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-11</version>
+diff --git a/pom.xml b/pom.xml
+index 58444cb..8374848 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -160,7 +160,7 @@
+
+ <properties>
+ <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
+- <mavenVersion>2.2.1</mavenVersion>
++ <mavenVersion>3.1.1</mavenVersion>
+ <antVersion>1.7.1</antVersion>
+ <mavenInvokerPluginVersion>1.6</mavenInvokerPluginVersion>
+ </properties>
+@@ -210,12 +210,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-project</artifactId>
+- <version>${mavenVersion}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+--
+1.8.4.2
+
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index fb90165..97569e9 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 3.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
@@ -12,35 +12,39 @@ BuildArch: noarch
# Fix NullPointerException in MojoClassVisitor.visit()
# See: rhbz#920042, http://jira.codehaus.org/browse/MPLUGIN-242
Patch0: %{name}-rhbz-920042.patch
+# Use Maven 3.1.1 APIs
+Patch1: %{name}-maven-3.1.1.patch
BuildRequires: maven-local
BuildRequires: mvn(asm:asm)
BuildRequires: mvn(asm:asm-commons)
BuildRequires: mvn(bsh:bsh)
+BuildRequires: mvn(com.sun:tools)
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
BuildRequires: mvn(net.sf.jtidy:jtidy)
-BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.ant:ant-launcher)
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
-BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
-BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
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-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-parent)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
-BuildRequires: mvn(org.apache.maven:maven-plugin-descriptor)
-BuildRequires: mvn(org.apache.maven:maven-plugin-registry)
-BuildRequires: mvn(org.apache.maven:maven-project)
BuildRequires: mvn(org.apache.maven:maven-repository-metadata)
+BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory)
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
@@ -170,6 +174,7 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# For easier installation
ln -s maven-script/maven-script-{ant,beanshell} .
@@ -183,7 +188,7 @@ ln -s maven-script/maven-script-{ant,beanshell} .
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
# Remove test dependencies because tests are skipped anyways.
-%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
+%pom_xpath_remove "pom:dependency[pom:scope='test']"
%build
%mvn_build -s -f
@@ -223,10 +228,13 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell
%files javadocs -f .mfiles-javadoc
- %doc LICENSE NOTICE
+%doc LICENSE NOTICE
%changelog
+* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.1-18
+- Use Maven 3.x APIs
+
* Fri Jan 10 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.1-17
- Remove explicit requires
- Resolves: rhbz#1051527
10 years, 4 months
[maven-javadoc-plugin] Remove dependency on maven2
by Mikolaj Izdebski
commit f3b00758e025e927af22f9093cc3c9d138f0988b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 27 10:20:53 2014 +0100
Remove dependency on maven2
maven-javadoc-plugin.spec | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 5882bc5..84a0d28 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-javadoc-plugin
Version: 2.9.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Javadoc Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-javadoc-plugin
@@ -17,7 +17,6 @@ BuildRequires: httpcomponents-client
BuildRequires: log4j
BuildRequires: maven
BuildRequires: maven-archiver
-BuildRequires: maven-artifact-manager
BuildRequires: maven-common-artifact-filters
BuildRequires: maven-doxia-sink-api
BuildRequires: maven-doxia-sitetools
@@ -25,10 +24,8 @@ BuildRequires: maven-invoker
BuildRequires: maven-plugin-annotations
BuildRequires: maven-plugin-plugin
BuildRequires: maven-plugins-pom
-BuildRequires: maven-project
BuildRequires: maven-reporting-api
BuildRequires: maven-shade-plugin
-BuildRequires: maven-toolchain
BuildRequires: maven-wagon
BuildRequires: modello
BuildRequires: plexus-archiver
@@ -66,6 +63,11 @@ API documentation for %{name}.
</exclusion>
</exclusions>"
+# Don't use maven2 modules
+%pom_remove_dep :maven-project
+%pom_remove_dep :maven-artifact-manager
+%pom_remove_dep :maven-toolchain
+
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
%build
@@ -81,6 +83,9 @@ sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.ma
%doc LICENSE NOTICE
%changelog
+* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9.1-4
+- Remove dependency on maven2
+
* Fri Jan 17 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9.1-3
- Update to current packaging guidelines
- Update to Maven 3.x
10 years, 4 months
[maven-javadoc-plugin] Update to current packaging guidelines
by Mikolaj Izdebski
commit e58890ee79c858f9cc4ac43fff88a48baea53407
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Jan 17 15:35:13 2014 +0100
Update to current packaging guidelines
- Update to Maven 3.x
maven-javadoc-plugin.spec | 101 +++++++--------------------------------------
1 files changed, 15 insertions(+), 86 deletions(-)
---
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 60b58dd..5882bc5 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,45 +1,33 @@
-%global bootstrap 0
-
Name: maven-javadoc-plugin
Version: 2.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven Javadoc Plugin
-
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-javadoc-plugin
+BuildArch: noarch
+
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: reduce-exceptions.patch
-BuildRequires: java-devel >= 1:1.7.0
+BuildRequires: maven-local
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
BuildRequires: httpcomponents-client
BuildRequires: log4j
-BuildRequires: maven-local
+BuildRequires: maven
BuildRequires: maven-archiver
-BuildRequires: maven-artifact
BuildRequires: maven-artifact-manager
-BuildRequires: maven-clean-plugin
BuildRequires: maven-common-artifact-filters
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-doxia-sink-api
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-model
+BuildRequires: maven-invoker
BuildRequires: maven-plugin-annotations
BuildRequires: maven-plugin-plugin
-BuildRequires: maven-plugin-testing-harness
+BuildRequires: maven-plugins-pom
BuildRequires: maven-project
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-settings
+BuildRequires: maven-reporting-api
BuildRequires: maven-shade-plugin
-BuildRequires: maven-shared-invoker
-BuildRequires: maven-shared-reporting-api
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-toolchain
BuildRequires: maven-wagon
BuildRequires: modello
@@ -48,38 +36,6 @@ BuildRequires: plexus-containers-container-default
BuildRequires: plexus-interactivity
BuildRequires: plexus-utils
BuildRequires: qdox
-%if ! %{bootstrap}
-BuildRequires: maven-javadoc-plugin
-%endif
-
-Requires: java
-Requires: apache-commons-io
-Requires: apache-commons-lang
-Requires: apache-commons-logging
-Requires: httpcomponents-client
-Requires: log4j
-Requires: maven
-Requires: maven-archiver
-Requires: maven-artifact
-Requires: maven-artifact-manager
-Requires: maven-common-artifact-filters
-Requires: maven-doxia-sink-api
-Requires: maven-doxia-sitetools
-Requires: maven-model
-Requires: maven-plugin-annotations
-Requires: maven-project
-Requires: maven-settings
-Requires: maven-shared-invoker
-Requires: maven-shared-reporting-api
-Requires: maven-toolchain
-Requires: maven-wagon
-Requires: plexus-archiver
-Requires: plexus-containers-container-default
-Requires: plexus-interactivity
-Requires: plexus-utils
-Requires: qdox
-
-BuildArch: noarch
Obsoletes: maven2-plugin-javadoc <= 2.0.8
Provides: maven2-plugin-javadoc = %{version}-%{release}
@@ -88,16 +44,11 @@ Provides: maven2-plugin-javadoc = %{version}-%{release}
The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
generating javadocs for the specified project.
-%if ! %{bootstrap}
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-%endif
%prep
%setup -q
@@ -118,44 +69,22 @@ API documentation for %{name}.
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
%build
-mvn-rpmbuild \
- -Dmaven.test.skip=true \
- install
-%if ! %{bootstrap}
-mvn-rpmbuild \
- -Dmaven.test.skip=true \
- -Dproject.build.sourceEncoding=UTF-8 \
- javadoc:javadoc
-%endif
+%mvn_build -f -- -DmavenVersion=3.1.1
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%if ! %{bootstrap}
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-rm -rf target/site/api*
-%endif
+%mvn_install
%files -f .mfiles
%doc LICENSE NOTICE
-%if ! %{bootstrap}
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
-%endif
%changelog
+* Fri Jan 17 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9.1-3
+- Update to current packaging guidelines
+- Update to Maven 3.x
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 4 months
[bookkeeper] BZ1049900: Update to latest rawhide dependencies jline1 -> jline (2.10) netty -> netty3 (compat)
by tstclair
commit ed184764ff6558f3b08d21a6bb4ef902fed6a406
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Fri Jan 24 14:43:06 2014 -0600
BZ1049900: Update to latest rawhide dependencies
jline1 -> jline (2.10)
netty -> netty3 (compat)
bookkeeper-4.2.1-depmap | 2 +-
bookkeeper-4.2.1-jline2.patch | 125 +++++++++++++++++++++++++++++++++++++++++
bookkeeper-4.2.1-netty.patch | 66 +++++++++++++++++++++
bookkeeper.spec | 13 +++-
4 files changed, 202 insertions(+), 4 deletions(-)
---
diff --git a/bookkeeper-4.2.1-depmap b/bookkeeper-4.2.1-depmap
index d737c52..ff86a38 100644
--- a/bookkeeper-4.2.1-depmap
+++ b/bookkeeper-4.2.1-depmap
@@ -3,7 +3,7 @@
<maven>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>0.9.94</version>
+ <version>2.10</version>
</maven>
<jpp>
<groupId>JPP</groupId>
diff --git a/bookkeeper-4.2.1-jline2.patch b/bookkeeper-4.2.1-jline2.patch
new file mode 100644
index 0000000..ae50f21
--- /dev/null
+++ b/bookkeeper-4.2.1-jline2.patch
@@ -0,0 +1,125 @@
+diff --git a/hedwig-server/pom.xml b/hedwig-server/pom.xml
+index 56b1a32..ea38ff9 100644
+--- a/hedwig-server/pom.xml
++++ b/hedwig-server/pom.xml
+@@ -121,7 +121,7 @@
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+- <version>0.9.94</version>
++ <version>2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+diff --git a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
+index 0c0438f..6e704f3 100644
+--- a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
++++ b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
+@@ -18,9 +18,9 @@
+
+ package org.apache.hedwig.admin.console;
+
+-import jline.ConsoleReader;
+-import jline.History;
+-import jline.Terminal;
++import jline.console.ConsoleReader;
++import jline.console.history.FileHistory;
++import jline.*;
+
+ import java.io.BufferedReader;
+ import java.io.File;
+@@ -98,7 +98,6 @@ public class HedwigConsole {
+ protected Subscriber subscriber;
+ protected ConsoleMessageHandler consoleHandler =
+ new ConsoleMessageHandler();
+- protected Terminal terminal;
+
+ protected String myRegion;
+
+@@ -839,7 +838,9 @@ public class HedwigConsole {
+ */
+ public HedwigConsole(String[] args) throws IOException, InterruptedException {
+ // Setup Terminal
+- terminal = Terminal.setupTerminal();
++ TerminalFactory.configure(TerminalFactory.AUTO);
++ TerminalFactory.reset();
++
+ HedwigCommands.init();
+ cl.parseOptions(args);
+
+@@ -906,14 +907,10 @@ public class HedwigConsole {
+
+ protected boolean continueOrQuit() throws IOException {
+ System.out.println("Press <Return> to continue, or Q to cancel ...");
+- int ch;
++ int ch='q';
+ if (null != console) {
+ ch = console.readCharacter(CONTINUE_OR_QUIT);
+- } else {
+- do {
+- ch = terminal.readCharacter(System.in);
+- } while (ch != 'q' && ch != 'Q' && ch != '\n');
+- }
++ }
+ if (ch == 'q' ||
+ ch == 'Q') {
+ return false;
+@@ -987,23 +984,23 @@ public class HedwigConsole {
+
+ console = new ConsoleReader();
+ JLineHedwigCompletor completor = new JLineHedwigCompletor(admin);
+- console.addCompletor(completor);
++ console.addCompleter(completor);
+
+ // load history file
+- History history = new History();
+ File file = new File(System.getProperty("hw.history",
+ new File(System.getProperty("user.home"), HW_HISTORY_FILE).toString()));
++ FileHistory history = new FileHistory(file);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("History file is " + file.toString());
+ }
+- history.setHistoryFile(file);
++
+ // set history to console reader
+ console.setHistory(history);
+ // load history from history file
+- history.moveToFirstEntry();
++ history.moveToFirst();
+
+ while (history.next()) {
+- String entry = history.current();
++ String entry = (String)history.current();
+ if (!entry.equals("")) {
+ addToHistory(commandCount, entry);
+ }
+@@ -1014,7 +1011,7 @@ public class HedwigConsole {
+ String line;
+ while ((line = console.readLine(getPrompt())) != null) {
+ executeLine(line);
+- history.addToHistory(line);
++ history.add(line);
+ }
+ }
+
+diff --git a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java
+index e2da628..fe64341 100644
+--- a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java
++++ b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java
+@@ -26,14 +26,14 @@ import org.apache.hedwig.admin.HedwigAdmin;
+
+ import com.google.protobuf.ByteString;
+
+-import jline.Completor;
++import jline.console.completer.Completer;
+
+ import static org.apache.hedwig.admin.console.HedwigCommands.*;
+
+ /**
+ * A jline completor for hedwig console
+ */
+-public class JLineHedwigCompletor implements Completor {
++public class JLineHedwigCompletor implements Completer {
+ // for topic completion
+ static final int MAX_TOPICS_TO_SEARCH = 1000;
+
diff --git a/bookkeeper-4.2.1-netty.patch b/bookkeeper-4.2.1-netty.patch
new file mode 100644
index 0000000..25a34b5
--- /dev/null
+++ b/bookkeeper-4.2.1-netty.patch
@@ -0,0 +1,66 @@
+diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
+index 1512a16..8e2fd43 100644
+--- a/bookkeeper-benchmark/pom.xml
++++ b/bookkeeper-benchmark/pom.xml
+@@ -83,9 +83,9 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.netty</groupId>
++ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.2.4.Final</version>
++ <version>3.6.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
+index 1c7ebf8..8b11129 100644
+--- a/bookkeeper-server/pom.xml
++++ b/bookkeeper-server/pom.xml
+@@ -73,9 +73,9 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.netty</groupId>
++ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.2.4.Final</version>
++ <version>3.6.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+diff --git a/hedwig-client/pom.xml b/hedwig-client/pom.xml
+index b23ae2e..228b107 100644
+--- a/hedwig-client/pom.xml
++++ b/hedwig-client/pom.xml
+@@ -57,9 +57,9 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.netty</groupId>
++ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.2.4.Final</version>
++ <version>3.6.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java b/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java
+index 7ea9aff..ad415fd 100644
+--- a/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java
++++ b/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java
+@@ -166,5 +166,13 @@ public class WriteRecordingChannel implements Channel {
+ public int compareTo(Channel o) {
+ throw new RuntimeException("Not intended");
+ }
++
++ public Object getAttachment() {
++ return null;
++ }
++
++ public void setAttachment(Object attachment) {
++
++ }
+
+ }
diff --git a/bookkeeper.spec b/bookkeeper.spec
index 57ba00c..fe5ee05 100644
--- a/bookkeeper.spec
+++ b/bookkeeper.spec
@@ -1,7 +1,7 @@
%global _hardened_build 1
Name: bookkeeper
Version: 4.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Apache BookKeeper sub-project of ZooKeeper
Group: Development/Libraries
License: ASL 2.0
@@ -19,6 +19,8 @@ Patch2: bookkeeper-4.2.1-test-add-PIE-and-RELRO.patch
# thanks to Björn Esser bjoern.esser(a)gmail.com
# Fix build with boost >= 1.40.0
Patch3: bookkeeper-4.2.1-boost153.patch
+Patch4: bookkeeper-4.2.1-jline2.patch
+Patch5: bookkeeper-4.2.1-netty.patch
BuildRequires: java-devel
@@ -29,11 +31,11 @@ BuildRequires: apache-commons-configuration
BuildRequires: apache-commons-io
BuildRequires: derby
BuildRequires: guava
-BuildRequires: jline1
+BuildRequires: jline
BuildRequires: log4j
# BuildRequires: mvn(org.apache.hadoop:hadoop-common) >= 0.23.1
# BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs)
-BuildRequires: netty
+BuildRequires: netty3
BuildRequires: protobuf-java
BuildRequires: slf4j
BuildRequires: zookeeper-java
@@ -108,6 +110,8 @@ This package contains javadoc for %{name}.
%patch1 -p0
%patch2 -p0
%patch3 -p0
+%patch4 -p1
+%patch5 -p1
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin bookkeeper-server
@@ -192,6 +196,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%doc LICENSE NOTICE
%changelog
+* Fri Jan 24 2014 Timothy St. Clair<tstclair(a)redhat.com> - 4.2.1-6
+- Update jline dependency to 2.10 and netty3
+
* Tue Jul 30 2013 Petr Machata <pmachata(a)redhat.com> - 4.2.1-5
- Rebuild for boost 1.54.0
10 years, 4 months
[woodstox-core] Add aliases: ":wstx-asl" ":wstx-lgpl"
by Michal Srb
commit e0f252a0bfe3c96d23391aef7112efcf596afb06
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Jan 24 09:12:28 2014 +0100
Add aliases: ":wstx-asl" ":wstx-lgpl"
woodstox-core.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/woodstox-core.spec b/woodstox-core.spec
index 43260b1..2b92b49 100644
--- a/woodstox-core.spec
+++ b/woodstox-core.spec
@@ -4,7 +4,7 @@
Name: %{core_name}
Version: 4.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: High-performance XML processor
License: ASL 2.0 or LGPLv2+ or BSD
URL: http://%{base_name}.codehaus.org/
@@ -66,7 +66,7 @@ rm -rf src/test/stax2
<testSourceDirectory>src/test</testSourceDirectory>
</build>"
-%mvn_alias ":{woodstox-core}-asl" :@1-lgpl
+%mvn_alias ":{woodstox-core}-asl" :@1-lgpl :wstx-asl :wstx-lgpl
%mvn_file : %{name}{,-asl,-lgpl}
%build
@@ -83,6 +83,9 @@ rm -rf src/test/stax2
%doc release-notes/asl release-notes/lgpl release-notes/bsd
%changelog
+* Fri Jan 24 2014 Michal Srb <msrb(a)redhat.com> - 4.2.0-4
+- Add aliases: ":wstx-asl" ":wstx-lgpl"
+
* Thu Oct 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-3
- Fix usage of %%mvn_alias
10 years, 4 months