Return-Path: 
 <jdo-commits-return-3002-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
X-Original-To: apmail-db-jdo-commits-archive@www.apache.org
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4B87195A4
	for <apmail-db-jdo-commits-archive@www.apache.org>;
 Fri, 16 Mar 2012 17:29:23 +0000 (UTC)
Received: (qmail 85791 invoked by uid 500); 16 Mar 2012 17:29:23 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 85783 invoked by uid 99); 16 Mar 2012 17:29:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 17:29:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 17:29:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D9F65238890B;
	Fri, 16 Mar 2012 17:28:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1301658 - in /db/jdo/trunk: api/ api/src/main/
 api/src/main/resources/ api/src/main/resources/META-INF/ tck/ tck/src/main/
 tck/src/main/resources/ tck/src/main/resources/META-INF/
Date: Fri, 16 Mar 2012 17:28:59 -0000
To: jdo-commits@db.apache.org
From: madams@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120316172859.D9F65238890B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: madams
Date: Fri Mar 16 17:28:59 2012
New Revision: 1301658

URL: http://svn.apache.org/viewvc?rev=1301658&view=rev
Log:
JDO-710, Edit poms so that the maven eclipse plugin doesn't throw on import

Added:
    db/jdo/trunk/api/src/main/   (with props)
    db/jdo/trunk/api/src/main/resources/   (with props)
    db/jdo/trunk/api/src/main/resources/META-INF/   (with props)
    db/jdo/trunk/api/src/main/resources/META-INF/NOTICE.txt
    db/jdo/trunk/tck/src/main/   (with props)
    db/jdo/trunk/tck/src/main/resources/   (with props)
    db/jdo/trunk/tck/src/main/resources/META-INF/   (with props)
    db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt
Modified:
    db/jdo/trunk/api/pom.xml
    db/jdo/trunk/tck/pom.xml

Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1301658&r1=1301657&r2=1301658&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Fri Mar 16 17:28:59 2012
@@ -22,7 +22,6 @@
     <groupId>javax.jdo</groupId>
     <artifactId>root</artifactId>
     <version>3.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -38,10 +37,7 @@
     <resources>
       <resource>
         <targetPath>META-INF</targetPath>
-        <directory>${basedir}/..</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
+        <directory>src/main/resources</directory>
       </resource>
       <resource>
         <directory>${basedir}/src/java</directory>

Propchange: db/jdo/trunk/api/src/main/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: db/jdo/trunk/api/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: db/jdo/trunk/api/src/main/resources/META-INF/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: db/jdo/trunk/api/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/main/resources/META-INF/NOTICE.txt?rev=1301658&view=auto
==============================================================================
--- db/jdo/trunk/api/src/main/resources/META-INF/NOTICE.txt (added)
+++ db/jdo/trunk/api/src/main/resources/META-INF/NOTICE.txt Fri Mar 16 17:28:59 2012
@@ -0,0 +1,5 @@
+Apache Java Data Objects (JDO)
+Copyright 2005-2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1301658&r1=1301657&r2=1301658&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Fri Mar 16 17:28:59 2012
@@ -5,7 +5,6 @@
         <groupId>javax.jdo</groupId>
         <artifactId>root</artifactId>
         <version>3.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -25,9 +24,9 @@
         <resources>
             <resource>
                 <targetPath>META-INF</targetPath>
-                <directory>${basedir}/..</directory>
+                <directory>src/main/resources</directory>
                 <includes>
-                    <include>NOTICE.txt</include>
+                    <include>META-INF/NOTICE.txt</include>
                 </includes>
             </resource>
             <resource>

Propchange: db/jdo/trunk/tck/src/main/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: db/jdo/trunk/tck/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:number = true

Propchange: db/jdo/trunk/tck/src/main/resources/META-INF/
------------------------------------------------------------------------------
    bugtraq:number = true

Added: db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt?rev=1301658&view=auto
==============================================================================
--- db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt (added)
+++ db/jdo/trunk/tck/src/main/resources/META-INF/NOTICE.txt Fri Mar 16 17:28:59 2012
@@ -0,0 +1,5 @@
+Apache Java Data Objects (JDO)
+Copyright 2005-2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).