abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r640609 - in /incubator/abdera/java/trunk/distribution: pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml
Date Mon, 24 Mar 2008 22:28:25 GMT
Author: dandiep
Date: Mon Mar 24 15:28:23 2008
New Revision: 640609

URL: http://svn.apache.org/viewvc?rev=640609&view=rev
Log:
Fix problems with duplicate notices. We don't need to have the generated NOTICE file in the
source distro as we aren't actually redistributing any libraries there.

Modified:
    incubator/abdera/java/trunk/distribution/pom.xml
    incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml
    incubator/abdera/java/trunk/distribution/src/main/assembly/src.xml

Modified: incubator/abdera/java/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/distribution/pom.xml?rev=640609&r1=640608&r2=640609&view=diff
==============================================================================
--- incubator/abdera/java/trunk/distribution/pom.xml (original)
+++ incubator/abdera/java/trunk/distribution/pom.xml Mon Mar 24 15:28:23 2008
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.apache.abdera</groupId>
         <artifactId>abdera</artifactId>
-        <version>0.4.0-incubating-SNAPSHOT</version>
+        <version>0.5.0-incubating-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>abdera-distribution</artifactId>
+    <artifactId>apache-abdera</artifactId>
     <packaging>pom</packaging>
     <name>Abdera Distribution</name>
-    <version>0.4.0-incubating-SNAPSHOT</version>
+    <version>0.5.0-incubating-SNAPSHOT</version>
 
     <properties>
         <topDir>${basedir}/..</topDir>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-bundle</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <!-- Silly hack because only want to include this in some dependency sets
-->
             <scope>test</scope>
         </dependency>
@@ -46,47 +46,47 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-client</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-server</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-spring</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-jcr</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-couchdb</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-filesystem</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-jdbc</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-security</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
             <exclusions>
               <exclusion>
                 <groupId>bouncycastle</groupId>
@@ -97,57 +97,57 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-gdata</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-geo</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-html</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-json</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-main</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-media</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-oauth</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-opensearch</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-serializer</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-sharing</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-wsse</artifactId>
-            <version>0.4.0-incubating-SNAPSHOT</version>
+            <version>0.5.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.mortbay.jetty</groupId>

Modified: incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml?rev=640609&r1=640608&r2=640609&view=diff
==============================================================================
--- incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml Mon Mar 24 15:28: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/trunk/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/distribution/src/main/assembly/src.xml?rev=640609&r1=640608&r2=640609&view=diff
==============================================================================
--- incubator/abdera/java/trunk/distribution/src/main/assembly/src.xml (original)
+++ incubator/abdera/java/trunk/distribution/src/main/assembly/src.xml Mon Mar 24 15:28: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>



Mime
View raw message