[Jpackage-commits] dist/gmaven/devel .cvsignore, 1.2, 1.3 gmaven-compile.patch, NONE, 1.1 gmaven-gmaven-plugin-pom.patch, NONE, 1.1 gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch, NONE, 1.1 gmaven-gmaven-runtime-pom.patch, NONE, 1.1 gmaven-gossip.patch, NONE, 1.1 gmaven-javadoc.patch, NONE, 1.1 gmaven-jpp-depmap.xml, 1.1, 1.2 gmaven-no-gshell-io.patch, NONE, 1.1 gmaven-no-shitty.patch, NONE, 1.1 gmaven-pom.patch, 1.1, 1.2 gmaven-poms.patch, NONE, 1.1 gmaven-settings.xml, 1.1, 1.2 gmaven.spec, 1.1, 1.2 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Thu Dec 23 02:07:32 CET 2010


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

Modified Files:
	.cvsignore gmaven-jpp-depmap.xml gmaven-pom.patch 
	gmaven-settings.xml gmaven.spec sources 
Added Files:
	gmaven-compile.patch gmaven-gmaven-plugin-pom.patch 
	gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch 
	gmaven-gmaven-runtime-pom.patch gmaven-gossip.patch 
	gmaven-javadoc.patch gmaven-no-gshell-io.patch 
	gmaven-no-shitty.patch gmaven-poms.patch 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	1 Oct 2008 18:22:22 -0000	1.2
--- .cvsignore	23 Dec 2010 01:07:30 -0000	1.3
***************
*** 1,2 ****
! apache-jar-resource-bundle-1.3.jar
! gmaven-1.0-rc-3.tar.gz
--- 1 ----
! gmaven-1.3.tar.bz2

Index: gmaven-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven-settings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** gmaven-settings.xml	1 Oct 2008 18:22:22 -0000	1.1
--- gmaven-settings.xml	23 Dec 2010 01:07:30 -0000	1.2
***************
*** 1,47 ****
  <settings>
! 	<profiles>
! 		<profile>
! 			<id>JPP</id>
! 			<repositories>
! 				<repository>
! 					<id>internal</id>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>external</id>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>local</id>
! 					<layout>jpp</layout>
! 					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
! 				</repository>
! 			</repositories>
! 			<pluginRepositories>
! 				<pluginRepository>
! 					<id>plugins-internal</id>
! 					<name>plugins-internal</name>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-external</id>
! 					<name>plugins-external</name>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-maven</id>
! 					<name>plugins-maven</name>
! 					<layout>jpp</layout>
! 					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
! 				</pluginRepository>
! 			</pluginRepositories>
! 		</profile>
! 	</profiles>
! 	<activeProfiles>
! 		<activeProfile>JPP</activeProfile>
! 	</activeProfiles>
  </settings>
--- 1,47 ----
  <settings>
!     <profiles>
!         <profile>
!             <id>JPP</id>
!             <repositories>
!                 <repository>
!                     <id>internal</id>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>external</id>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>local</id>
!                     <layout>jpp</layout>
!                     <url>__MAVENREPO_DIR_PLACEHOLDER__</url>
!                 </repository>
!             </repositories>
!             <pluginRepositories>
!                 <pluginRepository>
!                     <id>plugins-internal</id>
!                     <name>plugins-internal</name>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-external</id>
!                     <name>plugins-external</name>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-maven</id>
!                     <name>plugins-maven</name>
!                     <layout>jpp</layout>
!                     <url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
!                 </pluginRepository>
!             </pluginRepositories>
!         </profile>
!     </profiles>
!     <activeProfiles>
!         <activeProfile>JPP</activeProfile>
!     </activeProfiles>
  </settings>

--- NEW FILE: gmaven-javadoc.patch ---
--- pom.xml~	2010-12-22 19:30:34.000000000 -0500
+++ pom.xml	2010-12-22 19:34:39.945939864 -0500
@@ -601,7 +601,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.5</version>
                     <configuration>
-                        <source>1.4</source>
+                        <source>1.5</source>
                     </configuration>
                 </plugin>
                 

--- NEW FILE: gmaven-compile.patch ---
--- gmaven-runtime/gmaven-runtime-1.0/src/main/java/org/codehaus/groovy/maven/runtime/v1_0/ShellFeature.java.orig	2010-12-15 13:04:44.497052773 -0500
+++ gmaven-runtime/gmaven-runtime-1.0/src/main/java/org/codehaus/groovy/maven/runtime/v1_0/ShellFeature.java	2010-12-15 13:06:11.234184936 -0500
@@ -63,7 +63,7 @@
 
             try {
                 InteractiveShell shell = new InteractiveShell(classLoader, new Binding(), System.in, System.out, System.err);
-                shell.run(null);
+                shell.run();
             }
             finally {
                 System.setSecurityManager(sm);
@@ -75,4 +75,4 @@
             streams.out.println();
         }
     }
-}
\ No newline at end of file
+}

Index: gmaven.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** gmaven.spec	1 Oct 2008 18:22:22 -0000	1.1
--- gmaven.spec	23 Dec 2010 01:07:30 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,52 ****
  #
  
! %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
! %define named_version 1.0-rc-3
  
- Summary:        Groovy Maven Integration
  Name:           gmaven
! Version:        1.0
! Release:        0.rc3.1%{dist}
  Epoch:          0
  Group:          Development/Tools
  License:        ASL 2.0
  URL:            http://groovy.codehaus.org/GMaven
! Source0:        %{name}-%{named_version}.tar.gz
! # svn export https://svn.codehaus.org/groovy/gmaven/tags/gmaven-1.0-rc-3
! 
  Source1:        %{name}-jpp-depmap.xml
  Source2:        %{name}-settings.xml
- Source3:        apache-jar-resource-bundle-1.3.jar
- 
  Patch0:         gmaven-support-slf4j-gossip-pom.patch
  Patch1:         gmaven-feature-api-pom.patch
--- 29,63 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
! 
! %bcond_with shitty
! %bcond_with gcj_support
! %bcond_without repolib
! 
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
  %define section free
! %define namedversion 1.3
  
  Name:           gmaven
! Version:        1.3
! Release:        1%{dist}
  Epoch:          0
+ Summary:        Groovy Maven Integration
  Group:          Development/Tools
  License:        ASL 2.0
  URL:            http://groovy.codehaus.org/GMaven
! # svn export http://svn.codehaus.org/gmaven/tags/gmaven-1.3/ && tar cjf gmaven-1.3.tar.bz2 gmaven-1.3
! # Exported revision 
! Source0:        %{name}-%{namedversion}.tar.bz2
  Source1:        %{name}-jpp-depmap.xml
  Source2:        %{name}-settings.xml
  Patch0:         gmaven-support-slf4j-gossip-pom.patch
  Patch1:         gmaven-feature-api-pom.patch
***************
*** 54,60 ****
  Patch3:         gmaven-plugin-pom.patch
  Patch4:         gmaven-pom.patch
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.7
--- 65,96 ----
  Patch3:         gmaven-plugin-pom.patch
  Patch4:         gmaven-pom.patch
