[Jpackage-commits] rpms/free/hc-httpcore hc-httpcore-jpp-depmap.xml, 1.2, 1.3 hc-httpcore-nio-pom_xml.patch, 1.1, NONE hc-httpcore-no-clover.patch, NONE, 1.1 hc-httpcore-pom_xml.patch, 1.2, NONE hc-httpcore-settings.xml, 1.2, 1.3 hc-httpcore.spec, 1.2, 1.3 jakarta-httpcomponents-pom.xml, 1.2, NONE

jpackage jpackage at ryu.zarb.org
Mon Dec 13 14:03:31 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/hc-httpcore
In directory ryu.zarb.org:/tmp/wdBtcznIqM/rpms/free/hc-httpcore

Modified Files:
	hc-httpcore-jpp-depmap.xml hc-httpcore-settings.xml 
	hc-httpcore.spec 
Added Files:
	hc-httpcore-no-clover.patch 
Removed Files:
	hc-httpcore-nio-pom_xml.patch hc-httpcore-pom_xml.patch 
	jakarta-httpcomponents-pom.xml 
Log Message:
4.1-1.jpp6

Index: hc-httpcore.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/hc-httpcore/hc-httpcore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** hc-httpcore.spec	17 Sep 2010 19:00:25 -0000	1.2
--- hc-httpcore.spec	13 Dec 2010 13:03:29 -0000	1.3
***************
*** 29,69 ****
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
! 
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
! 
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
! 
! %define section         free
! %define namedversion    4.1-beta2-SNAPSHOT
! %define sname    httpcore
  
  Name:           hc-httpcore
  Version:        4.1
! Release:        0.r962551.1%{?dist}
  Epoch:          0
  Summary:        HTTPCore components
! License:        Apache Software License 2.0
  Url:            http://hc.apache.org/
  Group:          Development/Libraries/Java
! Source0:        hc-httpcore-4.1-r962551.tgz
! # svn export http://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk/ hc-httpcore-4.1
! # tar czf hc-httpcore-4.1-r962551.tgz hc-httpcore-4.1/
! 
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
! Source3:        jakarta-httpcomponents-pom.xml
! 
! Patch0:         %{name}-pom_xml.patch
! Patch1:         %{name}-nio-pom_xml.patch
! 
! BuildRequires:  jpackage-utils >= 0:5.0.0
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  junit >= 0:3.8.2
! %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-antrun
  BuildRequires:  maven2-plugin-assembly
--- 29,67 ----
  #
  
! %define section free
! %define namedversion %{version}
! %define sname httpcore
  
  Name:           hc-httpcore
  Version:        4.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        HTTPCore components
! License:        ASL 2.0
  Url:            http://hc.apache.org/
  Group:          Development/Libraries/Java
! # svn export http://svn.apache.org/repos/asf/httpcomponents/httpcore/tags/4.1/ hc-httpcore-4.1 && tar cjf hc-httpcore-4.1.tar.bz2 hc-httpcore-4.1
! # Exported revision 1041694.
! Source0:        %{name}-%{namedversion}.tar.bz2
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
! Patch0:         hc-httpcore-no-clover.patch
! Provides:       jakarta-httpcore = %{epoch}:%{version}-%{release}
! Obsoletes:      jakarta-httpcore < %{epoch}:%{version}-%{release}
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! Requires:       jpackage-utils
! BuildRequires:  apache-commons-parent
! BuildRequires:  apache-jar-resource-bundle >= 0:1.3
! BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
! BuildRequires:  docbkx
! #BuildRequires:  docbook-xml >= 0:4.4
! BuildRequires:  felix-maven2
! BuildRequires:  hc-project >= 0:4.1.1
  BuildRequires:  junit >= 0:3.8.2
! BuildRequires:  junit4
! BuildRequires:  maven2 >= 2.0.7
  BuildRequires:  maven2-plugin-antrun
  BuildRequires:  maven2-plugin-assembly
***************
*** 73,98 ****
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-remote-resources
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  maven-surefire-provider-junit4
- BuildRequires:  docbkx
- BuildRequires:  felix-maven2
- %endif
- Requires(post):    jpackage-utils >= 0:5.0.0
- Requires(postun):  jpackage-utils >= 0:5.0.0
- %if %{gcj_support}
- BuildRequires:    java-gcj-compat-devel
- Requires(post):   java-gcj-compat
- Requires(postun): java-gcj-compat
- %endif
- Provides:       jakarta-httpcore = %{epoch}:%{version}-%{release}
- Obsoletes:      jakarta-httpcore < %{epoch}:%{version}-%{release}
- 
- %if ! %{gcj_support}
  BuildArch:      noarch
