[Jpackage-commits] rpms/free/maven-bundle-plugin maven-bundle-plugin-BundlePlugin.patch, NONE, 1.1 maven-bundle-plugin-jpp-depmap.xml, NONE, 1.1 maven-bundle-plugin-manifest-plugin.patch, 1.1, NONE maven-bundle-plugin-remove-headers.patch, 1.1, NONE maven-bundle-plugin.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Oct 18 23:35:06 CEST 2011


Update of /home/projects/jpackage/cvs/rpms/free/maven-bundle-plugin
In directory ryu.zarb.org:/tmp/TdhxM70RVj/rpms/free/maven-bundle-plugin

Modified Files:
	maven-bundle-plugin.spec 
Added Files:
	maven-bundle-plugin-BundlePlugin.patch 
	maven-bundle-plugin-jpp-depmap.xml 
Removed Files:
	maven-bundle-plugin-manifest-plugin.patch 
	maven-bundle-plugin-remove-headers.patch 
Log Message:
2.3.5-1.jpp6

--- NEW FILE: maven-bundle-plugin-jpp-depmap.xml ---
<dependencies>
<dependency>
    <maven>
        <groupId>com.thoughtworks.qdox</groupId>
        <artifactId>qdox</artifactId>
        <version>1.8</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>qdox</artifactId>
        <version>1.12</version>
    </jpp>
</dependency>

<dependency>
  <maven>
    <groupId>biz.aQute</groupId>
    <artifactId>bndlib</artifactId>
    <version>1.43.0</version>
  </maven>
  <jpp>
    <groupId>JPP/bnd1</groupId>
    <artifactId>bndlib</artifactId>
    <version>1.43.0</version>
  </jpp>
</dependency>

<dependency>
  <maven>
    <groupId>org.apache.felix</groupId>
    <artifactId>org.apache.felix.bundlerepository</artifactId>
    <version>1.6.6</version>
  </maven>
  <jpp>
    <groupId>JPP/apache-felix</groupId>
    <artifactId>org.apache.felix.bundlerepository</artifactId>
    <version>1.6.4</version>
  </jpp>
</dependency>

</dependencies>

Index: maven-bundle-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-bundle-plugin/maven-bundle-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-bundle-plugin.spec	15 Sep 2011 22:29:39 -0000	1.2
--- maven-bundle-plugin.spec	18 Oct 2011 21:35:04 -0000	1.3
***************
*** 1,67 ****
! %bcond_without repolib
  
! %define reltag %{nil}
! %define namedreltag %{nil}
! %global namedversion %{version}%{?namedreltag}
  
  Name:           maven-bundle-plugin
! Version:        2.0.0
! Release:        2%{?reltag}%{?dist}
! Epoch:          0
  Summary:        Maven Bundle Plugin
  Group:          Development/Tools
  License:        ASL 2.0
  URL:            http://felix.apache.org
! %if 0
! svn export -r 1159768 https://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-2.0.0 && tar cjf maven-bundle-plugin-2.0.0.tar.bz2 maven-bundle-plugin-2.0.0
! %endif
! Source0:        maven-bundle-plugin-2.0.0.tar.bz2
! Patch0:         maven-bundle-plugin-remove-headers.patch
! Patch1:         maven-bundle-plugin-manifest-plugin.patch
! Obsoletes:      maven-plugin-bundle < %{epoch}:%{version}-%{release}
! Provides:       maven-plugin-bundle = %{epoch}:%{version}-%{release}
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       jpackage-utils
! Requires:       aqute-bndlib
! Requires:       felix-parent 
! Requires:       kxml2
! Requires:       felix-osgi-core
! Requires:       felix-osgi-obr
! Requires:       jboss-parent
! Requires:       maven2
! Requires:       maven-shared-dependency-tree
! Requires:       maven-shared-archiver
! Requires:       maven-wagon
! Requires:       plexus-archiver
! Requires:       plexus-container-default
! Requires:       plexus-utils
! BuildRequires:  aqute-bndlib >= 0:0.0.311
! BuildRequires:  kxml2
! BuildRequires:  maven-shared-plugin-testing-harness
  BuildRequires:  maven2-plugin-compiler
