Author: brett
Date: Wed Jan  3 20:26:58 2007
New Revision: 492407

URL: http://svn.apache.org/viewvc?view=rev&rev=492407
Log:
fix compilation

Modified:
    maven/surefire/trunk/maven-surefire-plugin/pom.xml
    maven/surefire/trunk/surefire-booter/pom.xml

Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?view=diff&rev=492407&r1=492406&r2=492407
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Wed Jan  3 20:26:58 2007
@@ -115,4 +115,24 @@
       <version>2.0</version>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->
+    <profile>
+      <id>jdk1.3</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                <fork>false</fork>
+                <compilerVersion>1.4</compilerVersion>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
 </project>

Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?view=diff&rev=492407&r1=492406&r2=492407
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Wed Jan  3 20:26:58 2007
@@ -34,14 +34,13 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
       <version>1.0-alpha-7</version>
-      <exclusions> <!-- exclude plexus-utils since it's 1.2 and we need 1.1 -->
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>


Reply via email to