! %endif
! BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
  
  %description
--- 71,83 ----
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-remote-resources
+ BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
+ BuildRequires:  maven2-plugin-source
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  maven-surefire-provider-junit4
  BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 105,108 ****
--- 90,94 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
***************
*** 110,122 ****
  
  %prep
! %setup -q 
! cp %{SOURCE1} settings.xml
! mkdir -p .m2/repository/org/apache/httpcomponents/project/4.0/
! cp %{SOURCE3} .m2/repository/org/apache/httpcomponents/project/4.0/project-4.0.pom
! %patch0 -b .sav0
! %patch1 -b .sav1
  
- %build
- %if %{with_maven}
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
--- 96,103 ----
  
  %prep
! %setup -q -n %{name}-%{namedversion}
! %patch0 -p0 -b .sav0
! cp -p %{SOURCE1} settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
***************
*** 125,134 ****
  sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
  
- export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
- 
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
  
! mvn-jpp \
          -e \
          -s $(pwd)/settings.xml \
--- 106,114 ----
  sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
  
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
  
! %build
! %{_bindir}/mvn-jpp \
          -e \
          -s $(pwd)/settings.xml \
***************
*** 136,251 ****
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         install
- 
- mvn-jpp \
-         -e \
-         -s $(pwd)/settings.xml \
          -Daggregate=true \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         javadoc:javadoc
! 
! %else
! ant -Djunit.jar=$(build-classpath junit) \
!      package test javadoc
! %endif
! 
  
  %install
! rm -rf $RPM_BUILD_ROOT
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/httpcomponents
! %if %{with_maven}
! install -m 644 httpcore/target/%{sname}-%{namedversion}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/httpcomponents/%{sname}-%{version}.jar
! install -m 644 httpcore-nio/target/%{sname}-nio-%{namedversion}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/httpcomponents/%{sname}-nio-%{version}.jar
! install -m 644 httpcore-osgi/target/org.apache.httpcomponents.httpcore_%{namedversion}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/httpcomponents/org.apache.httpcomponents.httpcore_%{version}.jar
! %else
! install -m 644 dist/%{name}-SNAPSHOT.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -m 644 dist/%{name}-nio-SNAPSHOT.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}-nio-%{version}.jar
! install -m 644 dist/%{name}-niossl-SNAPSHOT.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}-niossl-%{version}.jar
! %endif
  
! (cd $RPM_BUILD_ROOT%{_javadir}/httpcomponents && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && ln -s httpcomponents/httpcore.jar jakarta-httpcore.jar && ln -s httpcomponents/httpcore-nio.jar jakarta-httpcore-nio.jar)
! (cd $RPM_BUILD_ROOT%{_javadir}/httpcomponents && ln -s httpcore-nio.jar httpcore-niossl.jar)
  
  # poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE3} \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-project.pom
! %add_to_maven_depmap org.apache.httpcomponents project %{namedversion} JPP/httpcomponents project
! install -m 644 pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-core.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcomponents-core %{namedversion} JPP/httpcomponents core
! install -m 644 httpcore/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore %{namedversion} JPP/httpcomponents httpcore
! install -m 644 httpcore-nio/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-nio.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-nio %{namedversion} JPP/httpcomponents httpcore-nio
! install -m 644 httpcore-nio/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-niossl.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-niossl %{namedversion} JPP/httpcomponents httpcore-nio
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %if %{with_maven}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %else
! cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %endif
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
! 
! 
! %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
! %endif
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %postun
  %update_maven_depmap 
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
- 
  
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*.jar
! %{_javadir}/httpcomponents/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
! %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
! %endif
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
! * Fri Sep 17 2010 Ralph Apel <r.apel at r-apel.de> 0:4.1-0.r962551.1
! - 4.1 beta2 SNAPSHOT
  
  * Thu Mar 26 2009 Ralph Apel <r.apel at r-apel.de> 0:4.0-1.jpp5
--- 116,197 ----
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Daggregate=true \
!         install javadoc:javadoc
  
  %install
! rm -rf %{buildroot}
  