! Patch5:         gmaven-no-shitty.patch
! Patch6:         gmaven-gmaven-plugin-pom.patch
! Patch7:         gmaven-gmaven-runtime-pom.patch
! Patch8:         gmaven-compile.patch
! Patch9:         gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch
! Patch100:       gmaven-poms.patch
! Patch101:       gmaven-no-gshell-io.patch
! Patch102:       gmaven-javadoc.patch
! Patch103:       gmaven-gossip.patch
! Obsoletes:      mojo-maven2-groovy <= 0:16
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! Requires:       ant
! Requires:       java >= 0:1.5.0
! Requires:       jakarta-commons-lang
! Requires:       jline
! Requires:       jpackage-utils
! Requires:       junit
! Requires:       maven-shared-file-management
! Requires:       maven-shared-reporting-impl
! Requires:       plexus-container-default
! Requires:       plexus-digest
! Requires:       plexus-utils
! Requires:       qdox
! Requires:       slf4j
! BuildRequires:  apache-jar-resource-bundle >= 0:1.3
! BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  java-1.6.0-devel
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.7
***************
*** 63,66 ****
--- 99,103 ----
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-dependency
+ BuildRequires:  maven2-plugin-deploy
  BuildRequires:  maven2-plugin-enforcer
  BuildRequires:  maven2-plugin-install
***************
*** 71,83 ****
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven-archetype2
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  mojo-maven2-plugin-build-helper
  BuildRequires:  mojo-maven2-plugin-cobertura
  BuildRequires:  mojo-maven2-plugin-shitty
  BuildRequires:  plexus-maven-plugin
- 
  BuildRequires:  ant
! BuildRequires:  groovy
! BuildRequires:  groovy11
  BuildRequires:  jakarta-commons-lang
  BuildRequires:  jline
--- 108,125 ----
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven-archetype2
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  mojo-maven2-plugin-build-helper
  BuildRequires:  mojo-maven2-plugin-cobertura
+ %if %with shitty
  BuildRequires:  mojo-maven2-plugin-shitty
+ %endif
  BuildRequires:  plexus-maven-plugin
  BuildRequires:  ant
! BuildRequires:  gossip
! BuildRequires:  groovy10
! BuildRequires:  groovy15
! BuildRequires:  groovy16
! BuildRequires:  groovy17
  BuildRequires:  jakarta-commons-lang
  BuildRequires:  jline
***************
*** 90,118 ****
  BuildRequires:  qdox
  BuildRequires:  slf4j
- 
- 
- Requires:  java >= 0:1.5.0
- Requires:  ant
- Requires:  groovy
- Requires:  jakarta-commons-lang
- Requires:  jline
- Requires:  junit
- Requires:  maven-shared-file-management
- Requires:  maven-shared-reporting-impl
- Requires:  plexus-container-default
- Requires:  plexus-digest
- Requires:  plexus-utils
- Requires:  qdox
- Requires:  slf4j
- Provides:       mojo-maven2-groovy = 1:17
- Obsoletes:      mojo-maven2-groovy < 0:17
- 
- 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
  %if ! %{gcj_support}
--- 132,137 ----
  BuildRequires:  qdox
  BuildRequires:  slf4j
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
  %endif
  %if ! %{gcj_support}
***************
*** 132,140 ****
  * Advanced Configuration
  
! %package runtime-1.0
  Group:          Development/Tools
  Summary:        Groovy 1.0 Runtime for %{name}
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       groovy
  Provides:       mojo-maven2-groovy-runtime10 = 1:17
  Obsoletes:      mojo-maven2-groovy-runtime10 < 0:17
--- 151,161 ----
  * Advanced Configuration
  
! %package runtime
  Group:          Development/Tools
  Summary:        Groovy 1.0 Runtime for %{name}
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       groovy10
! Provides:       runtime-1.0 = %{epoch}:%{version}-%{release}
! Obsoletes:      runtime-1.0 < %{epoch}:%{version}-%{release}
  Provides:       mojo-maven2-groovy-runtime10 = 1:17
  Obsoletes:      mojo-maven2-groovy-runtime10 < 0:17
***************
*** 142,146 ****
  Obsoletes:      mojo-maven2-groovy-runtime11 < 0:17
  
! %description runtime-1.0
  %{summary}.
  
--- 163,167 ----
  Obsoletes:      mojo-maven2-groovy-runtime11 < 0:17
  
! %description runtime
  %{summary}.
  
***************
*** 158,185 ****
  Summary:        Groovy 1.6 Runtime for %{name}
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       groovy15
  
  %description runtime-1.6
  %{summary}.
  
  %package javadoc
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
  
  %description javadoc
  %{summary}.
  
  %prep
! %setup -q -n %{name}-%{named_version}
! mkdir -p gmaven-feature/gmaven-feature-api/src/test/resources
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! %patch3 -b .sav3
! %patch4 -b .sav4
! rm gmaven-support/slf4j-gossip/src/test/java/org/codehaus/groovy/maven/gossip/config/ColorRendererTest.java
  
! %build
! cp %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
--- 179,236 ----
  Summary:        Groovy 1.6 Runtime for %{name}
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       groovy16
  
  %description runtime-1.6
  %{summary}.
  
+ %package runtime-1.7
+ Group:          Development/Tools
+ Summary:        Groovy 1.7 Runtime for %{name}
+ Requires:       %{name} = %{epoch}:%{version}-%{release}
+ Requires:       groovy17
+ 
+ %description runtime-1.7
+ %{summary}.
+ 
  %package javadoc
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
+ Requires:       jpackage-utils
  
  %description javadoc
  %{summary}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
! %setup -q -n gmaven-%{namedversion}
! %patch100 -b .sav100
! %patch101 -b .sav101
! %patch102 -b .sav102
! %patch103 -b .sav103
  
! %if 0
! perl -pi.bak -e 's/<artifactId>gossip/<artifactId>gossip-core/g;' \
!     gmaven-plugin/pom.xml \
!     gmaven-runtime/gmaven-runtime-loader/pom.xml \
!     gmaven-runtime/pom.xml \
!     pom.xml
! 
! > ../gmaven-gossip.patch
! for i in `find -name \*.bak`; do
! diff -u  $i `dirname $i`/`basename $i .bak` >> ../gmaven-gossip.patch || :
! done
! %endif
! 
! cp -p %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
***************
*** 192,415 ****
  ln -s %{_javadir} external_repo/JPP
  
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! 
! 
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
! 
! mkdir -p $MAVEN_REPO_LOCAL/org.apache
! cp %{SOURCE3} $MAVEN_REPO_LOCAL/org.apache/apache-jar-resource-bundle.jar
! 
! export MAVEN_OPTS="-Xmx512m"
! 
! mvn-jpp -e \
!         -s ${M2SETTINGS} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         install
! 
! mvn-jpp -e \
          -s ${M2SETTINGS} \
