[Jpackage-commits] rpms/free/maven-scm maven-scm-1.1-jpp-depmap.xml, NONE, 1.1 maven-scm-1.1-settings.xml, NONE, 1.1 maven-scm-add-plexusutils-dep.xml, 1.2, NONE maven-scm-jpp-depmap.xml, 1.3, NONE maven-scm-mapdeps.xsl, 1.2, NONE maven-scm-provider-clearcase-pom.patch, NONE, 1.1 maven-scm-provider-clearcase-settings-mdo.patch, NONE, 1.1 maven-scm-provider-cvs-commons-mdo.patch, NONE, 1.1 maven-scm-provider-cvs-commons-pom.patch, NONE, 1.1 maven-scm-provider-git-commons-mdo.patch, NONE, 1.1 maven-scm-provider-git-commons-pom.patch, NONE, 1.1 maven-scm-provider-local-mdo.patch, NONE, 1.1 maven-scm-provider-local-pom.patch, NONE, 1.1 maven-scm-provider-starteam-mdo.patch, NONE, 1.1 maven-scm-provider-starteam-pom.patch, NONE, 1.1 maven-scm-provider-svn-commons-mdo.patch, NONE, 1.1 maven-scm-provider-svn-commons-pom.patch, NONE, 1.1 maven-scm-provider-vss-mdo.patch, NONE, 1.1 maven-scm-provider-vss-pom.patch, NONE, 1.1 maven-scm.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Sun Dec 5 18:50:53 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven-scm
In directory ryu.zarb.org:/tmp/f7lTpR61rU/rpms/free/maven-scm

Modified Files:
	maven-scm.spec 
Added Files:
	maven-scm-1.1-jpp-depmap.xml maven-scm-1.1-settings.xml 
	maven-scm-provider-clearcase-pom.patch 
	maven-scm-provider-clearcase-settings-mdo.patch 
	maven-scm-provider-cvs-commons-mdo.patch 
	maven-scm-provider-cvs-commons-pom.patch 
	maven-scm-provider-git-commons-mdo.patch 
	maven-scm-provider-git-commons-pom.patch 
	maven-scm-provider-local-mdo.patch 
	maven-scm-provider-local-pom.patch 
	maven-scm-provider-starteam-mdo.patch 
	maven-scm-provider-starteam-pom.patch 
	maven-scm-provider-svn-commons-mdo.patch 
	maven-scm-provider-svn-commons-pom.patch 
	maven-scm-provider-vss-mdo.patch 
	maven-scm-provider-vss-pom.patch 
Removed Files:
	maven-scm-add-plexusutils-dep.xml maven-scm-jpp-depmap.xml 
	maven-scm-mapdeps.xsl 
Log Message:
1.1-1.jpp6

--- NEW FILE: maven-scm-provider-cvs-commons-pom.patch ---
--- maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml.sav	2010-12-02 00:29:06.000000000 +0100
+++ maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml	2010-12-02 00:29:32.000000000 +0100
@@ -57,7 +57,7 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/cvs-settings.mdo</model>
+          <models><model>src/main/mdo/cvs-settings.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>

--- NEW FILE: maven-scm-provider-git-commons-pom.patch ---
--- maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml.sav	2010-12-02 00:21:38.000000000 +0100
+++ maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml	2010-12-02 00:22:16.000000000 +0100
@@ -56,7 +56,7 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/git-settings.mdo</model>
+          <models><model>src/main/mdo/git-settings.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>

--- NEW FILE: maven-scm-provider-svn-commons-mdo.patch ---
--- maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo.sav	2010-12-02 09:49:36.000000000 +0100
+++ maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo	2010-12-02 09:50:27.000000000 +0100
@@ -1,4 +1,5 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMSVN/${version}">
   <id>svn</id>
   <name>Svn</name>
   <description>SVN Provider Model.</description>

Index: maven-scm.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-scm/maven-scm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** maven-scm.spec	25 May 2009 07:47:00 -0000	1.5
--- maven-scm.spec	5 Dec 2010 17:50:50 -0000	1.6
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,70 ****
  #
  
- %define _without_gcj_support 1
  %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 gcj_support 0
  
  %define maven_settings_file %{_builddir}/%{name}/settings.xml
! %define namedversion 1.0
  
  Name:           maven-scm
! Version:        1.0
! Release:        4%{?dist}
  Epoch:          0
! Summary:        Common API for doing SCM operations
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://maven.apache.org/scm
  
