[maven-doxia] Migrate from tomca5 to tomca6
by Stanislav Ochotnicky
commit 0d5b8a084828a8f776e5b7b0c98fb44a5466deb7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Dec 17 13:47:27 2010 +0100
Migrate from tomca5 to tomca6
- Versionless jars and javadocs
maven-doxia.spec | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 2e3626c..113a85c 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -59,8 +59,6 @@ Patch3: %{name}-assert.patch
# will pick it up and try to instantiate
Patch5: %{name}-core-remove-plexus-component-annotation.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
@@ -86,16 +84,14 @@ BuildRequires: maven-doxia-tools
BuildRequires: plexus-maven-plugin >= 0:1.2-2
BuildRequires: modello-maven-plugin >= 0:1.0-0.a8.3
BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: tomcat5
+BuildRequires: servlet25
BuildRequires: classworlds
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-logging
-BuildRequires: jakarta-commons-validator
+BuildRequires: apache-commons-validator
BuildRequires: apache-commons-configuration
BuildRequires: junit
BuildRequires: oro
-#BuildRequires: plexus-container-default
BuildRequires: plexus-i18n
BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
@@ -164,8 +160,6 @@ mvn-jpp \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -180,7 +174,7 @@ for targetdir in `find -type d -name target`; do
# Does the module have a jar?
if [ -f $targetdir/$modulename-%{version}.jar ]; then
cp -p $targetdir/$modulename-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename.jar
fi
@@ -202,14 +196,9 @@ install -pm 644 doxia-modules/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-
install -d -m 0755 %{buildroot}/%{_datadir}/maven2/lib
ln -s %{_javadir}/maven-doxia/logging-api.jar $RPM_BUILD_ROOT/%{_datadir}/maven2/lib/maven-doxia_logging-api.jar
-# Install symlinks
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# javadoc (all javadocs are contained in the main module docs dir used below)
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -217,8 +206,10 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%postun
%update_maven_depmap
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
%defattr(-,root,root,-)
@@ -232,7 +223,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
-* Wed Sep 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.1.3-2
+* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.1.3-2
+- Migrate from tomca5 to tomca6
+- Versionless jars and javadocs
- Remove old skip-plugin patch
- Replace add-default-role-hint patch with remove-plexus-component patch
- Rename few jakarta BRs/Rs to apache names
13 years, 4 months
[httpcomponents-core] Add surefire provider to BR.
by Stanislav Ochotnicky
commit d61645bbe7526d9625fb00f51cba51c5fde8f76f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 23 11:39:43 2010 +0100
Add surefire provider to BR.
httpcomponents-core.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 50a5832..15b9d38 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -12,6 +12,7 @@ BuildArch: noarch
BuildRequires: httpcomponents-project
BuildRequires: java >= 1:1.6.0
BuildRequires: jpackage-utils
+BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
Requires: jpackage-utils
13 years, 4 months
[httpcomponents-client] Initial commit
by Stanislav Ochotnicky
commit b2bae1b18c84a121a236e311da4b2c3ed46988ea
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 23 11:06:05 2010 +0100
Initial commit
.gitignore | 1 +
0001-Cleanup-pom.patch | 95 +++++++++++++++++++++++++++++++++++++++++
httpcomponents-client.spec | 101 ++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 198 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..610c841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/httpcomponents-client-4.0.3-src.tar.gz
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
new file mode 100644
index 0000000..78c59dc
--- /dev/null
+++ b/0001-Cleanup-pom.patch
@@ -0,0 +1,95 @@
+From 00e8bdbfe680691c28ab6da5a40ca4ff020d5837 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 20 Dec 2010 15:56:06 +0100
+Subject: [PATCH] Cleanup pom
+
+---
+ pom.xml | 72 ---------------------------------------------------------------
+ 1 files changed, 0 insertions(+), 72 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 3d0d20a..fce1fdd 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -144,78 +144,6 @@
+ </tasks>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
+- </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- <goal>aggregate</goal>
+- <goal>save-history</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- <plugin>
+- <groupId>com.agilejava.docbkx</groupId>
+- <artifactId>docbkx-maven-plugin</artifactId>
+- <executions>
+- <execution>
+- <goals>
+- <goal>generate-html</goal>
+- <goal>generate-pdf</goal>
+- </goals>
+- <phase>pre-site</phase>
+- </execution>
+- </executions>
+- <dependencies>
+- <dependency>
+- <groupId>org.docbook</groupId>
+- <artifactId>docbook-xml</artifactId>
+- <version>4.4</version>
+- <scope>runtime</scope>
+- </dependency>
+- </dependencies>
+- <configuration>
+- <includes>index.xml</includes>
+- <chunkedOutput>true</chunkedOutput>
+- <xincludeSupported>true</xincludeSupported>
+- <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+- <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
+- <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
+- <entities>
+- <entity>
+- <name>version</name>
+- <value>${pom.version}</value>
+- </entity>
+- </entities>
+- <postProcess>
+- <copy todir="target/site/tutorial">
+- <fileset dir="target/docbkx">
+- <include name="**/*.html" />
+- <include name="**/*.pdf" />
+- </fileset>
+- </copy>
+- <copy todir="target/site/tutorial/html">
+- <fileset dir="src/docbkx/resources">
+- <include name="**/*.css" />
+- <include name="**/*.png" />
+- <include name="**/*.gif" />
+- <include name="**/*.jpg" />
+- </fileset>
+- </copy>
+- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
+- </postProcess>
+- </configuration>
+- </plugin>
+
+ </plugins>
+ </build>
+--
+1.7.3.3
+
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
new file mode 100644
index 0000000..2bf9b41
--- /dev/null
+++ b/httpcomponents-client.spec
@@ -0,0 +1,101 @@
+Name: httpcomponents-client
+Summary: HTTP agent implementation based on httpcomponents HttpCore
+Version: 4.0.3
+Release: 2%{?dist}
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://hc.apache.org/
+Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/httpcomponent...
+# Remove optional build deps not available in Fedora
+Patch0: 0001-Cleanup-pom.patch
+
+BuildArch: noarch
+
+
+BuildRequires: httpcomponents-project
+BuildRequires: httpcomponents-core
+
+
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires: httpcomponents-core
+
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+%description
+HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on
+httpcomponents HttpCore. It also provides reusable components for
+client-side authentication, HTTP state management, and HTTP connection
+management. HttpComponents Client is a successor of and replacement
+for Commons HttpClient 3.x. Users of Commons HttpClient are strongly
+encouraged to upgrade.
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+# skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j
+cd httpclient
+export maven_repo_local=$(pwd)/.m2/repository
+install -d $maven_repo_local
+
+mvn-jpp -Dmaven.repo.local=$maven_repo_local \
+ install javadoc:javadoc
+
+
+%install
+cd httpclient
+# jars
+install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{name}/httpclient.jar
+
+# pom
+install -D -m 0644 pom.xml \
+ %{buildroot}/%{_mavenpomdir}/JPP.%{name}-httpclient.pom
+%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{name} httpclient
+
+# main pom
+install -D -m 0644 ../pom.xml \
+ %{buildroot}/%{_mavenpomdir}/JPP.%{name}-httpcomponents-client.pom
+%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{name} httpcomponents-client
+
+# javadocs
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%doc README.txt LICENSE.txt RELEASE_NOTES.txt
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP.%{name}*.pom
+%{_javadir}/%{name}
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc LICENSE.txt
+%doc %{_javadocdir}/*
+
+
+%changelog
+* Wed Dec 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.0.3-2
+- Added license to javadoc subpackage
+
+* Mon Dec 20 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.0.3-1
+- Initial version
diff --git a/sources b/sources
index e69de29..02bacbd 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+003b803d1aa9c873c6d22e7471856254 httpcomponents-client-4.0.3-src.tar.gz
13 years, 4 months
[httpcomponents-core] Initial commit
by Stanislav Ochotnicky
commit bd5d27dea1af6a9fa5de3d6e958682932a2a9f5a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 23 11:05:58 2010 +0100
Initial commit
.gitignore | 1 +
0001-Remove-unneeded-pom-dependencies.patch | 178 +++++++++++++++++++++++++++
httpcomponents-core.spec | 103 +++++++++++++++
sources | 1 +
4 files changed, 283 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f594002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/httpcomponents-core-4.1-src.tar.gz
diff --git a/0001-Remove-unneeded-pom-dependencies.patch b/0001-Remove-unneeded-pom-dependencies.patch
new file mode 100644
index 0000000..d7ffe58
--- /dev/null
+++ b/0001-Remove-unneeded-pom-dependencies.patch
@@ -0,0 +1,178 @@
+From 8f27e169ae72b1cecb91c6a911e4ded5aeac7005 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Fri, 17 Dec 2010 15:22:06 +0100
+Subject: [PATCH] Remove unneeded pom dependencies
+
+---
+ httpcore-nio/pom.xml | 26 ----------------------
+ httpcore/pom.xml | 26 ----------------------
+ pom.xml | 58 --------------------------------------------------
+ 3 files changed, 0 insertions(+), 110 deletions(-)
+
+diff --git a/httpcore-nio/pom.xml b/httpcore-nio/pom.xml
+index 7eba598..14aa177 100644
+--- a/httpcore-nio/pom.xml
++++ b/httpcore-nio/pom.xml
+@@ -103,24 +103,6 @@
+ </archive>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
+- </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+
+@@ -146,14 +128,6 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <jdk>1.5</jdk>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+diff --git a/httpcore/pom.xml b/httpcore/pom.xml
+index e01f182..c0ca7ed 100644
+--- a/httpcore/pom.xml
++++ b/httpcore/pom.xml
+@@ -111,24 +111,6 @@
+ </archive>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
+- </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+
+@@ -153,14 +135,6 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <jdk>1.4</jdk>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+diff --git a/pom.xml b/pom.xml
+index 6305d73..45e5e2c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -91,21 +91,6 @@
+ <build>
+ <plugins>
+ <plugin>
+- <artifactId>maven-notice-plugin</artifactId>
+- <groupId>org.apache.httpcomponents</groupId>
+- <executions>
+- <execution>
+- <id>attach-notice-license</id>
+- <goals>
+- <goal>generate</goal>
+- </goals>
+- </execution>
+- </executions>
+- <configuration>
+- <projectTitle>Apache HttpComponents</projectTitle>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+@@ -166,49 +151,6 @@
+ </configuration>
+ </plugin>
+ <plugin>
+- <groupId>com.agilejava.docbkx</groupId>
+- <artifactId>docbkx-maven-plugin</artifactId>
+- <dependencies>
+- <dependency>
+- <groupId>org.docbook</groupId>
+- <artifactId>docbook-xml</artifactId>
+- <version>4.4</version>
+- <scope>runtime</scope>
+- </dependency>
+- </dependencies>
+- <configuration>
+- <includes>index.xml</includes>
+- <chunkedOutput>true</chunkedOutput>
+- <xincludeSupported>true</xincludeSupported>
+- <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+- <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
+- <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
+- <entities>
+- <entity>
+- <name>version</name>
+- <value>${project.version}</value>
+- </entity>
+- </entities>
+- <postProcess>
+- <copy todir="target/site/tutorial">
+- <fileset dir="target/docbkx">
+- <include name="**/*.html" />
+- <include name="**/*.pdf" />
+- </fileset>
+- </copy>
+- <copy todir="target/site/tutorial/html">
+- <fileset dir="src/docbkx/resources">
+- <include name="**/*.css" />
+- <include name="**/*.png" />
+- <include name="**/*.gif" />
+- <include name="**/*.jpg" />
+- </fileset>
+- </copy>
+- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpcore-tutorial.pdf" failonerror="false" />
+- </postProcess>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+--
+1.7.3.3
+
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
new file mode 100644
index 0000000..50a5832
--- /dev/null
+++ b/httpcomponents-core.spec
@@ -0,0 +1,103 @@
+Name: httpcomponents-core
+Summary: Set of low level Java HTTP transport components for HTTP services
+Version: 4.1
+Release: 2%{?dist}
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://hc.apache.org/
+Source0: http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-...
+Patch0: 0001-Remove-unneeded-pom-dependencies.patch
+BuildArch: noarch
+
+BuildRequires: httpcomponents-project
+BuildRequires: java >= 1:1.6.0
+BuildRequires: jpackage-utils
+
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+%description
+HttpCore is a set of low level HTTP transport components that can be
+used to build custom client and server side HTTP services with a
+minimal footprint. HttpCore supports two I/O models: blocking I/O
+model based on the classic Java I/O and non-blocking, event driven I/O
+model based on Java NIO.
+
+The blocking I/O model may be more appropriate for data intensive, low
+latency scenarios, whereas the non-blocking model may be more
+appropriate for high latency scenarios where raw data throughput is
+less important than the ability to handle thousands of simultaneous
+HTTP connections in a resource efficient manner.
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+export maven_repo_local=$(pwd)/.m2/repository
+install -d $maven_repo_local
+
+# start using install again when bundle plugin is updated to 2.1.0
+mvn-jpp -Dmaven.repo.local=$maven_repo_local \
+ package javadoc:aggregate
+
+%install
+install -d %{buildroot}/%{_mavenpomdir}
+install -d %{buildroot}/%{_javadir}/%{name}
+
+for m in httpcore httpcore-nio httpcore-osgi; do
+ # poms
+ install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-$m.pom
+
+ # jars - osgi doesn't have one
+ if [ -f $m/target/$m-%{version}.jar ];then
+ install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{name}/$m.jar
+ fi
+
+ %add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{name} $m
+done
+
+# parent
+install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{name} %{name}
+
+# javadocs
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%doc README.txt LICENSE.txt RELEASE_NOTES.txt
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP.%{name}*.pom
+%{_javadir}/%{name}
+
+%files javadoc
+%doc LICENSE.txt
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/*
+
+%changelog
+* Wed Dec 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1-2
+- Added license to javadoc subpackage
+
+* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1-1
+- Initial package
diff --git a/sources b/sources
index e69de29..7c2e814 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+5921a41284b6452a259c2ae55b1f78b6 httpcomponents-core-4.1-src.tar.gz
13 years, 4 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-6 tree:
On ppc64:
joda-time-1.6-3.tzdata2008i.el6.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
13 years, 4 months
[maven2] Add xml-commons-apis to lib directory
by Stanislav Ochotnicky
commit 3a5ed0fba7321aa1c97bec759c6cf6c89c992e45
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Dec 22 12:24:37 2010 +0100
Add xml-commons-apis to lib directory
this fixes NoClassDefFoundError: org/w3c/dom/ElementTraversal problems
maven2.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 0d1acc0..d21f45f 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -482,7 +482,7 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%if ! %{bootstrap}
(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
- build-jar-repository -s -p . backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus/container-default plexus/interactivity-api plexus/interpolation plexus/utils slf4j/jcl-over-slf4j slf4j/api slf4j/jdk14 slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2
+ build-jar-repository -s -p . backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus/container-default plexus/interactivity-api plexus/interpolation plexus/utils slf4j/jcl-over-slf4j slf4j/api slf4j/jdk14 slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2 xml-commons-apis
)
%endif
@@ -518,6 +518,10 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Wed Dec 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-18
+- Add xml-commons-apis to lib directory
+- fixes NoClassDefFoundError org/w3c/dom/ElementTraversal
+
* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-17
- Add conditional BRs to enable ff merge between f14 and f15
- Remove jackrabbit dependency from pom files
13 years, 4 months