[Jpackage-commits] dist/plexus-maven-plugin/JPP-6 Makefile, NONE, 1.1 plexus-maven-plugin-add-jdom-dep.patch, NONE, 1.1 plexus-maven-plugin-jpp-depmap.xml, NONE, 1.1 plexus-maven-plugin-maven-doxia.patch, NONE, 1.1 plexus-maven-plugin.spec, NONE, 1.1 sources, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Fri Dec 3 23:35:36 CET 2010


Update of /home/projects/jpackage/cvs/dist/plexus-maven-plugin/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv25208/JPP-6

Added Files:
	Makefile plexus-maven-plugin-add-jdom-dep.patch 
	plexus-maven-plugin-jpp-depmap.xml 
	plexus-maven-plugin-maven-doxia.patch plexus-maven-plugin.spec 
	sources 
Log Message:
Import plexus-maven-plugin into JPP-6

--- NEW FILE: plexus-maven-plugin-add-jdom-dep.patch ---
diff -up ./pom.xml.sav ./pom.xml
--- ./pom.xml.sav	2007-03-17 19:28:24.000000000 -0400
+++ ./pom.xml	2008-12-01 15:34:11.000000000 -0500
@@ -47,6 +47,11 @@
       <artifactId>plexus-cdc</artifactId>
       <version>1.0-alpha-10</version>
     </dependency>
+    <dependency>
+      <groupId>JPP</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.0</version>
+    </dependency>
   </dependencies>
   <scm> 
     <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5</connection>

--- NEW FILE: plexus-maven-plugin.spec ---
# Copyright (c) 2000-2005, 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.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define parent plexus
%define subname maven-plugin

%define maven_settings_file %{_builddir}/%{name}/settings.xml

Name:           %{parent}-%{subname}
Version:        1.3.5
Release:        7%{?dist}
Epoch:          0
Summary:        Plexus Maven plugin
License:        Apache Software License
Group:          Development/Java
URL:            http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5
# tar czf plexus-maven-plugin-src.tar.gz plexus-maven-plugin-1.3.5
Source0:        %{name}-src.tar.gz
Source1:        %{name}-jpp-depmap.xml

Patch0:         %{name}-maven-doxia.patch
Patch1:         %{name}-add-jdom-dep.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if ! %{gcj_support}
BuildArch: noarch
%endif

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  maven2 >= 2.0.8
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-maven-plugin
BuildRequires:  maven-surefire-provider-junit
BuildRequires:  maven-doxia
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven2-common-poms >= 1.0
BuildRequires:	maven2-plugin-release
BuildRequires:  plexus-appserver >= 1.0-0.a5.3
BuildRequires:  plexus-cdc >= 1.0-0.3.a10
BuildRequires:  plexus-containers
BuildRequires:  plexus-containers-container-default
BuildRequires:  plexus-runtime-builder >= 1.0-0.a9.2
BuildRequires:  qdox161

Requires:       maven2 >= 2.0.8
Requires:       maven2-common-poms >= 1.0
Requires:       plexus-appserver >= 1.0-0.a5.3
Requires:       plexus-cdc >= 1.0
Requires:       plexus-containers-container-default
Requires:       plexus-runtime-builder >= 1.0-0.a9.2

Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5

%if %{gcj_support}
BuildRequires:          java-gcj-compat-devel
Requires(post):         java-gcj-compat
Requires(postun):       java-gcj-compat
%endif

%description
Plexus Maven Plugin helps create plexus component descriptions
from within Maven.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q
%patch0 -b .sav
%patch1 -b .sav

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
        -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        install javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} 1.2 JPP/%{parent} %{subname}
