You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/09/05 21:57:45 UTC
svn commit: r692522 -
/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
Author: dwoods
Date: Fri Sep 5 12:57:45 2008
New Revision: 692522
URL: http://svn.apache.org/viewvc?rev=692522&view=rev
Log:
merge in updates from trunk to add missing depends
Modified:
geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
Modified: geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=692522&r1=692521&r2=692522&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Fri Sep 5 12:57:45 2008
@@ -48,13 +48,44 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Re: svn commit: r692522 - /geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
Posted by Donald Woods <dw...@apache.org>.
The original depends were added based on compile failures and what was
listed in the openjpa poms as dependencies. Jarek checked in some
changes yesterday, which I haven't tried building yet. I was focused in
getting 2.1.3 out before I spent any time looking at 2.1.4-SNAPSHOT...
-Donald
Kevan Miller wrote:
> Donald,
> Not sure why this was merged into branches/2.1. However, it's been
> breaking branches/2.1 builds since...
>
> Removing the org.sl4j dependency seems to fix the problem.
>
> --kevan
>
> On Sep 5, 2008, at 3:57 PM, dwoods@apache.org <ma...@apache.org>
> wrote:
>
>> Author: dwoods
>> Date: Fri Sep 5 12:57:45 2008
>> New Revision: 692522
>>
>> URL: http://svn.apache.org/viewvc?rev=692522&view=rev
>> <http://svn.apache.org/viewvc?rev=692522&view=rev>
>> Log:
>> merge in updates from trunk to add missing depends
>>
>> Modified:
>> geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
>>
>> Modified:
>> geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=692522&r1=692521&r2=692522&view=diff
>> <http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=692522&r1=692521&r2=692522&view=diff>
>> ==============================================================================
>> ---
>> geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
>> (original)
>> +++
>> geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
>> Fri Sep 5 12:57:45 2008
>> @@ -48,13 +48,44 @@
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> + <artifactId>geronimo-jta_1.1_spec</artifactId>
>> + <scope>provided</scope>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-jpa_3.0_spec</artifactId>
>> </dependency>
>> <dependency>
>> + <groupId>org.apache.geronimo.specs</groupId>
>> + <artifactId>geronimo-ejb_3.0_spec</artifactId>
>> + <scope>provided</scope>
>> + </dependency>
>> + <dependency>
>> <groupId>org.apache.openjpa</groupId>
>> <artifactId>openjpa</artifactId>
>> <scope>test</scope>
>> </dependency>
>> + <dependency>
>> + <groupId>commons-collections</groupId>
>> + <artifactId>commons-collections</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>commons-lang</groupId>
>> + <artifactId>commons-lang</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>net.sourceforge.serp</groupId>
>> + <artifactId>serp</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.slf4j</groupId>
>> + <artifactId>jcl104-over-slf4j</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> </dependencies>
>>
>> </project>
>>
>>
>
Re: svn commit: r692522 - /geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
Posted by Kevan Miller <ke...@gmail.com>.
Donald,
Not sure why this was merged into branches/2.1. However, it's been
breaking branches/2.1 builds since...
Removing the org.sl4j dependency seems to fix the problem.
--kevan
On Sep 5, 2008, at 3:57 PM, dwoods@apache.org wrote:
> Author: dwoods
> Date: Fri Sep 5 12:57:45 2008
> New Revision: 692522
>
> URL: http://svn.apache.org/viewvc?rev=692522&view=rev
> Log:
> merge in updates from trunk to add missing depends
>
> Modified:
> geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-
> jpa10/pom.xml
>
> Modified: geronimo/server/branches/2.1/plugins/openjpa/geronimo-
> persistence-jpa10/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=692522&r1=692521&r2=692522&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/plugins/openjpa/geronimo-
> persistence-jpa10/pom.xml (original)
> +++ geronimo/server/branches/2.1/plugins/openjpa/geronimo-
> persistence-jpa10/pom.xml Fri Sep 5 12:57:45 2008
> @@ -48,13 +48,44 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-jta_1.1_spec</artifactId>
> + <scope>provided</scope>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jpa_3.0_spec</artifactId>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-ejb_3.0_spec</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> <groupId>org.apache.openjpa</groupId>
> <artifactId>openjpa</artifactId>
> <scope>test</scope>
> </dependency>
> + <dependency>
> + <groupId>commons-collections</groupId>
> + <artifactId>commons-collections</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>commons-lang</groupId>
> + <artifactId>commons-lang</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>net.sourceforge.serp</groupId>
> + <artifactId>serp</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>jcl104-over-slf4j</artifactId>
> + <scope>test</scope>
> + </dependency>
> </dependencies>
>
> </project>
>
>