!         -Daggregate=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         javadoc:javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jars
! install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! 
! #BUILD/gmaven-1.0-rc-3/pom.xml
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-gmaven.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven %{named_version} JPP/%{name} gmaven
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-archetypes/pom.xml
! install -m 644 gmaven-archetypes/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-archetypes.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.archetypes gmaven-archetypes %{named_version} JPP/%{name} archetypes
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-archetypes/gmaven-archetype-basic/pom.xml
! install -m 644 gmaven-archetypes/gmaven-archetype-basic/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-archetype-basic.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.archetypes gmaven-archetype-basic %{named_version} JPP/%{name} archetype-basic
! #BUILD/gmaven-1.0-rc-3/gmaven-archetypes/gmaven-archetype-basic/target/gmaven-archetype-basic-1.0-rc-3.jar
! install -m 644 gmaven-archetypes/gmaven-archetype-basic/target/gmaven-archetype-basic-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/archetype-basic-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-archetypes/gmaven-archetype-mojo/pom.xml
! install -m 644 gmaven-archetypes/gmaven-archetype-mojo/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-archetype-mojo.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.archetypes gmaven-archetype-mojo %{named_version} JPP/%{name} archetype-mojo
! #BUILD/gmaven-1.0-rc-3/gmaven-archetypes/gmaven-archetype-mojo/target/gmaven-archetype-mojo-1.0-rc-3.jar
! install -m 644 gmaven-archetypes/gmaven-archetype-mojo/target/gmaven-archetype-mojo-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/archetype-mojo-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-common/pom.xml
! install -m 644 gmaven-common/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-common.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-common %{named_version} JPP/%{name} common
! #BUILD/gmaven-1.0-rc-3/gmaven-common/target/gmaven-common-1.0-rc-3.jar
! install -m 644 gmaven-common/target/gmaven-common-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/common-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-examples/pom.xml
! install -m 644 gmaven-examples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-examples.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.examples gmaven-examples %{named_version} JPP/%{name} examples
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-examples/clean-maven-plugin/pom.xml
! install -m 644 gmaven-examples/clean-maven-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-clean-maven-plugin.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.examples clean-maven-plugin %{named_version} JPP/%{name} clean-maven-plugin
! #BUILD/gmaven-1.0-rc-3/gmaven-examples/clean-maven-plugin/target/clean-maven-plugin-1.0-rc-3.jar
! install -m 644 gmaven-examples/clean-maven-plugin/target/clean-maven-plugin-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/clean-maven-plugin-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-examples/install-maven-plugin/pom.xml
! install -m 644 gmaven-examples/install-maven-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-install-maven-plugin.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.examples install-maven-plugin %{named_version} JPP/%{name} install-maven-plugin
! #BUILD/gmaven-1.0-rc-3/gmaven-examples/install-maven-plugin/target/install-maven-plugin-1.0-rc-3.jar
! install -m 644 gmaven-examples/install-maven-plugin/target/install-maven-plugin-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/install-maven-plugin-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-feature/pom.xml
! install -m 644 gmaven-feature/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-feature.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.feature gmaven-feature %{named_version} JPP/%{name} feature
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-feature/gmaven-feature-api/pom.xml
! install -m 644 gmaven-feature/gmaven-feature-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-feature-api.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.feature gmaven-feature-api %{named_version} JPP/%{name} feature-api
! #BUILD/gmaven-1.0-rc-3/gmaven-feature/gmaven-feature-api/target/gmaven-feature-api-1.0-rc-3.jar
! install -m 644 gmaven-feature/gmaven-feature-api/target/gmaven-feature-api-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/feature-api-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-feature/gmaven-feature-support/pom.xml
! install -m 644 gmaven-feature/gmaven-feature-support/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-feature-support.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.feature gmaven-feature-support %{named_version} JPP/%{name} feature-support
! #BUILD/gmaven-1.0-rc-3/gmaven-feature/gmaven-feature-support/target/gmaven-feature-support-1.0-rc-3.jar
! install -m 644 gmaven-feature/gmaven-feature-support/target/gmaven-feature-support-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/feature-support-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-legacy/pom.xml
! install -m 644 gmaven-legacy/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-legacy.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-legacy %{named_version} JPP/%{name} legacy
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-legacy/groovy-maven-plugin/pom.xml
! install -m 644 gmaven-legacy/groovy-maven-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-groovy-maven-plugin.pom
! %add_to_maven_depmap org.codehaus.mojo groovy-maven-plugin %{named_version} JPP/%{name} groovy-maven-plugin
! #BUILD/gmaven-1.0-rc-3/gmaven-legacy/groovy-maven-plugin/target/groovy-maven-plugin-1.0-rc-3.jar
! install -m 644 gmaven-legacy/groovy-maven-plugin/target/groovy-maven-plugin-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/groovy-maven-plugin-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-legacy/groovy-plexus-factory/pom.xml
! install -m 644 gmaven-legacy/groovy-plexus-factory/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-groovy-plexus-factory.pom
! %add_to_maven_depmap org.codehaus.groovy.maven groovy-plexus-factory %{named_version} JPP/%{name} groovy-plexus-factory
! #BUILD/gmaven-1.0-rc-3/gmaven-legacy/groovy-plexus-factory/target/groovy-plexus-factory-1.0-rc-3.jar
! install -m 644 gmaven-legacy/groovy-plexus-factory/target/groovy-plexus-factory-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/groovy-plexus-factory-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-mojo/pom.xml
! install -m 644 gmaven-mojo/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-mojo.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-mojo %{named_version} JPP/%{name} mojo
! #BUILD/gmaven-1.0-rc-3/gmaven-mojo/target/gmaven-mojo-1.0-rc-3.jar
! install -m 644 gmaven-mojo/target/gmaven-mojo-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/mojo-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-mojo-support/pom.xml
! install -m 644 gmaven-mojo-support/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-mojo-support.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-mojo-support %{named_version} JPP/%{name} mojo-support
! #BUILD/gmaven-1.0-rc-3/gmaven-mojo-support/target/gmaven-mojo-support-1.0-rc-3.jar
! install -m 644 gmaven-mojo-support/target/gmaven-mojo-support-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/mojo-support-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-packaging/pom.xml
! install -m 644 gmaven-packaging/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-packaging.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-packaging %{named_version} JPP/%{name} packaging
! #BUILD/gmaven-1.0-rc-3/gmaven-packaging/target/gmaven-packaging-1.0-rc-3.jar
! install -m 644 gmaven-packaging/target/gmaven-packaging-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/packaging-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-plugin/pom.xml
! install -m 644 gmaven-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-plugin.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-plugin %{named_version} JPP/%{name} plugin
! #BUILD/gmaven-1.0-rc-3/gmaven-plugin/target/gmaven-plugin-1.0-rc-3.jar
! install -m 644 gmaven-plugin/target/gmaven-plugin-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/plugin-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/pom.xml
! install -m 644 gmaven-runtime/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime %{named_version} JPP/%{name} runtime
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-1.0/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-1.0/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-1.0.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-1.0 %{named_version} JPP/%{name} runtime-1.0
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-1.0/target/gmaven-runtime-1.0-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-1.0/target/gmaven-runtime-1.0-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-1.0-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-1.5/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-1.5/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-1.5.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-1.5 %{named_version} JPP/%{name} runtime-1.5
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-1.5/target/gmaven-runtime-1.5-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-1.5/target/gmaven-runtime-1.5-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-1.5-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-1.6/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-1.6/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-1.6.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-1.6 %{named_version} JPP/%{name} runtime-1.6
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-1.6/target/gmaven-runtime-1.6-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-1.6/target/gmaven-runtime-1.6-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-1.6-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-api/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-api.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-api %{named_version} JPP/%{name} runtime-api
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-api/target/gmaven-runtime-api-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-api/target/gmaven-runtime-api-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-api-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-default/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-default/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-default.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-default %{named_version} JPP/%{name} runtime-default
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-default/target/gmaven-runtime-default-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-default/target/gmaven-runtime-default-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-default-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-loader/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-loader/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-loader.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-loader %{named_version} JPP/%{name} runtime-loader
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-loader/target/gmaven-runtime-loader-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-loader/target/gmaven-runtime-loader-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-loader-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-support/pom.xml
! install -m 644 gmaven-runtime/gmaven-runtime-support/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-runtime-support.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.runtime gmaven-runtime-support %{named_version} JPP/%{name} runtime-support
! #BUILD/gmaven-1.0-rc-3/gmaven-runtime/gmaven-runtime-support/target/gmaven-runtime-support-1.0-rc-3.jar
! install -m 644 gmaven-runtime/gmaven-runtime-support/target/gmaven-runtime-support-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-support-%{version}.jar
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-support/pom.xml
! install -m 644 gmaven-support/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-support.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.support gmaven-support %{named_version} JPP/%{name} support
! 
! #BUILD/gmaven-1.0-rc-3/gmaven-support/slf4j-gossip/pom.xml
! install -m 644 gmaven-support/slf4j-gossip/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-slf4j-gossip.pom
! %add_to_maven_depmap org.codehaus.groovy.maven.support slf4j-gossip %{named_version} JPP/%{name} slf4j-gossip
! #BUILD/gmaven-1.0-rc-3/gmaven-support/slf4j-gossip/target/slf4j-gossip-1.0-rc-3.jar
! install -m 644 gmaven-support/slf4j-gossip/target/slf4j-gossip-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/slf4j-gossip-%{version}.jar
  
