geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r834132 - in /geronimo/plugins/openjpa2/branches/2.2: openjpa2/pom.xml persistence-jpa20-deployer/pom.xml pom.xml
Date Mon, 09 Nov 2009 16:17:47 GMT
Author: dwoods
Date: Mon Nov  9 16:17:39 2009
New Revision: 834132

URL: http://svn.apache.org/viewvc?rev=834132&view=rev
Log:
GERONIMO-4946 plugin updates

Modified:
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml?rev=834132&r1=834131&r2=834132&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml Mon Nov  9 16:17:39 2009
@@ -86,16 +86,24 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
                     <category>Persistence</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.configs</groupId>
                                 <artifactId>openjpa</artifactId>
                             </obsoletes>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>openjpa2</artifactId>
+                            </obsoletes>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/openjpa/${version}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>

Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml?rev=834132&r1=834131&r2=834132&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml Mon Nov  9 16:17:39
2009
@@ -33,7 +33,7 @@
     <name>Geronimo Plugins, OpenJPA2 :: Deployer</name>
     <packaging>car</packaging>
 
-    <description>Geronimo Persistence Unit deployer</description>
+    <description>Geronimo JPA 1.0 Persistence Unit deployer</description>
 
     <dependencies>
         <dependency>
@@ -54,6 +54,7 @@
             <artifactId>transaction</artifactId>
             <type>car</type>
             <version>${geronimoVersion}</version>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -68,6 +69,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
+                            <version>${geronimoVersion}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/plugins/openjpa2/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/pom.xml?rev=834132&r1=834131&r2=834132&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/pom.xml Mon Nov  9 16:17:39 2009
@@ -22,18 +22,18 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plugins</artifactId>
-        <version>2.2-SNAPSHOT</version>
-    </parent>
-<!--
+    <!--
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
         <artifactId>genesis-java5-flava</artifactId>
         <version>2.0</version>
     </parent>
--->
+    -->
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>openjpa2</artifactId>
@@ -43,20 +43,24 @@
     <name>Geronimo Plugins, OpenJPA2</name>
     <description>Apache OpenJPA2 plugin</description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.2</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2</url>
+    </scm>
+
     <properties>
-        <!-- local overrides for default 2.2 Server provided versions -->
         <openjpa2Version>2.0.0-M3</openjpa2Version>
         <jpa2specVersion>1.0-PFD2</jpa2specVersion>
         <bvspecVersion>1.0-CR5</bvspecVersion>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- set siteId to artifactId for any "top level" project rooting a website -->
+        <siteId>openjpa2</siteId>
+
         <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
     </properties>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.2</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.2</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2</url>
-    </scm>
-
     <dependencyManagement>
         <dependencies>
             <!-- Import Geronimo Server used dependency versions
@@ -69,6 +73,7 @@
             </dependency>
             -->
 
+            <!-- project depends -->
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
@@ -157,14 +162,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>geronimo-openjpa2</module>
-        <module>geronimo-persistence-jpa20</module>
-        <module>geronimo-persistence-jpa20-builder</module>
-        <module>openjpa2</module>
-        <module>persistence-jpa20-deployer</module>
-    </modules>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -172,10 +169,40 @@
             <version>${geronimoVersion}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
+    <modules>
+        <module>geronimo-openjpa2</module>
+        <module>geronimo-persistence-jpa20</module>
+        <module>geronimo-persistence-jpa20-builder</module>
+        <module>openjpa2</module>
+        <module>persistence-jpa20-deployer</module>
+    </modules>
+
     <build>
         <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <version>${geronimoVersion}</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -184,9 +211,28 @@
                 <extensions>true</extensions>
                 <configuration>
                     <category>Persistence</category>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <osiApproved>true</osiApproved>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                        <useTransitiveDependencies>true</useTransitiveDependencies>
+                    </useMavenDependencies>
+                    <commonInstance>
+                        <plugin-artifact>
+                            <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <jvm-version>1.5</jvm-version>
+                            <jvm-version>1.6</jvm-version>
+                            <source-repository>${PluginSrcRepoLocal}</source-repository>
+                            <source-repository>${PluginSrcRepoCentral}</source-repository>
+                            <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
+                        </plugin-artifact>
+                    </commonInstance>
                 </configuration>
             </plugin>
         </plugins>
-        </pluginManagement>
     </build>
 </project>



Mime
View raw message