You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2006/06/17 21:23:24 UTC
svn commit: r415048 - in /db/jdo/trunk: ./ api11/ api20/ core20/ enhancer20/
fostore20/ query20/ ri11/ runtime20/ tck11/ tck20/
Author: mbo
Date: Sat Jun 17 12:23:23 2006
New Revision: 415048
URL: http://svn.apache.org/viewvc?rev=415048&view=rev
Log:
JDO-386: source and binary distribution need to include NOTICE file; removed duplicated LICENSE file
Removed:
db/jdo/trunk/api11/LICENSE.txt
db/jdo/trunk/api20/LICENSE.txt
db/jdo/trunk/core20/LICENSE.txt
db/jdo/trunk/enhancer20/LICENSE.txt
db/jdo/trunk/fostore20/LICENSE.txt
db/jdo/trunk/query20/LICENSE.txt
db/jdo/trunk/ri11/LICENSE.txt
db/jdo/trunk/tck20/LICENSE.txt
Modified:
db/jdo/trunk/api11/project.xml
db/jdo/trunk/api20/project.xml
db/jdo/trunk/core20/project.xml
db/jdo/trunk/enhancer20/project.xml
db/jdo/trunk/fostore20/project.xml
db/jdo/trunk/maven.xml
db/jdo/trunk/project.properties
db/jdo/trunk/query20/project.xml
db/jdo/trunk/ri11/project.xml
db/jdo/trunk/runtime20/project.xml
db/jdo/trunk/tck11/project.xml
db/jdo/trunk/tck20/project.xml
Modified: db/jdo/trunk/api11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api11/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/api11/project.xml (original)
+++ db/jdo/trunk/api11/project.xml Sat Jun 17 12:23:23 2006
@@ -60,6 +60,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>javax/jdo/*.properties</include>
Modified: db/jdo/trunk/api20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/api20/project.xml (original)
+++ db/jdo/trunk/api20/project.xml Sat Jun 17 12:23:23 2006
@@ -85,6 +85,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>javax/jdo/*.properties</include>
Modified: db/jdo/trunk/core20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/core20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/core20/project.xml (original)
+++ db/jdo/trunk/core20/project.xml Sat Jun 17 12:23:23 2006
@@ -49,6 +49,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.properties</include>
Modified: db/jdo/trunk/enhancer20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.xml (original)
+++ db/jdo/trunk/enhancer20/project.xml Sat Jun 17 12:23:23 2006
@@ -59,6 +59,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.properties</include>
Modified: db/jdo/trunk/fostore20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.xml (original)
+++ db/jdo/trunk/fostore20/project.xml Sat Jun 17 12:23:23 2006
@@ -125,6 +125,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.properties</include>
Modified: db/jdo/trunk/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/maven.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/maven.xml (original)
+++ db/jdo/trunk/maven.xml Sat Jun 17 12:23:23 2006
@@ -171,16 +171,29 @@
<!-- ==================== -->
<preGoal name="dist:build-src">
- <echo>Copying top-level project.xml, project.properties, and README.txt to ${maven.dist.src.archive.dir}</echo>
+ <echo>Copying top-level project.xml, project.properties, LICENSE.txt, NOTICE.txt, and README.txt to ${maven.dist.src.archive.dir}</echo>
<copy toDir="${maven.dist.src.archive.dir}">
<fileset dir="${basedir}/..">
<include name="project.properties"/>
<include name="project.xml"/>
<include name="README.txt"/>
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
</fileset>
</copy>
<echo>Creating ${maven.dist.src.archive.dir}/lib/ext</echo>
<mkdir dir="${maven.dist.src.archive.dir}/lib/ext"/>
+ </preGoal>
+
+ <preGoal name="dist:build-bin">
+ <echo>Copying top-level LICENSE.txt, NOTICE.txt, and README.txt to ${maven.dist.bin.archive.dir}</echo>
+ <copy toDir="${maven.dist.bin.archive.dir}">
+ <fileset dir="${basedir}/..">
+ <include name="README.txt"/>
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </copy>
</preGoal>
<postGoal name="dist">
Modified: db/jdo/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/project.properties?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/project.properties (original)
+++ db/jdo/trunk/project.properties Sat Jun 17 12:23:23 2006
@@ -18,8 +18,12 @@
maven.compile.source = 1.3
maven.compile.target = 1.3
+# refer to LICENSE file in root directory
+maven.license.licenseFile = ${basedir}/../LICENSE.txt
+
# checkstyle settings
maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+maven.checkstyle.header.file = ${basedir}/../LICENSE.txt
# changelog settings
maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
Modified: db/jdo/trunk/query20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/query20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/query20/project.xml (original)
+++ db/jdo/trunk/query20/project.xml Sat Jun 17 12:23:23 2006
@@ -70,6 +70,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.properties</include>
Modified: db/jdo/trunk/ri11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.xml (original)
+++ db/jdo/trunk/ri11/project.xml Sat Jun 17 12:23:23 2006
@@ -105,6 +105,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.properties</include>
Modified: db/jdo/trunk/runtime20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/project.xml (original)
+++ db/jdo/trunk/runtime20/project.xml Sat Jun 17 12:23:23 2006
@@ -73,6 +73,13 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.properties</include>
Modified: db/jdo/trunk/tck11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.xml (original)
+++ db/jdo/trunk/tck11/project.xml Sat Jun 17 12:23:23 2006
@@ -103,13 +103,18 @@
<sourceDirectory>test/java</sourceDirectory>
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
- <resources>
<resource>
<directory>${basedir}/test/conf</directory>
<includes>
Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Sat Jun 17 12:23:23 2006
@@ -150,6 +150,13 @@
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
+ <directory>${basedir}/..</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/src/java</directory>
<includes>
<include>**/*.xml</include>