! # jars
! mkdir -p %{buildroot}%{_javadir}/httpcomponents
! cp -p httpcore/target/%{sname}-%{namedversion}.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-%{version}.jar
! cp -p httpcore/target/%{sname}-%{namedversion}-sources.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-sources-%{version}.jar
! cp -p httpcore-nio/target/%{sname}-nio-%{namedversion}.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-nio-%{version}.jar
! cp -p httpcore-nio/target/%{sname}-nio-%{namedversion}-sources.jar %{buildroot}%{_javadir}/httpcomponents/%{sname}-nio-sources-%{version}.jar
! (cd %{buildroot}%{_javadir} && ln -s httpcomponents/httpcore-%{version}.jar jakarta-httpcore-%{version}.jar && ln -s httpcomponents/httpcore-nio-%{version}.jar jakarta-httpcore-nio-%{version}.jar)
! (cd %{buildroot}%{_javadir}/httpcomponents && ln -s httpcore-nio-%{version}.jar httpcore-niossl-%{version}.jar)
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -s ${jar} `echo $jar | sed  "s|-%{version}||g"`; done)
! (cd %{buildroot}%{_javadir}/httpcomponents && for jar in *-%{version}.jar; do ln -s ${jar} `echo $jar | sed  "s|-%{version}||g"`; done)
  
  # poms