! # svn export http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.0/ maven-scm/
! # tar czf maven-scm-1.0.tar.gz maven-scm/
! Source0:        %{name}-%{namedversion}.tar.gz
! Source1:        %{name}-jpp-depmap.xml
! Source2:        %{name}-mapdeps.xsl
! Source3:        %{name}-add-plexusutils-dep.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %if ! %{gcj_support}
  BuildArch:      noarch
- %else
- ExcludeArch:    ppc64
  %endif
- 
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  jmock >= 0:1.2.0
! BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-assembly
--- 29,88 ----
  #
  
  %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 section     free
! 
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
! 
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define maven_settings_file %{_builddir}/%{name}/settings.xml
! %define namedversion 1.1
  
  Name:           maven-scm
! Version:        1.1
! Release:        1%{?dist}
  Epoch:          0
! Summary:        Maven SCM
! License:        Apache Software License
  Group:          Development/Java
  URL:            http://maven.apache.org/scm
+ Source0:        %{name}-%{version}.tar.gz
+ # svn export http://svn.apache.org/repos/asf/maven/scm/tags/maven-scm-1.1/
  
! Source1:        %{name}-%{version}-jpp-depmap.xml
! Source2:        %{name}-%{version}-settings.xml
! Source3:        %{name}-%{version}-autogenerated-files.tar.gz
  
! Patch0:         %{name}-provider-clearcase-pom.patch
! Patch1:         %{name}-provider-git-commons-pom.patch
! Patch2:         %{name}-provider-starteam-pom.patch
! Patch3:         %{name}-provider-vss-pom.patch
! Patch4:         %{name}-provider-svn-commons-pom.patch
! Patch5:         %{name}-provider-cvs-commons-pom.patch
! Patch6:         %{name}-provider-local-pom.patch
! Patch7:         %{name}-provider-clearcase-settings-mdo.patch
! Patch8:         %{name}-provider-cvs-commons-mdo.patch
! Patch9:         %{name}-provider-git-commons-mdo.patch
! Patch10:        %{name}-provider-local-mdo.patch
! Patch11:        %{name}-provider-starteam-mdo.patch
! Patch12:        %{name}-provider-svn-commons-mdo.patch
! Patch13:        %{name}-provider-vss-mdo.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-junit
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  jmock >= 0:1.2.0
! %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-assembly
***************
*** 75,100 ****
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-project-info-reports
- BuildRequires:  maven2-plugin-remote-resources
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-common-poms >= 0:1.0-3
- BuildRequires:  maven2-plugin-surefire = 2.3
- BuildRequires:  maven-surefire-provider-junit = 2.3
  BuildRequires:  maven-release
  BuildRequires:  maven-wagon
! BuildRequires:  maven-doxia
! BuildRequires:  maven-doxia-sitetools
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a17
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
- BuildRequires:  qdox < 1.6.2
  BuildRequires:  maven2-stylus-skin
  BuildRequires:  ganymed-ssh2
  BuildRequires:  geronimo-jaf-1.0.2-api
  BuildRequires:  geronimo-jta-1.0.1B-api
  BuildRequires:  javacvs-lib >= 0:5.0
! BuildRequires:  modello >= 0:1.0-0.a15
! BuildRequires:  maven2-bootstrap >= 0:2.0.7
  BuildRequires:  maven-shared-plugin-testing-harness
- BuildRequires:  plexus-cdc < 0:1.0-0.3.a11
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils >= 0:1.4.8
--- 93,117 ----
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-project-info-reports
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
+ BuildRequires:  maven-surefire-junit
+ BuildRequires:  maven-surefire-plugin
  BuildRequires:  maven2-common-poms >= 0:1.0-3
  BuildRequires:  maven-release
  BuildRequires:  maven-wagon
! BuildRequires:  modello-maven-plugin >= 0:1.3
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
  BuildRequires:  maven2-stylus-skin
+ BuildRequires:  apache-commons-parent
+ BuildRequires:  apache-jar-resource-bundle
+ BuildRequires:  liberation-fonts
+ %endif
  BuildRequires:  ganymed-ssh2
  BuildRequires:  geronimo-jaf-1.0.2-api
  BuildRequires:  geronimo-jta-1.0.1B-api
  BuildRequires:  javacvs-lib >= 0:5.0
! BuildRequires:  modello >= 0:1.3
! BuildRequires:  maven2-bootstrap >= 0:2.0.8
  BuildRequires:  maven-shared-plugin-testing-harness
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils >= 0:1.4.8
***************
*** 102,126 ****
  BuildRequires:  saxpath
  