- BuildRequires:  plexus-utils
- BuildRequires:  felix-osgi-core
- BuildRequires:  felix-osgi-obr
- BuildRequires:  felix-parent
- BuildRequires:  jboss-parent
- BuildRequires:  maven-shared-dependency-tree >= 0:1.1-3
- BuildRequires:  maven-shared-archiver
- BuildRequires:  maven-wagon >= 0:1.0-0.2.b2
- BuildRequires:  maven2-plugin-deploy
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-plugin
- BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-maven-plugin >= 0:2.3
! BuildRequires:  maven-surefire-provider-junit4
! BuildRequires:  plexus-archiver
! BuildRequires:  plexus-container-default
! BuildRequires:  easymock2
! BuildRequires:  mockito
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
--- 1,91 ----
! # Copyright (c) 2000-2011, JPackage Project
! # All rights reserved.
! #
! # Redistribution and use in source and binary forms, with or without
! # modification, are permitted provided that the following conditions
! # are met:
! #
! # 1. Redistributions of source code must retain the above copyright
! #    notice, this list of conditions and the following disclaimer.
! # 2. Redistributions in binary form must reproduce the above copyright
! #    notice, this list of conditions and the following disclaimer in the
! #    documentation and/or other materials provided with the
! #    distribution.
! # 3. Neither the name of the JPackage Project nor the names of its
! #    contributors may be used to endorse or promote products derived
! #    from this software without specific prior written permission.
! #
! # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
! # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
! # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
! # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
! # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
! # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
! # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
! # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! #
  
! %bcond_without repolib
  
  Name:           maven-bundle-plugin
! Version:        2.3.5
! Release:        1%{?dist}
  Summary:        Maven Bundle Plugin
+ 
  Group:          Development/Tools
  License:        ASL 2.0
  URL:            http://felix.apache.org
! # svn export http://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-2.3.5/ && tar czf maven-bundle-plugin-2.3.5.tgz maven-bundle-plugin-2.3.5/
! Source0:        maven-bundle-plugin-2.3.5.tgz
! Source1:        %{name}-jpp-depmap.xml
! 
! # Apply the following patch for plexus-utils 2
! Patch0:         %{name}-BundlePlugin.patch
! BuildRequires:  bnd1 >= 0:1.43
! BuildRequires:  plexus-utils >= 0:1.5.15
! BuildRequires:  apache-felix-osgi-core >= 0:1.4.0
! BuildRequires:  apache-felix-osgi-service-obr >= 0:1.0.2
! BuildRequires:  apache-felix-bundlerepository >= 0:1.6.4
! BuildRequires:  kxml2 >= 0:2.2.2
! BuildRequires:  maven-shared-dependency-tree >= 1.1
! BuildRequires:  maven-wagon >= 1.0-0.2.b2
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-plugin >= 2.3
! BuildRequires:  maven-surefire-provider-junit4 >= 2.3
! BuildRequires:  maven-doxia-sitetools
! BuildRequires:  felix-parent
! # XXX: 1.0-alpha-7
! BuildRequires: plexus-archiver >= 0:1.0
! # XXX: 1.0-alpha-9-stable-1
! BuildRequires: plexus-containers-container-default >= 0:1.0
! Requires: bnd1 >= 0:1.43
! Requires: plexus-utils >= 0:1.5.15
! Requires: apache-felix-osgi-core >= 0:1.4.0
! Requires: apache-felix-osgi-service-obr >= 0:1.0.2
! Requires: apache-felix-bundlerepository >= 0:1.6.4
! Requires: kxml2 >= 0:2.2.2
! Requires: maven2
! Requires: maven-shared-archiver
! Requires: maven-shared-dependency-tree
! Requires: maven-shared-osgi
! Requires: maven-wagon
! # XXX: 1.0-alpha-7
! Requires: plexus-archiver >= 0:1.0
! # XXX: 1.0-alpha-9-stable-1
! Requires: plexus-containers-container-default >= 0:1.0
! Requires: felix-parent
! Obsoletes:      maven-plugin-bundle < %{epoch}:%{version}-%{release}
! Provides:       maven-plugin-bundle = %{epoch}:%{version}-%{release}
! 
! BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
! BuildArch: noarch
  
  %description
***************
*** 69,73 ****
  from the contents of the compilation classpath along with its
  resources and dependencies. Plus a zillion other features.
