[jboss-cvs] JBossAS SVN: r93611 - in trunk: varia and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2009-09-16 09:39:45 -0400 (Wed, 16 Sep 2009)
New Revision: 93611

Modified:
   trunk/connector/pom.xml
   trunk/varia/pom.xml
Log:
JBAS-7243 Added a new profile in varia and connector to be activated for JDK 1.7

Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml	2009-09-16 13:34:26 UTC (rev 93610)
+++ trunk/connector/pom.xml	2009-09-16 13:39:45 UTC (rev 93611)
@@ -275,6 +275,33 @@
         </plugins>
       </build>
     </profile>
+    
+    <!-- Maven 2.0.x does not allow version ranges for <jdk> for activating profiles. 
+	    Maven 2.1 does http://maven.apache.org/guides/introduction/introduction-to-profiles.html
+	    So for Maven 2.0.x we create another profile which will do the same
+	    as the jdk6 profile, except that it will be activated for JDK 1.7 version -->
+    <profile>
+      <id>jdk7</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>1.7</source>
+              <target>1.7</target>
+              <excludes>
+                <exclude>org/jboss/resource/adapter/jdbc/jdk5/**</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+	    
   </profiles>
   
 </project>

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2009-09-16 13:34:26 UTC (rev 93610)
+++ trunk/varia/pom.xml	2009-09-16 13:39:45 UTC (rev 93611)
@@ -407,6 +407,32 @@
         </plugins>
       </build>
     </profile>
+	<!-- Maven 2.0.x does not allow version ranges for <jdk> for activating profiles. 
+	    Maven 2.1 does http://maven.apache.org/guides/introduction/introduction-to-profiles.html
+	    So for Maven 2.0.x we create another profile which will do the same
+	    as the jdk6 profile, except that it will be activated for JDK 1.7 version -->
+    <profile>
+      <id>jdk7</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.0.2</version>
+            <configuration>
+              <excludes>
+                <exclude>org/jboss/varia/stats/*JDK5.java</exclude>
+                <exclude>org/jboss/tm/plugins/tyrex/*.java</exclude>
+                <exclude>org/jboss/jdo/castor/*.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   
 </project>