! Requires:  java >= 0:1.5.0
  Requires:  ganymed-ssh2
  Requires:  javacvs-lib >= 0:5.0
! Requires:  maven2-bootstrap >= 0:2.0.7
  Requires:  plexus-container-default
  Requires:  plexus-utils >= 0:1.4.8
  Requires:  regexp
- Requires:  saxpath
  
  %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  %description
! Maven SCM supports Maven 2.x plugins (e.g. maven-release-plugin) and other
! tools (e.g. Continum) in providing them a common API for doing SCM operations.
  
  %package test
--- 119,145 ----
  BuildRequires:  saxpath
  
! Requires:  java >= 0:1.6.0
  Requires:  ganymed-ssh2
  Requires:  javacvs-lib >= 0:5.0
! Requires:  maven2-bootstrap >= 0:2.0.8
  Requires:  plexus-container-default
  Requires:  plexus-utils >= 0:1.4.8
  Requires:  regexp
  
  %if %{gcj_support}
! BuildRequires:       java-gcj-compat-devel
! Requires(post):      java-gcj-compat
! Requires(postun):    java-gcj-compat
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description
! Maven SCM supports Maven 2.x plugins (e.g. maven-release-plugin)
! and other tools (e.g. Continuum) by providing them with a common
! API for doing SCM operations. You can look at the list of SCM's
! for more information on using Maven SCM with your favorite SCM
! tool.
  
  %package test
***************
*** 128,136 ****
  Group:          Development/Java
  Requires:       maven-scm = %{epoch}:%{version}-%{release}
  
  %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
  %endif
  
--- 147,156 ----
  Group:          Development/Java
  Requires:       maven-scm = %{epoch}:%{version}-%{release}
+ Requires:       junit >= 3.8.2
  
  %if %{gcj_support}
! BuildRequires:     java-gcj-compat-devel
! Requires(post):    java-gcj-compat
! Requires(postun):  java-gcj-compat
  %endif
  
***************
*** 141,176 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(pre):  /bin/rm,/bin/ls
- Requires(post): /bin/rm
  
  %description javadoc
! Javadoc for %{name}.
  
! %prep
! %setup -q -n %{name}
  
! #FIXME: Bazaar tests fail since the executable is no available. Disable
! #       the tests.
! rm -rf maven-scm-providers/maven-scm-provider-bazaar/src/test
  
  %build
  
! (cd maven-scm-api
! cp -p pom.xml pom.xml.noplexusutils.xml
! saxon -o pom.xml pom.xml.noplexusutils.xml %{SOURCE2} map=%{SOURCE3}
! )
  
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
  
! # We don't have svm synergy classes, so disable those tests for now
! rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
  
  mvn-jpp \
!         -e \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         -Dmaven.test.failure.ignore=true \
!         install javadoc:javadoc
  
  %install
--- 161,454 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
! %{summary}.
  
! %if %{with_maven}
! %package manual
! Summary:        Documents for %{name}
! Group:          Development/Documentation
  
! %description manual
! %{summary}.
! %endif
! 
! %prep
! %setup -q 
! cp %{SOURCE2} settings.xml
! %if %{without_maven}
! gzip -dc %{SOURCE3} | tar xf -
! %endif
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! %patch3 -b .sav3
! %patch4 -b .sav4
! %patch5 -b .sav5
! %patch6 -b .sav6
! %patch7 -b .sav7
! %patch8 -b .sav8
! %patch9 -b .sav9
! %patch10 -b .sav10
! %patch11 -b .sav11
! %patch12 -b .sav12
! %patch13 -b .sav13
  
  %build
+ %if %{with_maven}
+ sed -i -e "s|<url>__INTERNAL_REPO_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
+ sed -i -e "s|<url>__EXTERNAL_REPO_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
  
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
! mkdir -p $MAVEN_REPO_LOCAL/JPP/maven-scm
  
! # in oder to build it with maven, whithout having it installed already
! cp $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/JPP/maven-scm/test.jar
! cp $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/JPP/maven-scm/provider-svntest.jar
! cp $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/JPP/maven-scm/provider-cvstest.jar
  
! mkdir external_repo
! ln -s %{_javadir} external_repo/JPP
  
+ #mkdir -p m2_repo/repository/org.apache/
+ #cp %{SOURCE4} m2_repo/repository/org.apache/apache-jar-resource-bundle.jar
+ 
+ export MAVEN_OPTS="-Xmx256m"
  mvn-jpp \
