[Jpackage-commits] rpms/free/maven2-plugin-shade maven2-plugin-shade-depmap.xml, 1.2, NONE maven2-plugin-shade-jpp-depmap.xml, NONE, 1.1 maven2-plugin-shade-pom.patch, NONE, 1.1 maven2-plugin-shade.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Fri Dec 3 10:35:39 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven2-plugin-shade
In directory ryu.zarb.org:/tmp/GQCoyKc4IF/rpms/free/maven2-plugin-shade

Modified Files:
	maven2-plugin-shade.spec 
Added Files:
	maven2-plugin-shade-jpp-depmap.xml 
	maven2-plugin-shade-pom.patch 
Removed Files:
	maven2-plugin-shade-depmap.xml 
Log Message:
1.0-8.jpp6

--- maven2-plugin-shade-depmap.xml DELETED ---

--- NEW FILE: maven2-plugin-shade-jpp-depmap.xml ---
<dependencies>
    <!--
    <dependency>
        <maven>
            <groupId>com.thoughtworks.qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </jpp>
    </dependency>    
    -->
</dependencies>

--- NEW FILE: maven2-plugin-shade-pom.patch ---
--- pom.xml.sav	2010-11-29 16:29:39.000000000 +0100
+++ pom.xml	2010-11-29 16:30:25.000000000 +0100
@@ -63,17 +63,17 @@
 
     <!-- Others -->
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.objectweb.asm</groupId>
       <artifactId>asm</artifactId>
       <version>3.1</version>
     </dependency>
      <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.objectweb.asm</groupId>
       <artifactId>asm-util</artifactId>
       <version>3.1</version>
     </dependency>
      <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.objectweb.asm</groupId>
       <artifactId>asm-commons</artifactId>
       <version>3.1</version>
     </dependency>

Index: maven2-plugin-shade.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven2-plugin-shade/maven2-plugin-shade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** maven2-plugin-shade.spec	2 Sep 2009 08:49:31 -0000	1.5
--- maven2-plugin-shade.spec	3 Dec 2010 09:35:37 -0000	1.6
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 31,35 ****
  Name:           maven2-plugin-shade
  Version:        1.0
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Maven Shade Plugin
--- 31,35 ----
  Name:           maven2-plugin-shade
  Version:        1.0
! Release:	8%{?dist}
  Epoch:          0
  Summary:        Maven Shade Plugin
***************
*** 42,50 ****
  
  Source0:        %{name}-%{version}.tar.gz
! Source1:        %{name}-depmap.xml
! 
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
! BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
--- 42,51 ----
  
  Source0:        %{name}-%{version}.tar.gz
! Source1:        %{name}-jpp-depmap.xml
! Patch0:         %{name}-pom.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
***************
*** 55,63 ****
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven2-plugin-surefire = 2.3
! BuildRequires:  maven-surefire-provider-junit = 2.3
  BuildRequires:  plexus-archiver >= 1.0-0.1.a7
  BuildRequires:  plexus-maven-plugin >= 1.3.5
! BuildRequires:    plexus-cdc < 0:1.0-0.3.a11
  BuildRequires:  qdox >= 1.5
  BuildRequires:  tomcat5
--- 56,65 ----
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven2-plugin-surefire 
! BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  apache-commons-parent
  BuildRequires:  plexus-archiver >= 1.0-0.1.a7
  BuildRequires:  plexus-maven-plugin >= 1.3.5
! BuildRequires:  plexus-cdc < 0:1.0-0.3.a11
  BuildRequires:  qdox >= 1.5
  BuildRequires:  tomcat5
***************
*** 66,79 ****
  BuildRequires:  excalibur-avalon-framework
  
! Requires:       maven2 >= 0:2.0.4-9
  Requires:       plexus-archiver >= 1.0-0.1.a7
  
! Requires(post):   jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
  
  BuildArch:      noarch
  
  %description
! This plugin provides the capability to package the artifact in an uber-jar, including its dependencies and to shade - i.e. rename - the packages of some of the dependencies.
  
  %package javadoc
--- 68,84 ----
  BuildRequires:  excalibur-avalon-framework
  
! Requires:       java >= 0:1.6.0
! Requires:       maven2 >= 0:2.0.8
  Requires:       plexus-archiver >= 1.0-0.1.a7
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  BuildArch:      noarch
  
  %description
! This plugin provides the capability to package the artifact
! in an uber-jar, including its dependencies and to shade - 
! i.e. rename - the packages of some of the dependencies.
  
  %package javadoc
***************
*** 86,89 ****
--- 91,95 ----
  %prep
  %setup -q -n %{name}
+ %patch0 -b .sav0
  
  %build
***************
*** 99,103 ****
      install javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 105,108 ----
***************
*** 107,115 ****
  
  # Copy file and create unversioned symlink
! install -pm 644 target/maven-shade-plugin-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # Copy pom
! install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.apache.maven.plugins maven-shade-plugin %{version} JPP %{name}
  
--- 112,120 ----
  
  # Copy file and create unversioned symlink
! install -m 644 target/maven-shade-plugin-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # Copy pom
! install -m 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.apache.maven.plugins maven-shade-plugin %{version} JPP %{name}
  
***************
*** 130,134 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
--- 135,139 ----
  %files
  %defattr(-,root,root,-)
! %{_javadir}/*
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
***************
*** 139,142 ****
--- 144,153 ----
  
  %changelog
+ * Fri Dec 03 2010 Ralph Apel <r.apel at r-apel.de> - 1.0-8
+ - Fix pom from asm to org.objectweb.asm groupId
+ 
+ * Sat Jan 09 2010 Will Tatam <will.tatam at red61.com> 1.0-7
+ - Auto rebuild for JPackage 6 in centos5 mock
+ 
  * Wed Sep 02 2009 Ralph Apel <r.apel at r-apel.de> - 1.0-6
  - Fix pom file naming




More information about the JPackage-commits mailing list