[Jpackage-commits] dist/plexus-classworlds/devel .cvsignore, 1.2, 1.3 plexus-classworlds-1.2-jpp-depmap.xml, 1.1, NONE plexus-classworlds-1.2-pom_xml.patch, 1.1, NONE plexus-classworlds-2.2.2-jpp-depmap.xml, NONE, 1.1 plexus-classworlds.spec, 1.10, 1.11 sources, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 7 19:40:38 CET 2010


Update of /home/projects/jpackage/cvs/dist/plexus-classworlds/devel
In directory ryu.zarb.org:/tmp/cvs-serv537

Modified Files:
	.cvsignore plexus-classworlds.spec sources 
Added Files:
	plexus-classworlds-2.2.2-jpp-depmap.xml 
Removed Files:
	plexus-classworlds-1.2-jpp-depmap.xml 
	plexus-classworlds-1.2-pom_xml.patch 
Log Message:
2.2.2

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-classworlds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:30:38 -0000	1.2
--- .cvsignore	7 Dec 2010 18:40:35 -0000	1.3
***************
*** 1 ****
! plexus-classworlds-1.2-alpha-9-src.tar.gz
--- 1 ----
! plexus-classworlds-2.2.2.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-classworlds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:30:38 -0000	1.2
--- sources	7 Dec 2010 18:40:35 -0000	1.3
***************
*** 1 ****
! 8d47284e931d04d75a264beea546aedc  plexus-classworlds-1.2-alpha-9-src.tar.gz
--- 1 ----
! 9e9bc746d12fad51fcb41236af8ecd57  plexus-classworlds-2.2.2.tar.gz

--- plexus-classworlds-1.2-jpp-depmap.xml DELETED ---

Index: plexus-classworlds.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-classworlds/devel/plexus-classworlds.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** plexus-classworlds.spec	15 May 2009 02:30:28 -0000	1.10
--- plexus-classworlds.spec	7 Dec 2010 18:40:35 -0000	1.11
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 39,61 ****
  %define parent plexus
  %define subname classworlds
! %define namedversion 1.2-alpha-9
  
  Name:           %{parent}-%{subname}
! Version:        1.2
! Release:        0.a9.6%{?dist}
  Epoch:          0
  Summary:        Plexus Classworlds Classloader Framework
! License:        ASL 2.0 and Plexus
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! # svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds
! # tar czf plexus-classworlds-1.0-alpha-9.tar.gz plexus-classworlds/
! Source0:        %{name}-%{namedversion}-src.tar.gz
  
  Source1:        plexus-classworlds-1.2-build.xml
  Source3:        plexus-classworlds-settings.xml
! Source4:        plexus-classworlds-1.2-jpp-depmap.xml
! 
! Patch0:         plexus-classworlds-1.2-pom_xml.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
--- 39,60 ----
  %define parent plexus
  %define subname classworlds
! %define namedversion 2.2.2
  
  Name:           %{parent}-%{subname}
! Version:        2.2.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Plexus Classworlds Classloader Framework
! License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! # svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-2.2.2/
! # tar czf plexus-classworlds-2.2.2.tar.gz plexus-classworlds-2.2.2
! 
! Source0:        %{name}-%{namedversion}.tar.gz
  
  Source1:        plexus-classworlds-1.2-build.xml
  Source3:        plexus-classworlds-settings.xml
! Source4:        plexus-classworlds-2.2.2-jpp-depmap.xml
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
***************
*** 66,74 ****
  
  BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  ant >= 0:1.6.5
! BuildRequires:  jakarta-commons-logging
! BuildRequires:  xml-commons-jaxp-1.3-apis
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 65,73 ----
  
  BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  ant >= 0:1.7.1
! BuildRequires:  apache-commons-logging
! #BuildRequires:  xml-commons-jaxp-1.3-apis
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 76,81 ****
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire = 2.3
! BuildRequires:  maven-surefire-provider-junit = 2.3
  BuildRequires:	maven-doxia
  BuildRequires:  maven-doxia-sitetools
--- 75,80 ----
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
  BuildRequires:	maven-doxia
  BuildRequires:  maven-doxia-sitetools
***************
*** 89,94 ****
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  %if %{gcj_support}
--- 88,93 ----
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.3
! Requires(postun):  jpackage-utils >= 0:1.7.3
  
  %if %{gcj_support}
***************
*** 111,116 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 110,113 ----
***************
*** 124,129 ****
  cp %{SOURCE1} build.xml
  cp %{SOURCE3} settings.xml
! %patch0 -b .sav
! ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) lib/xml-apis-1.3.02.jar
  ln -sf $(build-classpath ant) lib/ant-1.6.5.jar
  ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar
--- 121,132 ----
  cp %{SOURCE1} build.xml
  cp %{SOURCE3} 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
! sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
! sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
! 
! mkdir lib
! #ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) lib/xml-apis-1.3.02.jar
  ln -sf $(build-classpath ant) lib/ant-1.6.5.jar
  ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar
***************
*** 139,145 ****
  %if %{with_maven}
  mvn-jpp \
!         -e \
          -Dmaven.test.failure.ignore=true \
! 		-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          install javadoc:javadoc
  
--- 142,149 ----
  %if %{with_maven}
  mvn-jpp \
!         -e -s $(pwd)/settings.xml \
          -Dmaven.test.failure.ignore=true \
!         -Dmaven2.jpp.depmap.file=%{SOURCE4} \
! 	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          install javadoc:javadoc
  
***************
*** 155,159 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 target/%{name}-%{namedversion}.jar \
    $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
  %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
--- 159,163 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -m 644 target/%{name}-%{namedversion}.jar \
    $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
  %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
***************
*** 163,167 ****
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
--- 167,171 ----
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
***************
*** 197,203 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/%{parent}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 201,208 ----
  %files
  %defattr(-,root,root,-)
! %dir %{_javadir}/%{parent}
! %{_javadir}/%{parent}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 210,215 ****
  
  %changelog
! * Thu May 14 2009 Fernando Nasser <fnasser at redhat.com> 0:1.2-0.a9.6
! - Fix license specification
  
  * Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.5
--- 215,220 ----
  
  %changelog
! * Tue Dec 07 2009 Ralph Apel <r.apel at r-apel.de> 0:2.2.2-1
! - 2.2.2
  
  * Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.5

--- plexus-classworlds-1.2-pom_xml.patch DELETED ---

--- NEW FILE: plexus-classworlds-2.2.2-jpp-depmap.xml ---
<dependencies>
<!--
  <dependency>
    <maven>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>org.codehaus.plexus</groupId>
      <artifactId>plexus-utils</artifactId>
      <version>1.0.4</version>
    </maven>
    <jpp>
      <groupId>JPP/plexus</groupId>
      <artifactId>utils</artifactId>
      <version>1.4.5</version>
    </jpp>
  </dependency>
-->

</dependencies>




More information about the JPackage-commits mailing list