You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by da...@apache.org on 2008/03/24 23:34:41 UTC
svn commit: r640612 - in
/incubator/abdera/java/branches/abdera-0.4.0-incubating:
adapters/couchdb/pom.xml distribution/src/main/assembly/bin.xml
distribution/src/main/assembly/src.xml
Author: dandiep
Date: Mon Mar 24 15:34:23 2008
New Revision: 640612
URL: http://svn.apache.org/viewvc?rev=640612&view=rev
Log:
Merge distribution fixes.
Modified:
incubator/abdera/java/branches/abdera-0.4.0-incubating/adapters/couchdb/pom.xml
incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/bin.xml
incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml
Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/adapters/couchdb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/adapters/couchdb/pom.xml?rev=640612&r1=640611&r2=640612&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/adapters/couchdb/pom.xml (original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/adapters/couchdb/pom.xml Mon Mar 24 15:34:23 2008
@@ -41,13 +41,17 @@
</dependency>
<dependency>
- <groupId>couchdb4j</groupId>
+ <groupId>com.google.code</groupId>
<artifactId>couchdb4j</artifactId>
<version>0.1.2</version>
- <scope>system</scope>
- <systemPath>
- ${basedir}/repository/couchdb4j-0.1.2.jar
- </systemPath>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>dandiep.apache</id>
+ <name>Temporary repo for couchdb4j until it ends up on central.</name>
+ <url>http://people.apache.org/~dandiep/repo/</url>
+ </repository>
+ </repositories>
</project>
Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/bin.xml?rev=640612&r1=640611&r2=640612&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/bin.xml (original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/bin.xml Mon Mar 24 15:34:23 2008
@@ -39,7 +39,9 @@
<directory>target/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>apache-abdera-${version}/</outputDirectory>
<includes>
- <include>*</include>
+ <include>NOTICE</include>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
</includes>
</fileSet>
<fileSet>
@@ -71,7 +73,6 @@
<include>**/*</include>
</includes>
</fileSet>
-
</fileSets>
<dependencySets>
<dependencySet>
Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml?rev=640612&r1=640611&r2=640612&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml (original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml Mon Mar 24 15:34:23 2008
@@ -29,15 +29,6 @@
<fileSets>
<fileSet>
- <directory></directory>
- <outputDirectory>apache-abdera-${version}-src</outputDirectory>
- <includes>
- <include>dependencies/legal/*.*</include>
- <include>README</include>
- <include>BUILDING</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>src/main/release</directory>
<outputDirectory>apache-abdera-${version}/</outputDirectory>
<includes>
@@ -45,13 +36,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>apache-abdera-${version}-src</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>..</directory>
<outputDirectory>apache-abdera-${version}-src</outputDirectory>
<includes>
@@ -60,6 +44,9 @@
<excludes>
<exclude>**/target</exclude>
<exclude>**/target/**/*</exclude>
+ <exclude>**/repository</exclude>
+ <exclude>**/repository/**/*</exclude>
+ <exclude>**/derby.log</exclude>
<exclude>**/.settings</exclude>
<exclude>**/.pmd</exclude>
<exclude>**/.checkstyle</exclude>