(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# 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
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

cp -pr target/site/apidocs/* \
        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/

ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%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(-,root,root,-)
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}

%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin-%{version}.jar.*
%endif

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Fri Dec 03 2010 Ralph Apel <r.apel at r-apel.de> 0:1.3.5-7
- fix to plexus-cdc, plexus-maven-plugin sequence

* Wed Apr 29 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-6
- add BRs maven-doxia*, qdox
- rebuild with maven2-2.0.8 built in non-bootstrap mode

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-5
- revert to 1.3.5 for building maven2-2.0.8

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-4
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-3
- rebuild with bootstrap JPP5 mode

* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-2jpp.1
- Import from dbhole's maven 2.0.8 packages, initial building

* Mon Feb 25 2008 Deepak Bhole <dbhole at redhat.com> 0:1.3.5-1jpp.1
- From <r.apel at r-apel.de>:
- Update to 1.3.5

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.2-3jpp.2
- Autorebuild for GCC 4.3

* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2-2jpp.2
- ExcludeArch ppc64

* Fri Feb 23 2007 Tania Bento <tbento at redhat.com> 0:1.2-2jpp.1
- Fixed %%Release.
- Fixed %%BuildRoot.
- Removed %%Vendor.
- Removed %%Distribution.
- Removed %%post and %%postun sections for javadoc.
- Fixed %%License to correct license.
- Edited instructions on how to generate source drop.
- Edited %%description.
- Added gcj support option.

* Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.2-2jpp
- Update for maven2 9jpp.

* Mon Jun 12 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2-1jpp
- Initial build

--- NEW FILE: Makefile ---
# Makefile for source rpm: plexus-maven-plugin
# $Id: Makefile,v 1.1 2010/12/03 22:35:34 jpackage Exp $
NAME := plexus-maven-plugin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)

--- NEW FILE: plexus-maven-plugin-jpp-depmap.xml ---
<dependencies>
  <dependency>
	<maven>
	  <groupId>org.apache.maven</groupId>
	  <artifactId>maven-plugin-api</artifactId>
	  <version>2.0</version>
	</maven>
	<jpp>
	  <groupId>JPP/maven2</groupId>
	  <artifactId>plugin-api</artifactId>
	  <version>2.0</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-runtime-builder</artifactId>
	  <version>1.0-alpha-9</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>runtime-builder</artifactId>
	  <version>1.0-alpha-9</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-container-default</artifactId>
	  <version>1.0-alpha-9</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>container-default</artifactId>
	  <version>1.0-alpha-9</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-appserver</artifactId>
	  <version>1.0-alpha-5</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>appserver</artifactId>
	  <version>1.0-alpha-5</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-cdc</artifactId>
	  <version>1.0-alpha-4</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>cdc</artifactId>
	  <version>1.0-alpha-4</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus</artifactId>
	  <version>1.0.4</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>plexus</artifactId>
	  <version>1.0.4</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-tools</artifactId>
	  <version>1.0.5</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>tools</artifactId>
	  <version>1.0.5</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-maven-plugin</artifactId>
	  <version>1.2</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>maven-plugin</artifactId>
	  <version>1.2</version>
	</jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>xmlrpc</groupId>
      <artifactId>xmlrpc</artifactId>
      <version>1.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>xmlrpc</artifactId>
      <version>1.2</version>
     </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>org.codehaus.plexus</groupId>
      <artifactId>plexus-xmlrpc</artifactId>
      <version>1.0-beta-4</version>
    </maven>
    <jpp>
      <groupId>JPP/plexus</groupId>
      <artifactId>xmlrpc</artifactId>
      <version>1.0-beta-4</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>javax.servlet</groupId>
      <artifactId>servlet-api</artifactId>
      <version>2.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>servlet_2_4_api</artifactId>
      <version>2.4</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>com.thoughtworks.qdox</groupId>
      <artifactId>qdox</artifactId>
      <version>1.6.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>qdox161</artifactId>
      <version>1.6.1</version>
    </jpp>
  </dependency>

</dependencies>

--- NEW FILE: plexus-maven-plugin-maven-doxia.patch ---
--- src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java.sav0	2007-11-22 18:04:28.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java	2007-11-22 18:04:42.000000000 +0100
@@ -27,8 +27,8 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
 import org.codehaus.plexus.maven.plugin.report.ComponentSet;
 import org.jdom.Document;
 import org.jdom.JDOMException;
@@ -62,9 +62,9 @@
     private MavenProject project;
 
     /**
-     * @component org.codehaus.doxia.site.renderer.SiteRenderer
+     * @component org.apache.maven.doxia.siterenderer.Renderer
      */
-    private SiteRenderer siteRenderer;
+    private Renderer siteRenderer;
 
     /**
      * @parameter expression="${project.reporting.outputDirectory}
@@ -114,7 +114,7 @@
         return project;
     }
 
-    protected SiteRenderer getSiteRenderer()
+    protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }
--- src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java.sav1	2007-11-22 18:18:16.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java	2007-11-22 18:19:05.000000000 +0100
@@ -17,7 +17,7 @@
  */
 import java.util.List;
 
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.jdom.Element;
 
 /**
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav0	2007-11-22 18:21:17.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java	2007-11-22 18:21:49.000000000 +0100
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.jdom.Element;

 import java.util.ArrayList;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav0	2007-11-22 18:25:57.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java	2007-11-22 18:26:46.000000000 +0100
@@ -17,7 +17,7 @@
  */

 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;

 import java.util.Iterator;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav0	2007-11-22 18:29:44.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java	2007-11-22 18:30:22.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;

 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;

 /**
  * @author <a href="mailto:trygvis at inamo.no">Trygve Laugstøl</a>
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav0	2007-11-22 18:31:57.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java	2007-11-22 18:32:14.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;

 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;

 import java.util.Iterator;
 import java.util.List;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav0	2007-11-22 18:34:25.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java	2007-11-22 18:34:45.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;

 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;

 /**

--- NEW FILE: sources ---
f94f11fb20d6ee96ce1f25502b7ef501  plexus-maven-plugin-src.tar.gz




More information about the JPackage-commits mailing list