! #BUILD/gmaven-1.0-rc-3/gmaven-testsuite/pom.xml
! install -m 644 gmaven-testsuite/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-testsuite.pom
! %add_to_maven_depmap org.codehaus.groovy.maven gmaven-testsuite %{named_version} JPP/%{name} testsuite
! #BUILD/gmaven-1.0-rc-3/gmaven-testsuite/target/gmaven-testsuite-1.0-rc-3.jar
! install -m 644 gmaven-testsuite/target/gmaven-testsuite-%{named_version}.jar \
!                $RPM_BUILD_ROOT%{_javadir}/%{name}/testsuite-%{version}.jar
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
! mv $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/runtime-1.0.jar
  
  # javadoc
! install -d -m 0755 $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} # ghost symlink
  
  %if %{gcj_support}
--- 243,354 ----
  ln -s %{_javadir} external_repo/JPP
  
! %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
! #export MAVEN_OPTS="-Xmx512m"
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         -Dmaven.test.failure.ignore=true \
!         -Dmaven.test.skip=true \
!         -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
!         deploy javadoc:aggregate
  
  %install
! rm -rf %{buildroot}
  
  # jars
! mkdir -p %{buildroot}%{_javadir}/%{name}
! pushd maven2-brew
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetype-basic/%{namedversion}/gmaven-archetype-basic-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetype-mojo/%{namedversion}/gmaven-archetype-mojo-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/examples/clean-maven-plugin/%{namedversion}/clean-maven-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/examples/install-maven-plugin/%{namedversion}/install-maven-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/feature/gmaven-feature-api/%{namedversion}/gmaven-feature-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/feature/gmaven-feature-support/%{namedversion}/gmaven-feature-support-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/gmaven-mojo/%{namedversion}/gmaven-mojo-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/gmaven-mojo-support/%{namedversion}/gmaven-mojo-support-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/gmaven-packaging/%{namedversion}/gmaven-packaging-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/gmaven-plugin/%{namedversion}/gmaven-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/gmaven-testsuite/%{namedversion}/gmaven-testsuite-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-1.5/%{namedversion}/gmaven-runtime-1.5-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-1.6/%{namedversion}/gmaven-runtime-1.6-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-1.7/%{namedversion}/gmaven-runtime-1.7-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-api/%{namedversion}/gmaven-runtime-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-loader/%{namedversion}/gmaven-runtime-loader-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-support/%{namedversion}/gmaven-runtime-support-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/support/filter-plugin/%{namedversion}/filter-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/mojo/groovy-maven-plugin/%{namedversion}/groovy-maven-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetype-basic/%{namedversion}/gmaven-archetype-basic-%{namedversion}.maven-archetype %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetype-mojo/%{namedversion}/gmaven-archetype-mojo-%{namedversion}.maven-archetype %{buildroot}%{_javadir}/%{name}/
! cp -p org/codehaus/gmaven/gmaven/%{namedversion}/gmaven-%{namedversion}-site.xml %{buildroot}%{_javadir}/%{name}/
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{namedversion}*; do ln -s ${jar} `/bin/echo ${jar} | sed "s|-%{namedversion}||g"`; done)
  
! mkdir -p %{buildroot}%{_datadir}/maven2/poms
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetype-basic/%{namedversion}/gmaven-archetype-basic-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-archetype-basic.pom
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetype-mojo/%{namedversion}/gmaven-archetype-mojo-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-archetype-mojo.pom
! cp -p org/codehaus/gmaven/archetypes/gmaven-archetypes/%{namedversion}/gmaven-archetypes-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-archetypes.pom
! cp -p org/codehaus/gmaven/examples/clean-maven-plugin/%{namedversion}/clean-maven-plugin-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clean-maven-plugin.pom
! cp -p org/codehaus/gmaven/examples/gmaven-examples/%{namedversion}/gmaven-examples-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-examples.pom
! cp -p org/codehaus/gmaven/examples/install-maven-plugin/%{namedversion}/install-maven-plugin-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-install-maven-plugin.pom
! cp -p org/codehaus/gmaven/feature/gmaven-feature/%{namedversion}/gmaven-feature-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-feature.pom
! cp -p org/codehaus/gmaven/feature/gmaven-feature-api/%{namedversion}/gmaven-feature-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-feature-api.pom
! cp -p org/codehaus/gmaven/feature/gmaven-feature-support/%{namedversion}/gmaven-feature-support-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-feature-support.pom
! cp -p org/codehaus/gmaven/gmaven/%{namedversion}/gmaven-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven.pom
! cp -p org/codehaus/gmaven/gmaven-mojo/%{namedversion}/gmaven-mojo-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-mojo.pom
! cp -p org/codehaus/gmaven/gmaven-mojo-support/%{namedversion}/gmaven-mojo-support-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-mojo-support.pom
! cp -p org/codehaus/gmaven/gmaven-packaging/%{namedversion}/gmaven-packaging-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-packaging.pom
! cp -p org/codehaus/gmaven/gmaven-plugin/%{namedversion}/gmaven-plugin-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-plugin.pom
! cp -p org/codehaus/gmaven/gmaven-testsuite/%{namedversion}/gmaven-testsuite-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-testsuite.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime/%{namedversion}/gmaven-runtime-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-1.5/%{namedversion}/gmaven-runtime-1.5-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-1.5.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-1.6/%{namedversion}/gmaven-runtime-1.6-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-1.6.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-1.7/%{namedversion}/gmaven-runtime-1.7-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-1.7.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-api/%{namedversion}/gmaven-runtime-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-api.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-loader/%{namedversion}/gmaven-runtime-loader-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-loader.pom
! cp -p org/codehaus/gmaven/runtime/gmaven-runtime-support/%{namedversion}/gmaven-runtime-support-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-support.pom
! cp -p org/codehaus/gmaven/support/filter-plugin/%{namedversion}/filter-plugin-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-filter-plugin.pom
! cp -p org/codehaus/gmaven/support/gmaven-support/%{namedversion}/gmaven-support-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gmaven-support.pom
! cp -p org/codehaus/mojo/groovy-maven-plugin/%{namedversion}/groovy-maven-plugin-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-groovy-maven-plugin.pom
! popd
  
