db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
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 GMT
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/).



Mime
View raw message