! mkdir -p %{buildroot}%{_datadir}/maven2/poms
! cp -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-core.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcomponents-core %{namedversion} JPP/httpcomponents core
! cp -p httpcore/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore %{namedversion} JPP/httpcomponents httpcore
! cp -p httpcore-nio/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-nio.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-nio %{namedversion} JPP/httpcomponents httpcore-nio
! cp -p httpcore-nio/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-niossl.pom
  %add_to_maven_depmap org.apache.httpcomponents httpcore-niossl %{namedversion} JPP/httpcomponents httpcore-nio
  
  # javadoc
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
! rm -rf %{buildroot}
  
  %post
  %update_maven_depmap
  
  %postun
  %update_maven_depmap 
  
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}*/jakarta-httpcore-%{version}.jar
! %{_javadir}*/jakarta-httpcore.jar
! %{_javadir}*/jakarta-httpcore-nio-%{version}.jar
! %{_javadir}*/jakarta-httpcore-nio.jar
! %dir %{_javadir}*/httpcomponents
! %{_javadir}*/httpcomponents/%{sname}-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}.jar
! %{_javadir}*/httpcomponents/%{sname}-nio-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}-nio.jar
! %{_javadir}*/httpcomponents/%{sname}-sources-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}-sources.jar
! %{_javadir}*/httpcomponents/%{sname}-nio-sources-%{version}.jar
! %{_javadir}*/httpcomponents/%{sname}-nio-sources.jar
! %{_javadir}*/httpcomponents/httpcore-nio-%{version}.jar
! %{_javadir}*/httpcomponents/httpcore-nio.jar
! %{_javadir}*/httpcomponents/httpcore-niossl-%{version}.jar
! %{_javadir}*/httpcomponents/httpcore-niossl.jar
! %{_datadir}/maven2/poms/JPP.httpcomponents-core.pom
! %{_datadir}/maven2/poms/JPP.httpcomponents-httpcore.pom
! %{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-nio.pom
! %{_datadir}/maven2/poms/JPP.httpcomponents-httpcore-niossl.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
! * Thu Dec 09 2010 David Walluck <dwalluck at redhat.com> 0:4.1-1
! - 4.1
! 
! * Wed Aug 19 2009 Fernando Nasser <fnasser at redhat.com> 0:4.0-1.1
! - Build without OSGi bundle for lack of dependencies needed for the build
  
  * Thu Mar 26 2009 Ralph Apel <r.apel at r-apel.de> 0:4.0-1.jpp5
***************
*** 261,263 ****
  * Wed May 23 2007 Ralph Apel <r.apel at r-apel.de> 0:4.0-0.a4.1jpp
  - Initial build.
- 
--- 207,208 ----

--- hc-httpcore-nio-pom_xml.patch DELETED ---

--- jakarta-httpcomponents-pom.xml DELETED ---

Index: hc-httpcore-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/hc-httpcore/hc-httpcore-settings.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** hc-httpcore-settings.xml	17 Sep 2010 19:00:25 -0000	1.2
--- hc-httpcore-settings.xml	13 Dec 2010 13:03:29 -0000	1.3
***************
*** 1,47 ****
  <settings>
! 	<profiles>
! 		<profile>
! 			<id>JPP</id>
! 			<repositories>
! 				<repository>
! 					<id>internal</id>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>external</id>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>local</id>
! 					<layout>jpp</layout>
! 					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
! 				</repository>
! 			</repositories>
! 			<pluginRepositories>
! 				<pluginRepository>
! 					<id>plugins-internal</id>
! 					<name>plugins-internal</name>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-external</id>
! 					<name>plugins-external</name>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-maven</id>
! 					<name>plugins-maven</name>
! 					<layout>jpp</layout>
! 					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
! 				</pluginRepository>
! 			</pluginRepositories>
! 		</profile>
! 	</profiles>
! 	<activeProfiles>
! 		<activeProfile>JPP</activeProfile>
! 	</activeProfiles>
  </settings>
--- 1,47 ----
  <settings>
!     <profiles>
!         <profile>
!             <id>JPP</id>
!             <repositories>
!                 <repository>
!                     <id>internal</id>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>external</id>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>local</id>
!                     <layout>jpp</layout>
!                     <url>__MAVENREPO_DIR_PLACEHOLDER__</url>
!                 </repository>
!             </repositories>
!             <pluginRepositories>
!                 <pluginRepository>
!                     <id>plugins-internal</id>
!                     <name>plugins-internal</name>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-external</id>
!                     <name>plugins-external</name>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-maven</id>
!                     <name>plugins-maven</name>
!                     <layout>jpp</layout>
!                     <url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
!                 </pluginRepository>
!             </pluginRepositories>
!         </profile>
!     </profiles>
!     <activeProfiles>
!         <activeProfile>JPP</activeProfile>
!     </activeProfiles>
  </settings>

--- NEW FILE: hc-httpcore-no-clover.patch ---
--- httpcore/pom.xml.orig	2010-11-13 13:33:28.000000000 -0500
+++ httpcore/pom.xml	2010-12-08 15:06:30.524900457 -0500
@@ -111,7 +111,7 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
+      <!--<plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <configuration>
@@ -128,7 +128,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>-->
     </plugins>
   </build>
 
--- httpcore-nio/pom.xml.orig	2010-11-13 13:33:28.000000000 -0500
+++ httpcore-nio/pom.xml	2010-12-08 15:06:42.966204688 -0500
@@ -103,7 +103,7 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
+      <!--<plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <configuration>
@@ -120,7 +120,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>-->
     </plugins>
   </build>
 

Index: hc-httpcore-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/hc-httpcore/hc-httpcore-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** hc-httpcore-jpp-depmap.xml	17 Sep 2010 19:00:25 -0000	1.2
--- hc-httpcore-jpp-depmap.xml	13 Dec 2010 13:03:29 -0000	1.3
***************
*** 1,53 ****
  <dependencies>
- <!--
-   <dependency>
-     <maven>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
-       <version>3.8.2</version>
-     </maven>
-     <jpp>
-       <groupId>JPP</groupId>
-       <artifactId>junit</artifactId>
-       <version>3.8.2</version>
-     </jpp>
-   </dependency>
-   <dependency>
-     <maven>
-       <groupId>xmlunit</groupId>
-       <artifactId>xmlunit</artifactId>
-       <version>1.0</version>
-     </maven>
-     <jpp>
-       <groupId>JPP</groupId>
-       <artifactId>xmlunit</artifactId>
-       <version>1.0</version>
-     </jpp>
-   </dependency>
-   <dependency>
-     <maven>
-       <groupId>xmlunit</groupId>
-       <artifactId>xmlunit</artifactId>
-       <version>1.0</version>
-     </maven>
-     <jpp>
-       <groupId>JPP</groupId>
-       <artifactId>xmlunit</artifactId>
-       <version>1.0</version>
-     </jpp>
-   </dependency>
- -->
-   <dependency>
-     <maven>
-       <groupId>xmlpull</groupId>
-       <artifactId>xmlpull</artifactId>
-       <version>1.1.3.1</version>
-     </maven>
-     <jpp>
-       <groupId>JPP</groupId>
-       <artifactId>xpp3</artifactId>
-       <version>1.1.3.8</version>
-     </jpp>
-   </dependency>
- 
  </dependencies>
--- 1,2 ----

--- hc-httpcore-pom_xml.patch DELETED ---




More information about the JPackage-commits mailing list