! %add_to_maven_depmap org.codehaus.gmaven.archetypes gmaven-archetype-basic %{namedversion} JPP/%{name} gmaven-archetype-basic
! %add_to_maven_depmap org.codehaus.gmaven.archetypes gmaven-archetype-mojo %{namedversion} JPP/%{name} gmaven-archetype-mojo
! %add_to_maven_depmap org.codehaus.gmaven.archetypes gmaven-archetypes %{namedversion} JPP/%{name} gmaven-archetypes
! %add_to_maven_depmap org.codehaus.gmaven.examples clean-maven-plugin %{namedversion} JPP/%{name} clean-maven-plugin
! %add_to_maven_depmap org.codehaus.gmaven.examples gmaven-examples %{namedversion} JPP/%{name} gmaven-examples
! %add_to_maven_depmap org.codehaus.gmaven.examples install-maven-plugin %{namedversion} JPP/%{name} install-maven-plugin
! %add_to_maven_depmap org.codehaus.gmaven.feature gmaven-feature %{namedversion} JPP/%{name} gmaven-feature
! %add_to_maven_depmap org.codehaus.gmaven.feature gmaven-feature-api %{namedversion} JPP/%{name} gmaven-feature-api
! %add_to_maven_depmap org.codehaus.gmaven.feature gmaven-feature-support %{namedversion} JPP/%{name} gmaven-feature-support
! %add_to_maven_depmap org.codehaus.gmaven gmaven %{namedversion} JPP/%{name} gmaven
! %add_to_maven_depmap org.codehaus.gmaven gmaven-mojo %{namedversion} JPP/%{name} gmaven-mojo
! %add_to_maven_depmap org.codehaus.gmaven gmaven-mojo-support %{namedversion} JPP/%{name} gmaven-mojo-support
! %add_to_maven_depmap org.codehaus.gmaven gmaven-packaging %{namedversion} JPP/%{name} gmaven-packaging
! %add_to_maven_depmap org.codehaus.gmaven gmaven-plugin %{namedversion} JPP/%{name} gmaven-plugin
! %add_to_maven_depmap org.codehaus.gmaven gmaven-testsuite %{namedversion} JPP/%{name} gmaven-testsuite
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime %{namedversion} JPP/%{name} gmaven-runtime
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime-1.5 %{namedversion} JPP/%{name} gmaven-runtime-1.5
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime-1.6 %{namedversion} JPP/%{name} gmaven-runtime-1.6
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime-1.7 %{namedversion} JPP/%{name} gmaven-runtime-1.7
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime-api %{namedversion} JPP/%{name} gmaven-runtime-api
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime-loader %{namedversion} JPP/%{name} gmaven-runtime-loader
! %add_to_maven_depmap org.codehaus.gmaven.runtime gmaven-runtime-support %{namedversion} JPP/%{name} gmaven-runtime-support
! %add_to_maven_depmap org.codehaus.gmaven.support filter-plugin %{namedversion} JPP/%{name} filter-plugin
! %add_to_maven_depmap org.codehaus.gmaven.support gmaven-support %{namedversion} JPP/%{name} gmaven-support
! %add_to_maven_depmap org.codehaus.mojo groovy-maven-plugin %{namedversion} JPP/%{name} groovy-maven-plugin
  
  # 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
! mkdir -p %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
! pushd maven2-brew
! cp -pr * %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/
! popd
! %endif
  
  %if %{gcj_support}
***************
*** 418,422 ****
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
--- 357,361 ----
  
  %clean
! rm -rf %{buildroot}
  
  %post
***************
*** 440,485 ****
  %files
  %defattr(0644,root,root,0755)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/archetype*.jar
! %{_javadir}/%{name}/clean*.jar
! %{_javadir}/%{name}/common*.jar
! %{_javadir}/%{name}/feature*.jar
! %{_javadir}/%{name}/groovy*.jar
! %{_javadir}/%{name}/install*.jar
! %{_javadir}/%{name}/mojo*.jar
! %{_javadir}/%{name}/packaging*.jar
! %{_javadir}/%{name}/plugin*.jar
! %{_javadir}/%{name}/runtime-api*.jar
! %{_javadir}/%{name}/runtime-default*.jar
! %{_javadir}/%{name}/runtime-loader*.jar
! %{_javadir}/%{name}/runtime-support*.jar
! %{_javadir}/%{name}/slf4j-gossip*.jar
! %{_javadir}/%{name}/testsuite*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/*-%{version}.jar.*
  %endif
  
! %files runtime-1.0
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}/runtime-1.0*.jar
  
  %files runtime-1.5
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}/runtime-1.5*.jar
  
  %files runtime-1.6
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}/runtime-1.6*.jar
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %changelog
! * Tue Sep 30 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.rc3.1.jpp5
! - Initial release
  
--- 379,495 ----
  %files
  %defattr(0644,root,root,0755)
! %dir %{_javadir}*/%{name}/
! %exclude %dir %{_javadocdir}/%{name}/
! %{_javadir}*/%{name}/clean-maven-plugin-%{namedversion}.jar
! %{_javadir}*/%{name}/clean-maven-plugin.jar
! %{_javadir}*/%{name}/filter-plugin-%{namedversion}.jar
! %{_javadir}*/%{name}/filter-plugin.jar
! %{_javadir}*/%{name}/gmaven-%{namedversion}-site.xml
! %{_javadir}*/%{name}/gmaven-archetype-basic-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-archetype-basic-%{namedversion}.maven-archetype
! %{_javadir}*/%{name}/gmaven-archetype-basic.jar
! %{_javadir}*/%{name}/gmaven-archetype-basic.maven-archetype
! %{_javadir}*/%{name}/gmaven-archetype-mojo-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-archetype-mojo-%{namedversion}.maven-archetype
! %{_javadir}*/%{name}/gmaven-archetype-mojo.jar
! %{_javadir}*/%{name}/gmaven-archetype-mojo.maven-archetype
! %{_javadir}*/%{name}/gmaven-feature-api-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-feature-api.jar
! %{_javadir}*/%{name}/gmaven-feature-support-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-feature-support.jar
! %{_javadir}*/%{name}/gmaven-mojo-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-mojo-support-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-mojo-support.jar
! %{_javadir}*/%{name}/gmaven-mojo.jar
! %{_javadir}*/%{name}/gmaven-packaging-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-packaging.jar
! %{_javadir}*/%{name}/gmaven-plugin-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-plugin.jar
! %{_javadir}*/%{name}/gmaven-runtime-api-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime-api.jar
! %{_javadir}*/%{name}/gmaven-runtime-loader-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime-loader.jar
! %{_javadir}*/%{name}/gmaven-runtime-support-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime-support.jar
! %{_javadir}*/%{name}/gmaven-site.xml
! %{_javadir}*/%{name}/gmaven-testsuite-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-testsuite.jar
! %{_javadir}*/%{name}/groovy-maven-plugin-%{namedversion}.jar
! %{_javadir}*/%{name}/groovy-maven-plugin.jar
! %{_javadir}*/%{name}/install-maven-plugin-%{namedversion}.jar
! %{_javadir}*/%{name}/install-maven-plugin.jar
! %{_datadir}/maven2/poms/JPP.%{name}-clean-maven-plugin.pom
! %{_datadir}/maven2/poms/JPP.%{name}-filter-plugin.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-archetype-basic.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-archetype-mojo.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-archetypes.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-examples.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-feature-api.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-feature-support.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-feature.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-mojo-support.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-mojo.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-packaging.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-plugin.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-api.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-loader.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-support.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-support.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-testsuite.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven.pom
! %{_datadir}/maven2/poms/JPP.%{name}-groovy-maven-plugin.pom
! %{_datadir}/maven2/poms/JPP.%{name}-install-maven-plugin.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/*-%{version}.jar.*
  %endif
  
! %files runtime
  %defattr(0644,root,root,0755)
! %if 0
! %{_javadir}*/%{name}/gmaven-runtime-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime.jar
! %endif
  
  %files runtime-1.5
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}/gmaven-runtime-1.5-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime-1.5.jar
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-1.5.pom
  
  %files runtime-1.6
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}/gmaven-runtime-1.6-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime-1.6.jar
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-1.6.pom
! 
! %files runtime-1.7
! %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}/gmaven-runtime-1.7-%{namedversion}.jar
! %{_javadir}*/%{name}/gmaven-runtime-1.7.jar
! %{_datadir}/maven2/poms/JPP.%{name}-gmaven-runtime-1.7.pom
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
! %{_javadocdir}/%{name}-%{namedversion}/allclasses-frame.html
! %{_javadocdir}/%{name}-%{namedversion}/allclasses-noframe.html
! %{_javadocdir}/%{name}
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %dir %{_javadir}*/
! %exclude %dir %{_javadocdir}/
! %{_javadir}*/repository.jboss.com
! %endif
  
  %changelog