!     -e \
!     -s $(pwd)/settings.xml \
!     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!     -Dmaven.test.failure.ignore=true \
!     -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!     ant:ant install
! 
! mvn-jpp \
!     -e \
!     -s $(pwd)/settings.xml \
!     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!     -Daggregate=true \
!     -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!     javadoc:javadoc site
! 
! %else
! export CLASSPATH=$(build-classpath \
! modello/core \
! modello/plugin-xml \
! modello/plugin-xpp3 \
! modello/plugin-xsd \
! plexus/classworlds \
! plexus/containers-component-api \
! plexus/containers-container-default \
! plexus/utils \
! )
! 
! 
! pushd maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/git-settings.mdo xpp3-reader src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/git-settings.mdo xsd src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/git-settings.mdo java src/main/java 1.0.0 false
! popd
! pushd maven-scm-providers/maven-scm-provider-vss
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/vss-settings.mdo xpp3-reader src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/vss-settings.mdo xsd src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/vss-settings.mdo java src/main/java 1.0.0 false
! popd
! pushd maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/svn-settings.mdo xpp3-reader src/main/java 1.1.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/svn-settings.mdo xsd src/main/java 1.1.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/svn-settings.mdo java src/main/java 1.1.0 false
! popd
! pushd maven-scm-providers/maven-scm-provider-clearcase
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/clearcase-settings.mdo xpp3-reader src/main/java 1.1.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/clearcase-settings.mdo xsd src/main/java 1.1.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/clearcase-settings.mdo java src/main/java 1.1.0 false
! popd
! pushd maven-scm-providers/maven-scm-provider-starteam
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/starteam-settings.mdo xpp3-reader src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/starteam-settings.mdo xsd src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/starteam-settings.mdo java src/main/java 1.0.0 false
! popd
! pushd maven-scm-providers/maven-scm-provider-local
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/maven-scm-local-metadata.mdo xpp3-reader src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/maven-scm-local-metadata.mdo xpp3-writer src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/maven-scm-local-metadata.mdo xsd src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/maven-scm-local-metadata.mdo java src/main/java 1.0.0 false
! popd
! pushd maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/cvs-settings.mdo xpp3-reader src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/cvs-settings.mdo xsd src/main/java 1.0.0 false
! $JAVA_HOME/bin/java org.codehaus.modello.ModelloCli src/main/mdo/cvs-settings.mdo java src/main/java 1.0.0 false
! popd
! 
! 
! #   Maven SCM
! #   Maven SCM API
! export CLASSPATH=$(build-classpath \
! ant/ant-junit \
! classworlds \
! ganymed-ssh2 \
! javacvs/cvslib \
! junit \
! plexus/container-default \
! plexus/utils \
! regexp \
! )
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes
! pushd maven-scm-api
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-api/target/maven-scm-api-%{version}.jar
! #   Maven SCM Managers
! #   Maven SCM Manager for Plexus
! pushd maven-scm-managers/maven-scm-manager-plexus
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-managers/maven-scm-manager-plexus/target/maven-scm-manager-plexus-%{version}.jar
! #   Maven SCM Test
! pushd maven-scm-test
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-test/target/maven-scm-test-%{version}.jar
! #   Maven SCM Providers
! #   Maven SCM AccuRev Provider
! pushd maven-scm-providers/maven-scm-provider-accurev
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-accurev/target/maven-scm-provider-accurev-%{version}.jar
! #   Maven SCM Git Provider - Parent
! #   Maven SCM Git Provider - Common library
! pushd maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/target/maven-scm-provider-git-commons-%{version}.jar
! #   Maven SCM git Provider TCK Tests
! pushd maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/target/maven-scm-provider-gittest-%{version}.jar
! #   Maven SCM Git Provider - Git Executable Impl.
! pushd maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/target/maven-scm-provider-gitexe-%{version}.jar
! #   Maven SCM Visual Source Safe Provider
! pushd maven-scm-providers/maven-scm-provider-vss
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-vss/target/maven-scm-provider-vss-%{version}.jar
! #   Maven SCM Perforce Provider
! pushd maven-scm-providers/maven-scm-provider-perforce
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-perforce/target/maven-scm-provider-perforce-%{version}.jar
! #   Maven SCM Subversion Provider - Parent
! #   Maven SCM Subversion Provider - Common library
! pushd maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/target/maven-scm-provider-svn-commons-%{version}.jar
! #   Maven SCM Subversion Provider TCK Tests
! pushd maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/target/maven-scm-provider-svntest-%{version}.jar
! #   Maven SCM Subversion Provider - SVN Executable Impl.
! pushd maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/target/maven-scm-provider-svnexe-%{version}.jar
! #   Maven SCM Clearcase Provider
! pushd maven-scm-providers/maven-scm-provider-clearcase
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-clearcase/target/maven-scm-provider-clearcase-%{version}.jar
! #   Maven SCM Starteam Provider
! pushd maven-scm-providers/maven-scm-provider-starteam
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-starteam/target/maven-scm-provider-starteam-%{version}.jar
! #   Maven SCM CVS Provider - Parent
! #   Maven SCM CVS Provider TCK tests
! pushd maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/target/maven-scm-provider-cvstest-%{version}.jar
! #   Maven SCM CVS Provider - Common library
! pushd maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/target/maven-scm-provider-cvs-commons-%{version}.jar
! #   Maven SCM CVS Provider - CVS Java Impl.
! pushd maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/target/maven-scm-provider-cvsjava-%{version}.jar
! #   Maven SCM Synergy Provider
! pushd maven-scm-providers/maven-scm-provider-synergy
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-synergy/target/maven-scm-provider-synergy-%{version}.jar
! #   Maven SCM Bazaar Provider
! pushd maven-scm-providers/maven-scm-provider-bazaar
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-bazaar/target/maven-scm-provider-bazaar-%{version}.jar
! #   Maven SCM Local Provider
! pushd maven-scm-providers/maven-scm-provider-local
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-local/target/maven-scm-provider-local-%{version}.jar
! #   Maven SCM CVS Provider - CVS Executable Impl.
! pushd maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/target/maven-scm-provider-cvsexe-%{version}.jar
! #   Maven SCM Mercurial (Hg) Provider
! pushd maven-scm-providers/maven-scm-provider-hg
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-providers/maven-scm-provider-hg/target/maven-scm-provider-hg-%{version}.jar
! #   Maven SCM Client
! pushd maven-scm-client
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/maven-scm-client/target/maven-scm-client-%{version}.jar
! #   Maven SCM Plugin
! CLASSPATH=$CLASSPATH:$(build-classpath \
! commons-cli \
! jdom \
! jsch \
! jtidy \
! maven2/artifact \
! maven2/artifact-manager \
! maven2/core \
! maven2/error-diagnostics \
! maven2/model \
! maven2/monitor \
! maven2/plugin-api \
! maven2/plugin-descriptor \
! maven2/plugin-parameter-documenter \
! maven2/plugin-registry \
! maven2/profile \
! maven2/project \
! maven2/reporting-api \
! maven2/repository-metadata \
! maven2/settings \
! maven-shared/plugin-testing-harness \
! )
! 
! 
! pushd maven-scm-plugin
! mkdir -p target/classes/META-INF/maven/org.apache.maven.plugins/maven-scm-plugin/
! cp pom.xml target/classes/META-INF/maven/org.apache.maven.plugins/maven-scm-plugin/
! cat > target/classes/META-INF/maven/org.apache.maven.plugins/maven-scm-plugin/pom.properties <<EOT
! version=%{version}
! groupId=org.apache.maven.plugins
! artifactId=maven-scm-plugin
! EOT
! ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! 
! %endif
  
  %install
