--- a/apps/blank/maven-build.xml
+++ b/apps/blank/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
@@ -153,7 +153,7 @@
           description="Compile the test code" 
           unless="maven.test.skip">
     <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
+    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false"
@@ -159,6 +159,7 @@
         <path refid="build.test.classpath"/>
         <pathelement location="${maven.build.outputDir}"/>
         <pathelement location="${maven.build.testOutputDir}"/>
+        <pathelement path="${gentoo.test.classpath}" />
       </classpath>
       <batchtest todir="${maven.test.reports}" unless="test">
         <fileset dir="${maven.build.testDir.0}"> 
--- a/apps/mailreader/maven-build.xml
+++ b/apps/mailreader/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
--- a/apps/portlet/maven-build.xml
+++ b/apps/portlet/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
@@ -153,7 +153,7 @@
           description="Compile the test code" 
           unless="maven.test.skip">
     <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
+    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false"
@@ -159,6 +159,7 @@
         <path refid="build.test.classpath"/>
         <pathelement location="${maven.build.outputDir}"/>
         <pathelement location="${maven.build.testOutputDir}"/>
+        <pathelement path="${gentoo.test.classpath}" />
       </classpath>
       <batchtest todir="${maven.test.reports}" unless="test">
         <fileset dir="${maven.build.testDir.0}"> 
--- a/apps/showcase/maven-build.xml
+++ b/apps/showcase/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
@@ -153,7 +153,7 @@
           description="Compile the test code" 
           unless="maven.test.skip">
     <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
+    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false"
@@ -159,6 +159,7 @@
         <path refid="build.test.classpath"/>
         <pathelement location="${maven.build.outputDir}"/>
         <pathelement location="${maven.build.testOutputDir}"/>
+        <pathelement path="${gentoo.test.classpath}" />
       </classpath>
       <batchtest todir="${maven.test.reports}" unless="test">
         <fileset dir="${maven.build.testDir.0}"> 
--- a/apps/rest-showcase/maven-build.xml
+++ b/apps/rest-showcase/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
@@ -153,7 +153,7 @@
           description="Compile the test code" 
           unless="maven.test.skip">
     <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
+    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false"
@@ -159,6 +159,7 @@
         <path refid="build.test.classpath"/>
         <pathelement location="${maven.build.outputDir}"/>
         <pathelement location="${maven.build.testOutputDir}"/>
+        <pathelement path="${gentoo.test.classpath}" />
       </classpath>
       <batchtest todir="${maven.test.reports}" unless="test">
         <fileset dir="${maven.build.testDir.0}"> 
--- a/bundles/admin/maven-build.xml
+++ b/bundles/admin/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
@@ -153,7 +153,7 @@
           description="Compile the test code" 
           unless="maven.test.skip">
     <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
+    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false"
@@ -159,6 +159,7 @@
         <path refid="build.test.classpath"/>
         <pathelement location="${maven.build.outputDir}"/>
         <pathelement location="${maven.build.testOutputDir}"/>
+        <pathelement path="${gentoo.test.classpath}" />
       </classpath>
       <batchtest todir="${maven.test.reports}" unless="test">
         <fileset dir="${maven.build.testDir.0}"> 
--- a/bundles/demo/maven-build.xml
+++ b/bundles/demo/maven-build.xml
@@ -125,7 +125,7 @@
 
   <target name="compile" depends="get-deps" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
+    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
            nowarn="false" 
            debug="true" 
            optimize="false" 