! * Thu Dec 23 2010 David Walluck <dwalluck at redhat.com> 0:1.3-1
! - use external apache-jar-resource-bundle
! - add option to disable shitty (circular dependency)
  
+ * Thu Oct 02 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.rc3.1.jpp5
+ - Initial release

--- NEW FILE: gmaven-no-gshell-io.patch ---
--- gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ConsoleFeature.java~	2009-11-26 05:15:40.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ConsoleFeature.java	2010-12-22 17:51:16.489843234 -0500
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+//import org.sonatype.gshell.io.StreamSet;
 
 import java.util.EventObject;
 
@@ -61,7 +61,7 @@
         public void execute(final ClassLoader classLoader) throws Exception {
             assert classLoader != null;
 
-            final StreamSet streams = StreamSet.system();
+            //final StreamSet streams = StreamSet.system();
 
             final SecurityManager sm = System.getSecurityManager();
 
@@ -89,8 +89,8 @@
             }
             finally {
                 System.setSecurityManager(sm);
-                StreamSet.system(streams);
+                //StreamSet.system(streams);
             }
         }
     }
-}
\ No newline at end of file
+}
--- gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ShellFeature.java~	2009-11-26 05:15:40.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ShellFeature.java	2010-12-22 17:51:49.924867890 -0500
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+//import org.sonatype.gshell.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
@@ -65,10 +65,10 @@
 
             boolean legacy = config().get(LEGACY, false);
 
-            final StreamSet streams = StreamSet.system();
+            //final StreamSet streams = StreamSet.system();
 
             // Put a nice blank before and after we run the shell
-            streams.out.println();
+            //streams.out.println();
 
             SecurityManager sm = System.getSecurityManager();
             System.setSecurityManager(new NoExitSecurityManager());
@@ -84,11 +84,11 @@
             finally {
                 System.setSecurityManager(sm);
 
-                StreamSet.system(streams);
+                //StreamSet.system(streams);
             }
 
             // The blank after
-            streams.out.println();
+            //streams.out.println();
         }
     }
 
@@ -167,4 +167,4 @@
             shell.run();
         }
     }
-}
\ No newline at end of file
+}
--- gmaven-runtime/gmaven-runtime-support/pom.xml~	2010-08-06 18:32:36.000000000 -0400
+++ gmaven-runtime/gmaven-runtime-support/pom.xml	2010-12-22 17:52:51.992919172 -0500
@@ -50,10 +50,10 @@
             <artifactId>gmaven-feature-support</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.sonatype.gshell</groupId>
             <artifactId>gshell-io</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
--- pom.xml~	2010-12-22 17:48:22.000000000 -0500
+++ pom.xml	2010-12-22 17:53:14.229280242 -0500
@@ -291,7 +291,7 @@
                 <version>1.2.1</version>
             </dependency>
 
-            <dependency>
+            <!--<dependency>
                 <groupId>org.sonatype.gshell</groupId>
                 <artifactId>gshell-io</artifactId>
                 <version>2.0</version>
@@ -301,7 +301,7 @@
                         <artifactId>jline</artifactId>
                     </exclusion>
                 </exclusions>
-            </dependency>
+            </dependency>-->
 
             <dependency>
                 <groupId>jline</groupId>
--- gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ConsoleFeature.java~	2009-11-26 05:15:40.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ConsoleFeature.java	2010-12-22 17:55:26.399707507 -0500
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+//import org.sonatype.gshell.io.StreamSet;
 
 import java.util.EventObject;
 
@@ -60,7 +60,7 @@
         public void execute(final ClassLoader classLoader) throws Exception {
             assert classLoader != null;
 
-            final StreamSet streams = StreamSet.system();
+            //final StreamSet streams = StreamSet.system();
 
             final SecurityManager sm = System.getSecurityManager();
 
@@ -88,8 +88,8 @@
             }
             finally {
                 System.setSecurityManager(sm);
-                StreamSet.system(streams);
+                //StreamSet.system(streams);
             }
         }
     }
-}
\ No newline at end of file
+}
--- gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ShellFeature.java~	2009-11-26 05:15:40.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ShellFeature.java	2010-12-22 17:55:03.235539828 -0500
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+//import org.sonatype.gshell.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
@@ -64,10 +64,10 @@
 
             boolean legacy = config().get(LEGACY, false);
 
-            final StreamSet streams = StreamSet.system();
+            //final StreamSet streams = StreamSet.system();
 
             // Put a nice blank before and after we run the shell
-            streams.out.println();
+            //streams.out.println();
 
             SecurityManager sm = System.getSecurityManager();
             System.setSecurityManager(new NoExitSecurityManager());
@@ -83,11 +83,11 @@
             finally {
                 System.setSecurityManager(sm);
 
-                StreamSet.system(streams);
+                //StreamSet.system(streams);
             }
 
             // The blank after
-            streams.out.println();
+            //streams.out.println();
         }
     }
 
@@ -166,4 +166,4 @@
             shell.run();
         }
     }
-}
\ No newline at end of file
+}
--- gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ConsoleFeature.java~	2009-11-26 05:15:40.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ConsoleFeature.java	2010-12-22 17:56:22.011106403 -0500
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+//import org.sonatype.gshell.io.StreamSet;
 
 import java.util.EventObject;
 
@@ -61,7 +61,7 @@
         public void execute(final ClassLoader classLoader) throws Exception {
             assert classLoader != null;
 
-            final StreamSet streams = StreamSet.system();
+            //final StreamSet streams = StreamSet.system();
 
             final SecurityManager sm = System.getSecurityManager();
 
@@ -89,8 +89,8 @@
             }
             finally {
                 System.setSecurityManager(sm);
-                StreamSet.system(streams);
+                //StreamSet.system(streams);
             }
         }
     }
-}
\ No newline at end of file
+}
--- gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ShellFeature.java.sav101	2009-11-26 05:15:40.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ShellFeature.java	2010-12-22 18:06:18.782569039 -0500
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+//import org.sonatype.gshell.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
@@ -65,10 +65,10 @@
 
             boolean legacy = config().get(LEGACY, false);
 
-            final StreamSet streams = StreamSet.system();
+            //final StreamSet streams = StreamSet.system();
 
             // Put a nice blank before and after we run the shell
-            streams.out.println();
+            //streams.out.println();
 
             SecurityManager sm = System.getSecurityManager();
             System.setSecurityManager(new NoExitSecurityManager());
@@ -84,11 +84,11 @@
             finally {
                 System.setSecurityManager(sm);
 
-                StreamSet.system(streams);
+                //StreamSet.system(streams);
             }
 
             // The blank after
-            streams.out.println();
+            //streams.out.println();
         }
     }
 
@@ -167,4 +167,4 @@
             shell.run();
         }
     }
-}
\ No newline at end of file
+}

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	1 Oct 2008 18:22:22 -0000	1.2
--- sources	23 Dec 2010 01:07:30 -0000	1.3
***************
*** 1,2 ****
! 31ab2e98ffeacf46ee7c6e9210cc44b6  apache-jar-resource-bundle-1.3.jar
! 52a09a50377100c6b33d8265e3b76e20  gmaven-1.0-rc-3.tar.gz
--- 1 ----
! 2c8db3ccbadb5ad684899cfb2b5716f2  gmaven-1.3.tar.bz2

--- NEW FILE: gmaven-gmaven-plugin-pom.patch ---
--- gmaven-plugin/pom.xml.orig	2010-12-14 19:15:25.592832129 -0500
+++ gmaven-plugin/pom.xml	2010-12-14 20:58:31.631040053 -0500
@@ -174,10 +174,20 @@
 
         <dependency>
             <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-descriptor</artifactId>
         </dependency>