***************
*** 178,223 ****
  # jars/poms
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
  
  # remove test files, they are used for build time testing
! #find  -type f -name "*cvstest*" -exec rm -f '{}' \; \
! #-o -type f -name "*svntest*" -exec rm -f '{}' \;
  
! for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`; do
!         newname=`basename $jar | sed -e s:^maven-scm-::g`
!         install -pm 644 $jar \
!           $RPM_BUILD_ROOT%{_javadir}/%{name}/$newname
  done
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
!   do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
  #poms (exclude the svn/cvstest poms. They are unnecessary)
! # ignore
  #  1) poms in target/ (they are either copies, or temps)
  #  2) poms in src/test/ (they are poms needed for tests only)
! for i in `find . -name pom.xml | grep -v \\\./pom.xml | \
!    grep -v target | grep -v src/test`; do
!         artifactname=`basename \`dirname $i\``
!         jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
!         cp -p $i $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.$artifactname.pom
!         %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
  done
! cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
  %add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! 
  for docsdir in `find -name apidocs`; do
!         subdir=`echo $docsdir | \
!           awk -F / '{print $(NF-3)}' | sed -e s:^maven-scm-::g`
!         install -dm 755 \
!           $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$subdir
!         cp -pr $docsdir/* \
!           $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$subdir
  done
  
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %{gcj_support}
--- 456,512 ----
  # jars/poms
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
  
  # remove test files, they are used for build time testing
! #find  -type f -name "*cvstest*" -exec rm -f '{}' \; -o -type f -name "*svntest*" -exec rm -f '{}' \;
  
! for jar in `find . -type f -name "*.jar" | grep -v plugin | grep -E "target/.*.jar$"`; do
!     newname=`basename $jar | sed -e s:^maven-scm-::g`
!     install -pm 644 $jar \
!         $RPM_BUILD_ROOT%{_javadir}/%{name}/$newname
  done
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
! 
! install -m 644 maven-scm-plugin/target/maven-scm-plugin-%{version}.jar \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/scm-plugin-%{version}.jar
! %add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{version} JPP/maven2/plugins scm-plugin
! install -m 644 maven-scm-plugin/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-scm-plugin.pom
  
  #poms (exclude the svn/cvstest poms. They are unnecessary)
! # ignore 
  #  1) poms in target/ (they are either copies, or temps)
  #  2) poms in src/test/ (they are poms needed for tests only)
! for i in `find . -name pom.xml | grep -v \\\./pom.xml | grep -v plugin | grep -v target | grep -v src/test`; do
!     artifactname=`basename \`dirname $i\``
!     jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
!     cp $i $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.$artifactname.pom
!     %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
  done
! cp pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
  %add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %if %{with_maven}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
! %else
  for docsdir in `find -name apidocs`; do
!     subdir=`echo $docsdir | awk -F / '{print $(NF-3)}' | sed -e s:^maven-scm-::g`
!     install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$subdir
!     cp -pr $docsdir/* \
!         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$subdir
  done
+ %endif
+ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
! %if %{with_maven}
! # manual
! rm -rf target/site/apidocs
! install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! cp -pr target/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
! %endif
  
  %if %{gcj_support}
***************
*** 229,232 ****
--- 518,522 ----
  
  %post
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 235,241 ****
  fi
  %endif
- %update_maven_depmap
  
  %postun
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 525,531 ----
  fi
  %endif
  
  %postun
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 244,248 ****
  fi
  %endif
- %update_maven_depmap
  
  %if %{gcj_support}
--- 534,537 ----
***************
*** 264,289 ****
  %files
  %defattr(-,root,root,-)
- %dir %{_javadir}
  %dir %{_javadir}/%{name}
! %{_datadir}/maven2
  %{_javadir}/%{name}/api*
  %{_javadir}/%{name}/client*
  %{_javadir}/%{name}/manager-plexus*
! %{_javadir}/%{name}/plugin*
  %{_javadir}/%{name}/provider-bazaar*
  %{_javadir}/%{name}/provider-clearcase*
  %{_javadir}/%{name}/provider-local*
- %{_javadir}/%{name}/provider-hg*
  %{_javadir}/%{name}/provider-perforce*
  %{_javadir}/%{name}/provider-cvs-commons*
  %{_javadir}/%{name}/provider-cvsexe*
- %{_javadir}/%{name}/provider-cvsjava*
  %{_javadir}/%{name}/provider-svn-commons*
  %{_javadir}/%{name}/provider-svnexe*
  %{_javadir}/%{name}/provider-starteam*
- %{_javadir}/%{name}/provider-synergy*
  %{_javadir}/%{name}/provider-vss*
! %{_mavendepmapfragdir}
! %doc LICENSE.txt NOTICE.txt
  
  %if %{gcj_support}
--- 553,580 ----
  %files
  %defattr(-,root,root,-)
  %dir %{_javadir}/%{name}
! %{_datadir}/maven2/poms/*
! %{_datadir}/maven2/plugins/*
  %{_javadir}/%{name}/api*
  %{_javadir}/%{name}/client*
  %{_javadir}/%{name}/manager-plexus*
! %{_javadir}/%{name}/provider-accurev*
  %{_javadir}/%{name}/provider-bazaar*
  %{_javadir}/%{name}/provider-clearcase*
+ %{_javadir}/%{name}/provider-git-commons*
+ %{_javadir}/%{name}/provider-gitexe*
+ %{_javadir}/%{name}/provider-gittest*
  %{_javadir}/%{name}/provider-local*
  %{_javadir}/%{name}/provider-perforce*
  %{_javadir}/%{name}/provider-cvs-commons*
  %{_javadir}/%{name}/provider-cvsexe*
  %{_javadir}/%{name}/provider-svn-commons*
  %{_javadir}/%{name}/provider-svnexe*
  %{_javadir}/%{name}/provider-starteam*
  %{_javadir}/%{name}/provider-vss*
! %{_javadir}/%{name}/provider-cvsjava*
! %{_javadir}/%{name}/provider-hg*
! %{_javadir}/%{name}/provider-synergy*
! %{_mavendepmapfragdir}/*
  
  %if %{gcj_support}
***************
*** 293,302 ****
  %attr(-,root,root) %{_libdir}/gcj/%{name}/manager-plexus-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-bazaar-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-clearcase-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvs-commons-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvsexe-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvsjava-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-hg-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-local-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-perforce-%{namedversion}.jar.*
--- 584,595 ----
  %attr(-,root,root) %{_libdir}/gcj/%{name}/manager-plexus-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-%{namedversion}.jar.*
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-accurev-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-bazaar-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-clearcase-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvs-commons-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvsexe-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-git-commons-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-gitexe-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-gittest-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-local-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-perforce-%{namedversion}.jar.*
***************
*** 304,309 ****
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svn-commons-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svnexe-%{namedversion}.jar.*
- %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-synergy-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-vss-%{namedversion}.jar.*
  %endif
  
--- 597,604 ----
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svn-commons-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svnexe-%{namedversion}.jar.*
  %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-vss-%{namedversion}.jar.*
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvsjava-%{namedversion}.jar.*
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-hg-%{namedversion}.jar.*
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-synergy-%{namedversion}.jar.*
  %endif
  
***************
*** 316,329 ****
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvstest-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/test-%{namedversion}.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svntest-%{namedversion}.jar.*
  %endif
  
  %files javadoc
  %defattr(-,root,root,-)
! %{_javadocdir}/*
  
  %changelog
  * Mon May 25 2009 Yong Yang <yyang at redhat.com> 0:1.0-4
  - Force BuildRequires:  plexus-cdc < 0:1.0-0.3.a11, may fix "Component descriptor cannot be found in the component repository: org.apache.maven.scm.manager.ScmManager." 
--- 611,634 ----
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvstest-1.0-beta-3.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/test-1.0-beta-3.jar.*
! %attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svntest-1.0-beta-3.jar.*
  %endif
  
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
! 
! %if %{with_maven}
! %files manual
! %defattr(-,root,root,-)
! %doc %{_docdir}/%{name}-%{version}
! %endif
  
  %changelog
+ * Thu Dec 02 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.1-2
+ - 1.1 again, adapt to JPP6
+ 
  * Mon May 25 2009 Yong Yang <yyang at redhat.com> 0:1.0-4
  - Force BuildRequires:  plexus-cdc < 0:1.0-0.3.a11, may fix "Component descriptor cannot be found in the component repository: org.apache.maven.scm.manager.ScmManager." 
***************
*** 333,339 ****
  - Merge from RHEL-4-EP5 1.0-1, enable jpp-depmap
  
  * Thu Jan 15 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1.jpp5
  - 1.1
- - FIXME: missing source maven-scm-1.1-autogenerated-files.tar.gz, added by yyang 2009/04/27
  
  * Fri Jan 25 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-2jpp
--- 638,644 ----
  - Merge from RHEL-4-EP5 1.0-1, enable jpp-depmap
  
+ 
  * Thu Jan 15 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1.jpp5
  - 1.1
  
  * Fri Jan 25 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-2jpp

--- NEW FILE: maven-scm-provider-vss-pom.patch ---
--- maven-scm-providers/maven-scm-provider-vss/pom.xml.sav	2010-12-02 00:25:32.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-vss/pom.xml	2010-12-02 00:25:55.000000000 +0100
@@ -60,7 +60,7 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/vss-settings.mdo</model>
+          <models><model>src/main/mdo/vss-settings.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>

--- NEW FILE: maven-scm-provider-cvs-commons-mdo.patch ---
--- ./maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo.sav	2010-12-02 08:35:16.000000000 +0100
+++ ./maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo	2010-12-02 08:36:07.000000000 +0100
@@ -1,4 +1,5 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMCVS/${version}">
   <id>cvs</id>
   <name>Cvs</name>
   <description>CVS Provider Model.</description>

--- NEW FILE: maven-scm-1.1-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__INTERNAL_REPO_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__EXTERNAL_REPO_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__INTERNAL_REPO_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__EXTERNAL_REPO_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: maven-scm-provider-clearcase-settings-mdo.patch ---
--- maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo.sav	2010-12-02 00:53:10.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo	2010-12-02 00:54:05.000000000 +0100
@@ -1,4 +1,6 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMCLEARCASE/${version}">
+
   <id>clearcase</id>
   <name>Clearcase</name>
   <description>Clearcase Provider Model.</description>

--- NEW FILE: maven-scm-1.1-jpp-depmap.xml ---
<dependencies>

  <dependency>
	<maven>
	  <groupId>org.apache.maven.plugin-testing</groupId>
	  <artifactId>maven-plugin-testing-harness</artifactId>
	  <version>1.2</version>
	</maven>
	<jpp>
	  <groupId>JPP/maven-shared</groupId>
	  <artifactId>plugin-testing-harness</artifactId>
	  <version>1.2</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.apache.maven.skins</groupId>
	  <artifactId>maven-stylus-skin</artifactId>
	  <version>1.0.1</version>
	</maven>
	<jpp>
	  <groupId>JPP/maven2</groupId>
	  <artifactId>stylus-skin</artifactId>
	  <version>1.1</version>
	</jpp>
  </dependency>

</dependencies>

--- NEW FILE: maven-scm-provider-git-commons-mdo.patch ---
--- maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo.sav	2010-12-02 08:47:49.000000000 +0100
+++ maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo	2010-12-02 08:48:31.000000000 +0100
@@ -1,4 +1,6 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMGIT/${version}">
+
   <id>git</id>
   <name>Git</name>
   <description>git Provider Model.</description>

--- maven-scm-mapdeps.xsl DELETED ---

--- NEW FILE: maven-scm-provider-clearcase-pom.patch ---
--- maven-scm-providers/maven-scm-provider-clearcase/pom.xml.sav	2010-12-02 00:18:30.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-clearcase/pom.xml	2010-12-02 00:19:07.000000000 +0100
@@ -60,7 +60,7 @@
         </executions>
         <configuration>
           <version>1.1.0</version>
-          <model>src/main/mdo/clearcase-settings.mdo</model>
+          <models><model>src/main/mdo/clearcase-settings.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>

--- NEW FILE: maven-scm-provider-svn-commons-pom.patch ---
--- maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml.sav	2010-12-02 00:27:19.000000000 +0100
+++ maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml	2010-12-02 00:27:44.000000000 +0100
@@ -49,7 +49,7 @@
         </executions>
         <configuration>
           <version>1.1.0</version>
-          <model>src/main/mdo/svn-settings.mdo</model>
+          <models><model>src/main/mdo/svn-settings.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>

--- NEW FILE: maven-scm-provider-vss-mdo.patch ---
--- maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo.sav	2010-12-02 10:02:42.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo	2010-12-02 10:03:26.000000000 +0100
@@ -1,4 +1,6 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMVSS/${version}">
+
   <id>vss</id>
   <name>Vss</name>
   <description>VSS Provider Model.</description>

--- NEW FILE: maven-scm-provider-starteam-mdo.patch ---
--- maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo.sav	2010-12-02 09:41:59.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo	2010-12-02 09:42:45.000000000 +0100
@@ -1,4 +1,5 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMSTARTEAM/${version}">
   <id>starteam</id>
   <name>Starteam</name>
   <description>Starteam Provider Model.</description>

--- maven-scm-jpp-depmap.xml DELETED ---

--- NEW FILE: maven-scm-provider-local-mdo.patch ---
--- maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo.sav	2010-12-02 09:16:21.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo	2010-12-02 09:17:09.000000000 +0100
@@ -1,4 +1,6 @@
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/SCMLOCAL/${version}">
+
   <id>maven-scm-local-metadata</id>
   <name>LocalScmMetadata</name>
   <description>Metadata for Maven SCM Local provider</description>

--- maven-scm-add-plexusutils-dep.xml DELETED ---

--- NEW FILE: maven-scm-provider-local-pom.patch ---
--- maven-scm-providers/maven-scm-provider-local/pom.xml.sav	2010-12-02 00:30:48.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-local/pom.xml	2010-12-02 00:31:10.000000000 +0100
@@ -61,7 +61,7 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/maven-scm-local-metadata.mdo</model>
+          <models><model>src/main/mdo/maven-scm-local-metadata.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>

--- NEW FILE: maven-scm-provider-starteam-pom.patch ---
--- maven-scm-providers/maven-scm-provider-starteam/pom.xml.sav	2010-12-02 00:23:42.000000000 +0100
+++ maven-scm-providers/maven-scm-provider-starteam/pom.xml	2010-12-02 00:24:10.000000000 +0100
@@ -60,7 +60,7 @@
         </executions>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/starteam-settings.mdo</model>
+          <models><model>src/main/mdo/starteam-settings.mdo</model></models>
         </configuration>
       </plugin>
     </plugins>




More information about the JPackage-commits mailing list