geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r834166 - in /geronimo/plugins/openjpa2/branches/2.1: geronimo-persistence-jpa20/pom.xml pom.xml
Date Mon, 09 Nov 2009 18:22:31 GMT
Author: dwoods
Date: Mon Nov  9 18:22:30 2009
New Revision: 834166

URL: http://svn.apache.org/viewvc?rev=834166&view=rev
Log:
GERONIMO-4946 fix test runtime depends for 2.1

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

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml?rev=834166&r1=834165&r2=834166&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml Mon Nov  9 18:22:30
2009
@@ -91,13 +91,11 @@
             <scope>test</scope>
         </dependency>
 
-        <!--
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
-        -->
     </dependencies>
 
 </project>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=834166&r1=834165&r2=834166&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Mon Nov  9 18:22:30 2009
@@ -74,13 +74,36 @@
 
         <!-- set siteId to artifactId for any "top level" project website -->
         <siteId>openjpa2</siteId>
+        <site.deploy.url>scp://people.apache.org:/www/geronimo.apache.org</site.deploy.url>
 
          <!-- Plugins source-repository list-->
         <PluginSrcRepoLocal>~/.m2/repository/</PluginSrcRepoLocal>
         <PluginSrcRepoCentral>http://repo1.maven.org/maven2/</PluginSrcRepoCentral>
         <PluginSrcRepoApacheSnapshots>http://repository.apache.org/snapshots/</PluginSrcRepoApacheSnapshots>
+
+        <!-- New Nexus repo settings from apache-6.pom -->
+        <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+        <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+        <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
     </properties>
 
+    <distributionManagement>
+        <site>
+            <id>apache-website</id>
+            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+        </site>
+        <repository>
+            <id>apache.releases.https</id>
+            <name>Apache Release Distribution Repository</name>
+            <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+        </repository>
+        <snapshotRepository>
+            <id>apache.snapshots.https</id>
+            <name>${distMgmtSnapshotsName}</name>
+            <url>${distMgmtSnapshotsUrl}</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <dependencyManagement>
         <dependencies>
             <!-- Import Geronimo Server used dependency versions
@@ -179,9 +202,47 @@
                 <artifactId>geronimo-validation_1.0_spec</artifactId>
                 <version>${bvspecVersion}</version>
             </dependency>
+
+            <!-- for junit tests -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.5.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>1.5.5</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${geronimoVersion}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </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>



Mime
View raw message