[jboss-cvs] JBossAS SVN: r94560 - in projects/jpa/trunk: build and 1 other directory.

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

Author: wolfc
Date: 2009-10-09 05:56:42 -0400 (Fri, 09 Oct 2009)
New Revision: 94560

Modified:
   projects/jpa/trunk/build/pom.xml
   projects/jpa/trunk/pom.xml
Log:
JBJPA-15: added impl & spi to aggregator, moved JPA-2.0 profile to build


Modified: projects/jpa/trunk/build/pom.xml
===================================================================
--- projects/jpa/trunk/build/pom.xml	2009-10-09 09:15:02 UTC (rev 94559)
+++ projects/jpa/trunk/build/pom.xml	2009-10-09 09:56:42 UTC (rev 94560)
@@ -1,3 +1,6 @@
+<!--
+  vi:ts=2:sw=2:expandtab
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.jboss</groupId>
@@ -51,6 +54,7 @@
       <id>default</id>
       <activation>
         <activeByDefault>true</activeByDefault>
+        <property><name>!dummy</name></property>
       </activation>
       <properties>
         <jpa.outputDirectory>target/classes</jpa.outputDirectory>
@@ -85,5 +89,54 @@
         <jpa.testOutputDirectory>eclipse-target/tests-classes</jpa.testOutputDirectory>
       </properties>
     </profile>
+
+    <profile>
+      <id>JPA-1.0</id>
+      <activation>
+        <property><name>!dummy</name></property>
+      </activation>
+      <properties>
+        <JPA.groupId>org.hibernate</JPA.groupId>
+        <JPA.artifactId>ejb3-persistence</JPA.artifactId>
+        <JPA.version>1.0.2.GA</JPA.version>
+        <version.org.hibernate.hibernate-entitymanager>3.4.0.GA</version.org.hibernate.hibernate-entitymanager>
+      </properties>
+    </profile>
+    <profile>
+      <id>JPA-2.0</id>
+      <activation>
+        <property><name>JPA-2.0</name></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>obsoletes-org.hibernate:ejb3-persistence</id>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <bannedDependencies>
+                      <excludes>
+                        <exclude>org.hibernate:ejb3-persistence</exclude>
+                      </excludes>
+                    </bannedDependencies>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <JPA.groupId>org.hibernate.persistence</JPA.groupId>
+        <JPA.artifactId>jpa-api</JPA.artifactId>
+        <JPA.version>2.0.Beta-20090815</JPA.version>
+        <version.org.hibernate.hibernate-entitymanager>3.5.0.Beta-1</version.org.hibernate.hibernate-entitymanager>
+      </properties>
+    </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: projects/jpa/trunk/pom.xml
===================================================================
--- projects/jpa/trunk/pom.xml	2009-10-09 09:15:02 UTC (rev 94559)
+++ projects/jpa/trunk/pom.xml	2009-10-09 09:56:42 UTC (rev 94560)
@@ -20,29 +20,7 @@
   <modules>
     <module>build</module>
     <module>deployers</module>
+    <module>impl</module>
+    <module>spi</module>
   </modules>
-
-  <profiles>
-    <profile>
-      <id>JPA-1.0</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <JPA.version>1.0.0</JPA.version>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>JPA-2.0</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <JPA.version>2.0.Beta-20090815</JPA.version>
-      </properties>
-    </profile>
-
-  </profiles>
-
 </project>