From c2fb9eec0a018b2dced5078904a77d6adf75c6ab Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 16 Nov 2014 03:36:40 -0500
Subject: Support stubbing entry points without exposing the entire classpath

And use this for modello in maven.
---
 rules/maven/fix-build-xml.patch | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'rules/maven/fix-build-xml.patch')

diff --git a/rules/maven/fix-build-xml.patch b/rules/maven/fix-build-xml.patch
index 06e6580..b2b9a2a 100644
--- a/rules/maven/fix-build-xml.patch
+++ b/rules/maven/fix-build-xml.patch
@@ -28,16 +28,21 @@
      <!-- Pull the dependencies that Maven needs to build -->
      <copy file="pom.xml" tofile="dependencies.xml" />
      <replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-start-comment--&gt;" value="&lt;!--" />
-@@ -125,10 +128,14 @@
+@@ -125,10 +128,19 @@
        <localRepository path="${maven.repo.local}" />
        <dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}" />
      </artifact:dependencies>
 -
 +  </target>
 +  <target name="pull-cached" depends="init" if="skip.pull">
-+    <path id="pom.pathid"><pathelement path="${env.CLASSPATH}"/></path>
-+    <path id="modello.pathid"><pathelement path="${env.CLASSPATH}"/></path>
-+    <path id="pmdg.pathid"><pathelement path="${env.CLASSPATH}"/></path>
++    <!-- Fall back to the global env.CLASSPATH if unset -->
++    <property name="env.POM_CLASSPATH"     value="${env.CLASSPATH}"/>
++    <property name="env.MODELLO_CLASSPATH" value="${env.CLASSPATH}"/>
++    <property name="env.PMDG_CLASSPATH"    value="${env.CLASSPATH}"/>
++    <!-- Import the various classpaths -->
++    <path id="pom.pathid"    ><pathelement path="${env.POM_CLASSPATH}"    /></path>
++    <path id="modello.pathid"><pathelement path="${env.MODELLO_CLASSPATH}"/></path>
++    <path id="pmdg.pathid"   ><pathelement path="${env.PMDG_CLASSPATH}"   /></path>
    </target>
  
 -  <target name="process-classes" depends="pull" description="generates plexus component metadata.">
-- 
cgit v1.2.3-54-g00ecf