--- NEW FILE: gmaven-poms.patch ---
--- gmaven-runtime/gmaven-runtime-1.6/pom.xml.orig	2010-08-06 18:32:36.000000000 -0400
+++ gmaven-runtime/gmaven-runtime-1.6/pom.xml	2010-12-18 19:59:23.436356836 -0500
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy16-all</artifactId>
             <version>1.6.9</version>
             <exclusions>
                 <exclusion>
--- gmaven-runtime/gmaven-runtime-1.7/pom.xml.orig	2010-08-06 18:32:36.000000000 -0400
+++ gmaven-runtime/gmaven-runtime-1.7/pom.xml	2010-12-18 19:59:33.582598388 -0500
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy17-all</artifactId>
             <version>1.7.4</version>
             <exclusions>
                 <exclusion>
--- pom.xml.sav100	2010-08-06 18:32:36.000000000 -0400
+++ pom.xml	2010-12-22 17:58:26.866060959 -0500
@@ -151,9 +151,9 @@
         <url>http://bamboo.ci.codehaus.org/browse/GMAVEN</url>
     </ciManagement>
     
-    <prerequisites>
+    <!--<prerequisites>
         <maven>2.0.10</maven>
-    </prerequisites>
+    </prerequisites>-->
 
     <!--<distributionManagement>-->
         <!--<repository>-->
@@ -221,7 +221,7 @@
 
             <dependency>
                 <groupId>org.sonatype.gossip</groupId>
-                <artifactId>gossip</artifactId>
+                <artifactId>gossip-core</artifactId>
                 <version>1.2</version>
             </dependency>
             
@@ -418,13 +418,13 @@
     </modules>
    
     <build>
-        <extensions>
+        <!--<extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-webdav-jackrabbit</artifactId>
                 <version>1.0-beta-5</version>
             </extension>
-        </extensions>
+        </extensions>-->
 
         <defaultGoal>install</defaultGoal>
         
@@ -494,7 +494,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
                     <version>1.0</version>
-                    <executions>
+                    <!--<executions>
                         <execution>
                             <goals>
                                 <goal>process</goal>
@@ -505,7 +505,7 @@
                                 </resourceBundles>
                             </configuration>
                         </execution>
-                    </executions>
+                    </executions>-->
                 </plugin>
 
                 <plugin>
@@ -665,9 +665,9 @@
                                 <requireJavaVersion>
                                     <version>[1.4,1.7)</version>
                                 </requireJavaVersion>
-                                <requireMavenVersion>
+                                <!--<requireMavenVersion>
                                     <version>[2.0.10,)</version>
-                                </requireMavenVersion>
+                                </requireMavenVersion>-->
                                 <!--
                                 <requirePluginVersions>
                                     <banLatest>true</banLatest>
@@ -682,11 +682,11 @@
                 </executions>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-plugin</artifactId>
                 <version>1.2</version>
-            </plugin>
+            </plugin>-->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

--- NEW FILE: gmaven-no-shitty.patch ---
--- gmaven-packaging/pom.xml.orig	2010-12-14 17:20:20.928955943 -0500
+++ gmaven-packaging/pom.xml	2010-12-14 17:40:49.714304050 -0500
@@ -44,17 +44,17 @@
 
     <build>
         <plugins>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>shitty-maven-plugin</artifactId>
                 <configuration>
-                    <!--
-                    HACK: Allow failures for now, since the tests fail because Maven is not properly installing
-                          artifacts from custom packaging with the correct extention into the local repository.
-                    -->
+
+
+
+
                     <ignoreFailures>true</ignoreFailures>
                 </configuration>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 
--- pom.xml.sav5	2010-12-14 19:12:48.797983785 -0500
+++ pom.xml	2010-12-14 19:13:35.818138048 -0500
@@ -639,11 +639,11 @@
                     <version>2.2</version>
                 </plugin>
                 
-                <plugin>
+                <!--<plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>shitty-maven-plugin</artifactId>
                     <version>1.0-alpha-3</version>
-                </plugin>
+                </plugin>-->
                 
                 <!-- INTERNAL -->
                 
@@ -828,7 +828,7 @@
 
             <build>
                 <plugins>
-                    <plugin>
+                    <!--<plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>shitty-maven-plugin</artifactId>
                         <executions>
@@ -840,7 +840,7 @@
                                 </goals>
                             </execution>
                         </executions>
-                    </plugin>
+                    </plugin>-->
                 </plugins>
             </build>
         </profile>
@@ -856,14 +856,14 @@
             
             <build>
                 <plugins>
-                    <plugin>
+                    <!--<plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>shitty-maven-plugin</artifactId>
                         <configuration>
                             <verbose>true</verbose>
                             <color>false</color>
                         </configuration>
-                    </plugin>
+                    </plugin>-->
                     
                     <!--
                     <plugin>
--- gmaven-testsuite/pom.xml.sav5	2009-02-27 10:56:52.000000000 -0500
+++ gmaven-testsuite/pom.xml	2010-12-14 19:13:55.127612010 -0500
@@ -44,7 +44,7 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
+                <!--<plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>shitty-maven-plugin</artifactId>
                     <executions>
@@ -68,7 +68,7 @@
                             </configuration>
                         </execution>
                     </executions>
-                </plugin>
+                </plugin>-->
             </plugins>
         </pluginManagement>
     </build>
@@ -82,7 +82,7 @@
             <build>
                 <pluginManagement>
                     <plugins>
-                        <plugin>
+                        <!--<plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>shitty-maven-plugin</artifactId>
                             <executions>
@@ -107,7 +107,7 @@
                                     </configuration>
                                 </execution>
                             </executions>
-                        </plugin>
+                        </plugin>-->
                     </plugins>
                 </pluginManagement>
             </build>

--- NEW FILE: gmaven-gmaven-runtime-pom.patch ---
--- gmaven-runtime/pom.xml~	2009-02-27 10:56:52.000000000 -0500
+++ gmaven-runtime/pom.xml	2010-12-14 21:13:10.432272599 -0500
@@ -41,6 +41,7 @@
         <module>gmaven-runtime-support</module>
         <module>gmaven-runtime-1.0</module>
         <module>gmaven-runtime-1.5</module>
+        <module>gmaven-runtime-1.6</module>
         <module>gmaven-runtime-loader</module>
     </modules>
 

--- NEW FILE: gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch ---
--- gmaven-runtime/gmaven-runtime-1.6/pom.xml~	2009-02-27 10:56:52.000000000 -0500
+++ gmaven-runtime/gmaven-runtime-1.6/pom.xml	2010-12-15 13:13:12.863544441 -0500
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy15-all</artifactId>
             <version>1.6.0</version>
             <exclusions>
                 <exclusion>

Index: gmaven-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** gmaven-jpp-depmap.xml	1 Oct 2008 18:22:22 -0000	1.1
--- gmaven-jpp-depmap.xml	23 Dec 2010 01:07:30 -0000	1.2
***************
*** 1,28 ****
  <dependencies>
!   <dependency>
!     <maven>
!         <groupId>org.apache.maven.archetype</groupId>
!         <artifactId>maven-archetype</artifactId>
!         <version>2.0-alpha-3</version>
!     </maven>
!     <jpp>
!         <groupId>JPP/maven-archetype2</groupId>
!         <artifactId>archetype</artifactId>
!         <version>2.0-alpha-3</version>
!     </jpp>
!   </dependency>
! 
!   <dependency>
!         <maven>
!           <groupId>slide</groupId>
!           <artifactId>slide-webdavlib</artifactId>
!           <version>2.1</version>
!         </maven>
!         <jpp>
!           <groupId>JPP/slide</groupId>
!           <artifactId>slide-webdavclient-webdavlib</artifactId>
!           <version>2.1</version>
!         </jpp>
!   </dependency>
  
     <dependency>
