[Jpackage-commits] dist/maven22/devel maven22.spec,1.2,1.3

David Walluck david at ryu.zarb.org
Tue Oct 11 23:19:47 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven22/devel
In directory ryu.zarb.org:/tmp/cvs-serv27981

Modified Files:
	maven22.spec 
Log Message:
- disable bootstrap
- switch mojo-maven2-plugin-buildnumber to buildnumber-maven-plugin
- fix build for slf4j >= 0:1.6.1


Index: maven22.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven22.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven22.spec	11 Oct 2011 20:33:25 -0000	1.2
--- maven22.spec	11 Oct 2011 21:19:45 -0000	1.3
***************
*** 1,3 ****
! %global bootstrap 1
  %global __jar_repack 0
  %global majmin 22
--- 1,3 ----
! %global bootstrap 0
  %global __jar_repack 0
  %global majmin 22
***************
*** 5,9 ****
  Name:           maven22
  Version:        2.2.1
! Release:        23.1%{?dist}
  Summary:        Java project management and project comprehension tool
  
--- 5,9 ----
  Name:           maven22
  Version:        2.2.1
! Release:        23.2%{?dist}
  Summary:        Java project management and project comprehension tool
  
***************
*** 74,78 ****
  BuildRequires:  objectweb-asm
  BuildRequires:  backport-util-concurrent
! BuildRequires:  mojo-maven2-plugin-buildnumber
  BuildRequires:  bsh
  BuildRequires:  jsch
--- 74,78 ----
  BuildRequires:  objectweb-asm
  BuildRequires:  backport-util-concurrent
! BuildRequires:  buildnumber-maven-plugin
  BuildRequires:  bsh
  BuildRequires:  jsch
***************
*** 144,149 ****
  BuildRequires:  jakarta-oro
  BuildRequires:  regexp
! # jar locations changed in slf4j-0:1.6.1
! BuildRequires:  slf4j < 0:1.6.1
  BuildRequires:  velocity
  %endif
--- 144,148 ----
  BuildRequires:  jakarta-oro
  BuildRequires:  regexp
! BuildRequires:  slf4j
  BuildRequires:  velocity
  %endif
***************
*** 487,491 ****
    for i in 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/api slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2; do %{__ln_s} `build-classpath ${i}`; done
  )
  %endif
--- 486,490 ----
    for i in 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/slf4j-api slf4j/slf4j-nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2; do %{__ln_s} `build-classpath ${i}`; done
  )
  %endif
***************
*** 570,593 ****
  %{_datadir}/%{name}/lib/commons-httpclient.jar
  %{_datadir}/%{name}/lib/jsch.jar
! %{_datadir}/%{name}/lib/maven-doxia_logging-api.jar
! %{_datadir}/%{name}/lib/maven-doxia_sink-api.jar
! %{_datadir}/%{name}/lib/maven-shared_reporting-api.jar
! %{_datadir}/%{name}/lib/maven-wagon_file.jar
! %{_datadir}/%{name}/lib/maven-wagon_http-lightweight.jar
! %{_datadir}/%{name}/lib/maven-wagon_http-shared.jar
! %{_datadir}/%{name}/lib/maven-wagon_http.jar
! %{_datadir}/%{name}/lib/maven-wagon_provider-api.jar
! %{_datadir}/%{name}/lib/maven-wagon_ssh-common.jar
! %{_datadir}/%{name}/lib/maven-wagon_ssh-external.jar
! %{_datadir}/%{name}/lib/maven-wagon_ssh.jar
  %{_datadir}/%{name}/lib/nekohtml.jar
! %{_datadir}/%{name}/lib/plexus_container-default.jar
! %{_datadir}/%{name}/lib/plexus_interactivity-api.jar
! %{_datadir}/%{name}/lib/plexus_interpolation.jar
! %{_datadir}/%{name}/lib/plexus_plexus-cipher.jar
! %{_datadir}/%{name}/lib/plexus_plexus-sec-dispatcher.jar
! %{_datadir}/%{name}/lib/plexus_utils.jar
! %{_datadir}/%{name}/lib/slf4j_api.jar
! %{_datadir}/%{name}/lib/slf4j_nop.jar
  %{_datadir}/%{name}/lib/xerces-j2.jar
  %endif
--- 569,592 ----
  %{_datadir}/%{name}/lib/commons-httpclient.jar
  %{_datadir}/%{name}/lib/jsch.jar
! %{_datadir}/%{name}/lib/maven-doxia-logging-api.jar
! %{_datadir}/%{name}/lib/maven-doxia-sink-api.jar
! %{_datadir}/%{name}/lib/maven-shared-reporting-api.jar
! %{_datadir}/%{name}/lib/maven-wagon-file.jar
! %{_datadir}/%{name}/lib/maven-wagon-http-lightweight.jar
! %{_datadir}/%{name}/lib/maven-wagon-http-shared.jar
! %{_datadir}/%{name}/lib/maven-wagon-http.jar
! %{_datadir}/%{name}/lib/maven-wagon-provider-api.jar
! %{_datadir}/%{name}/lib/maven-wagon-ssh-common.jar
! %{_datadir}/%{name}/lib/maven-wagon-ssh-external.jar
! %{_datadir}/%{name}/lib/maven-wagon-ssh.jar
  %{_datadir}/%{name}/lib/nekohtml.jar
! %{_datadir}/%{name}/lib/plexus-container-default.jar
! %{_datadir}/%{name}/lib/plexus-interactivity-api.jar
! %{_datadir}/%{name}/lib/plexus-interpolation.jar
! %{_datadir}/%{name}/lib/plexus-cipher.jar
! %{_datadir}/%{name}/lib/plexus-sec-dispatcher.jar
! %{_datadir}/%{name}/lib/plexus-utils.jar
! %{_datadir}/%{name}/lib/slf4j-api.jar
! %{_datadir}/%{name}/lib/slf4j-nop.jar
  %{_datadir}/%{name}/lib/xerces-j2.jar
  %endif
***************
*** 604,607 ****
--- 603,611 ----
  
  %changelog
+ * Tue Oct 11 2011 David Walluck <dwalluck at redhat.com> 2.2.1-23.2
+ - disable bootstrap
+ - switch mojo-maven2-plugin-buildnumber to buildnumber-maven-plugin
+ - fix build for slf4j >= 0:1.6.1
+ 
  * Mon Oct 10 2011 David Walluck <dwalluck at redhat.com> 2.2.1-23.1
  - enable bootstrap




More information about the JPackage-commits mailing list