- The plugin uses the Bnd tool (http://www.aqute.biz/Code/Bnd).
  
  %package javadoc
--- 93,96 ----
***************
*** 77,81 ****
  
  %description javadoc
! Javadoc for %{name}.
  
  %if %with repolib
--- 100,104 ----
  
  %description javadoc
! API documentation for %{name}.
  
  %if %with repolib
***************
*** 91,120 ****
  
  %prep
! %setup -q
  %patch0 -p0 -b .sav0
- %patch1 -p0 -b .sav1
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
  export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  
  %install
! %{__rm} -rf %{buildroot}
  
  # jars
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p target/maven-bundle-plugin-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{namedversion}.jar
! %{__ln_s} %{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # poms
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.felix maven-bundle-plugin %{namedversion} JPP %{name}
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  %if %with repolib
--- 114,154 ----
  
  %prep
! %setup -q -n maven-bundle-plugin-%{version}
  %patch0 -p0 -b .sav0
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
  export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! %{_bindir}/mvn-jpp -e \
!      -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
!      -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} \
!      -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!      deploy javadoc:aggregate
! 
! #export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! #%{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
! #        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
! #         package javadoc:aggregate
  
  %install
! rm -rf %{buildroot}
  
  # jars
! install -d -m 0755 %{buildroot}%{_javadir}
! install -m 644 target/maven-bundle-plugin-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
! 
! %add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
  
  # poms
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
!     %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %if %with repolib
***************
*** 124,127 ****
--- 158,164 ----
  %endif
  
+ %clean
+ %{__rm} -rf %{buildroot}
+ 
  %post
  %update_maven_depmap
***************
*** 130,146 ****
  %update_maven_depmap
  
- %clean
- %{__rm} -rf %{buildroot}
- 
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-%{namedversion}.jar
! %{_javadir}*/%{name}.jar
  %{_datadir}/maven2/poms/JPP-%{name}.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
  %{_javadocdir}/%{name}
  
--- 167,180 ----
  %update_maven_depmap
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/%{name}.jar
! %{_javadir}/%{name}-%{version}.jar
  %{_datadir}/maven2/poms/JPP-%{name}.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
***************
*** 154,157 ****
--- 188,194 ----
  
  %changelog
+ * Mon Oct 17 2011 Ralph Apel <r.apel at r-apel.de> 0:2.3.5-1
+ - 2.3.5 
+ 
  * Thu Sep 15 2011 David Walluck <dwalluck at redhat.com> 0:2.0.0-2
  - use (poorly named) maven-shared-archiver, not maven-archiver
***************
*** 159,160 ****
--- 196,198 ----
  * Thu Sep 15 2011 David Walluck <dwalluck at redhat.com> 0:2.0.0-1
  - release
+ 

--- maven-bundle-plugin-remove-headers.patch DELETED ---

--- NEW FILE: maven-bundle-plugin-BundlePlugin.patch ---
--- src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java.sav0	2011-07-01 18:39:43.000000000 +0200
+++ src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java	2011-10-17 20:49:49.000000000 +0200
@@ -452,7 +452,7 @@
             {
                 getLog().info( "Writing BND instructions to " + dumpInstructions );
                 dumpInstructions.getParentFile().mkdirs();
-                FileUtils.fileWrite( dumpInstructions, "# BND instructions" + NL + buf );
+                FileUtils.fileWrite( dumpInstructions.getPath(), "# BND instructions" + NL + buf );
             }
         }
 
@@ -464,7 +464,7 @@
             {
                 getLog().info( "Writing BND classpath to " + dumpClasspath );
                 dumpClasspath.getParentFile().mkdirs();
-                FileUtils.fileWrite( dumpClasspath, "# BND classpath" + NL + buf );
+                FileUtils.fileWrite( dumpClasspath.getPath(), "# BND classpath" + NL + buf );
             }
         }
     }
@@ -699,7 +699,7 @@
                         options.put( "resolution:", "optional" );
                     }
                 }
-                String result = Processor.printClauses( values, "resolution:" );
+                String result = Processor.printClauses( values );
                 bundleManifest.getMainAttributes().putValue( "Import-Package", result );
             }
 

--- maven-bundle-plugin-manifest-plugin.patch DELETED ---




More information about the JPackage-commits mailing list