--- 1,15 ----
  <dependencies>
!    <dependency>
!       <maven>
!          <groupId>org.mortbay.jetty</groupId>
!          <artifactId>servlet-api</artifactId>
!          <version>2.5-20081211</version>
!       </maven>
!       <jpp>
!          <groupId>JPP</groupId>
!          <artifactId>servlet_2_5_api</artifactId>
!          <version>2.5</version>
!       </jpp>
!    </dependency>
  
     <dependency>
***************
*** 35,39 ****
           <groupId>JPP</groupId>
           <artifactId>qdox</artifactId>
!          <version>1.6.1</version>
        </jpp>
     </dependency>
--- 22,53 ----
           <groupId>JPP</groupId>
           <artifactId>qdox</artifactId>
!          <version>1.12</version>
!       </jpp>
!    </dependency>
! 
!    <dependency>
!       <maven>
!          <groupId>asm</groupId>
!          <artifactId>asm-commons</artifactId>
!          <version>3.2</version>
!       </maven>
!       <jpp>
!          <groupId>JPP/objectweb-asm</groupId>
!          <artifactId>asm-commons</artifactId>
!          <version>3.2</version>
!       </jpp>
!    </dependency>
! 
! <!--
!   <dependency>
!     <maven>
!          <groupId>org.apache.maven.archetype</groupId>
!          <artifactId>maven-archetype</artifactId>
!          <version>2.0-alpha-3</version>
!     </maven>
!     <jpp>
!          <groupId>JPP/maven-archetype2</groupId>
!          <artifactId>archetype</artifactId>
!          <version>2.0-alpha-3</version>
        </jpp>
     </dependency>
***************
*** 47,52 ****
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>groovy-all</artifactId>
!          <version>1.0</version>
        </jpp>
     </dependency>
--- 61,79 ----
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>groovy11-all</artifactId>
!          <version>1.1</version>
!       </jpp>
!    </dependency>
! 
!    <dependency>
!       <maven>
!          <groupId>org.codehaus.groovy</groupId>
!          <artifactId>groovy15-all</artifactId>
!          <version>1.6.0</version>
!       </maven>
!       <jpp>
!          <groupId>JPP</groupId>
!          <artifactId>groovy11-all</artifactId>
!          <version>1.5.6</version>
        </jpp>
     </dependency>
***************
*** 65,67 ****
--- 92,108 ----
     </dependency>
  
+    <dependency>
+       <maven>
+          <groupId>asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>3.0</version>
+       </maven>
+       <jpp>
+          <groupId>JPP/objectweb-asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>3.1</version>
+       </jpp>
+    </dependency>
+ -->
+ 
  </dependencies>

Index: gmaven-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** gmaven-pom.patch	1 Oct 2008 18:22:22 -0000	1.1
--- gmaven-pom.patch	23 Dec 2010 01:07:30 -0000	1.2
***************
*** 1,31 ****
! --- pom.xml.sav	2008-08-22 12:40:16.000000000 +0200
! +++ pom.xml	2008-08-22 12:41:18.000000000 +0200
! @@ -441,6 +441,7 @@
!                      <version>2.2</version>
!                  </plugin>
   
- +<!--
                   <plugin>
                       <groupId>org.apache.maven.plugins</groupId>
                       <artifactId>maven-remote-resources-plugin</artifactId>
! @@ -458,6 +459,7 @@
                           </execution>
                       </executions>
!                  </plugin>
! +-->
   
                   <plugin>
                       <groupId>org.apache.maven.plugins</groupId>
! @@ -605,10 +607,12 @@
           </pluginManagement>
   
           <plugins>
! +<!--
!              <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-remote-resources-plugin</artifactId>
!              </plugin>
! +-->
   
               <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
--- 1,77 ----
! --- pom.xml.sav4	2009-02-27 10:56:52.000000000 -0500
! +++ pom.xml	2010-12-14 19:12:18.390245341 -0500
! @@ -468,11 +468,11 @@
!          
!          <pluginManagement>
!              <plugins>
! -                <plugin>
! +                <!--<plugin>
!                      <groupId>org.apache.maven.plugins</groupId>
!                      <artifactId>maven-enforcer-plugin</artifactId>
!                      <version>1.0-beta-1</version>
! -                </plugin>
! +                </plugin>-->
   
                   <plugin>
                       <groupId>org.apache.maven.plugins</groupId>
+ @@ -492,7 +492,7 @@
+                      <version>2.3</version>
+                  </plugin>
+  
+ -                <plugin>
+ +                <!--<plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
                       <artifactId>maven-remote-resources-plugin</artifactId>
!                      <version>1.0</version>
! @@ -508,7 +508,7 @@
!                              </configuration>
                           </execution>
                       </executions>
! -                </plugin>
! +                </plugin>-->
   
                   <plugin>
                       <groupId>org.apache.maven.plugins</groupId>
! @@ -656,12 +656,12 @@
           </pluginManagement>
   
           <plugins>
! -            <plugin>
! +            <!--<plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-remote-resources-plugin</artifactId>
! -            </plugin>
! +            </plugin>-->
!  
! -            <plugin>
! +            <!--<plugin>
!                  <groupId>org.apache.maven.plugins</groupId>
!                  <artifactId>maven-enforcer-plugin</artifactId>
!                  <executions>
! @@ -688,7 +688,7 @@
!                          </configuration>
!                      </execution>
!                  </executions>
! -            </plugin>
! +            </plugin>-->
   
               <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
+ @@ -1042,7 +1042,7 @@
+              </activation>
+              <build>
+                  <plugins>
+ -                    <plugin>
+ +                    <!--<plugin>
+                          <groupId>org.apache.maven.plugins</groupId>
+                          <artifactId>maven-enforcer-plugin</artifactId>
+                          <executions>
+ @@ -1066,7 +1066,7 @@
+                                  </configuration>
+                              </execution>
+                          </executions>
+ -                    </plugin>
+ +                    </plugin>-->
+                  </plugins>
+              </build>
+          </profile>

--- NEW FILE: gmaven-gossip.patch ---
--- gmaven-plugin/pom.xml~	2010-08-06 18:32:36.000000000 -0400
+++ gmaven-plugin/pom.xml	2010-12-22 19:37:28.469687096 -0500
@@ -201,7 +201,7 @@
 
         <dependency>
             <groupId>org.sonatype.gossip</groupId>
-            <artifactId>gossip</artifactId>
+            <artifactId>gossip-core</artifactId>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
--- gmaven-runtime/gmaven-runtime-loader/pom.xml~	2010-08-06 18:32:36.000000000 -0400
+++ gmaven-runtime/gmaven-runtime-loader/pom.xml	2010-12-22 19:37:28.469687096 -0500
@@ -65,7 +65,7 @@
         
         <dependency>
             <groupId>org.sonatype.gossip</groupId>
-            <artifactId>gossip</artifactId>
+            <artifactId>gossip-core</artifactId>
             <scope>runtime</scope>
         </dependency>
 
--- gmaven-runtime/pom.xml~	2010-08-06 18:32:36.000000000 -0400
+++ gmaven-runtime/pom.xml	2010-12-22 19:37:28.469687096 -0500
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.sonatype.gossip</groupId>
-            <artifactId>gossip</artifactId>
+            <artifactId>gossip-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
--- pom.xml~	2010-12-22 19:37:28.460688977 -0500
+++ pom.xml	2010-12-22 19:37:28.472686467 -0500
@@ -221,7 +221,7 @@
 
             <dependency>
                 <groupId>org.sonatype.gossip</groupId>
-                <artifactId>gossip-core</artifactId>
+                <artifactId>gossip-core-core</artifactId>
                 <version>1.2</version>
             </dependency>
             




More information about the JPackage-commits mailing list