abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r644564 - in /incubator/abdera/java/branches/abdera-0.4.0-incubating: ./ dependencies/legal/ distribution/src/main/appended-resources/META-INF/ distribution/src/main/assembly/ extensions/json/src/main/resources/META-INF/
Date Fri, 04 Apr 2008 00:21:46 GMT
Author: dandiep
Date: Thu Apr  3 17:21:38 2008
New Revision: 644564

URL: http://svn.apache.org/viewvc?rev=644564&view=rev
Log:
Remove the top level NOTICE file so we don't have things in two places.
It isn't required to be there.  

Name json-lib.txt to json-lib-LICENSE.txt

Remove redundant htmlparser/serializer licenses in extensions/json

Update to the latest maven-remote-resources plugin so our NOTICE files
are correct.

Update the NOTICE file to tell users about the other licenses in the 
lib/ directory.


Added:
    incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS   (with props)
    incubator/abdera/java/branches/abdera-0.4.0-incubating/dependencies/legal/json-lib-LICENSE.txt
      - copied unchanged from r644541, incubator/abdera/java/branches/abdera-0.4.0-incubating/dependencies/legal/json-lib.txt
Removed:
    incubator/abdera/java/branches/abdera-0.4.0-incubating/NOTICE
    incubator/abdera/java/branches/abdera-0.4.0-incubating/dependencies/legal/json-lib.txt
    incubator/abdera/java/branches/abdera-0.4.0-incubating/extensions/json/src/main/resources/META-INF/LICENSE.htmlparser.txt
    incubator/abdera/java/branches/abdera-0.4.0-incubating/extensions/json/src/main/resources/META-INF/LICENSE.serializer.txt
    incubator/abdera/java/branches/abdera-0.4.0-incubating/extensions/json/src/main/resources/META-INF/NOTICE.htmlparser.txt
    incubator/abdera/java/branches/abdera-0.4.0-incubating/extensions/json/src/main/resources/META-INF/NOTICE.serializer.txt
Modified:
    incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/NOTICE
    incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/bin.xml
    incubator/abdera/java/branches/abdera-0.4.0-incubating/pom.xml

Added: incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS?rev=644564&view=auto
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS (added)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS Thu Apr  3 17:21:38 2008
@@ -0,0 +1,34 @@
+pub   1024D/16FE71A2 2008-04-03
+uid   Dan Diephouse (Apache Release Signing Key) <dandiep@apache.org>
+sub   2048g/270FDB18 2008-04-03
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (Cygwin)
+
+mQGiBEf1ZGcRBACiIRqxwq3IwxyHKzeCh/ttBYcFOdGFcGONZnRaNuQJrVtz8/vZ
+pqrBKI/9FBjYikLUWvRuvEt5ddcc1gKiWys6ACi6n7DdowIRQsnzSwwV4GUphoe5
++pT6ojj1iKy/7H26ZruxBvaBOJV4uPaVGftRly8mSuOUwm0gAVrHWO6ApwCgjKQE
+llws4suP22HVGeN1WfN0Kf0D/AtLngPb/fQE+c6ifs/5HMyD4FTL56BShKb4pFgK
+p704Xss2oLfm1gLgrBnxv6ffz2DTuuq+Upi9RW+wDzlYgkGD5lmrCGezF2uCwQPc
+kZbIAJAeMQCHYQaXsL82duPYYamIfsjsJwbm/Msn2dQb4nv557kKyeH1ZJMebQuD
+8jguA/0ZK2YThP1OYH7GGG/KS0qc8hTgoFERry2+4dJS0J0kDg1Jok8HXvQHgrRK
+5PVN2pe0yMOvaiOlsTNFlPFvBAhCGFzZ/LgoL5CRpa3+HFQU512y3K2m6zwMVSCl
+vqmxxhE9NkUbxs/Qyb8ejtBsMzP/DOTqSx+4Xknf9Qugx+mt/7Q/RGFuIERpZXBo
+b3VzZSAoQXBhY2hlIFJlbGVhc2UgU2lnbmluZyBLZXkpIDxkYW5kaWVwQGFwYWNo
+ZS5vcmc+iGAEExECACAFAkf1ZGcCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
+CRBLG91tFv5xog/nAJ0Zy1ykPNWfnhQnixj1elwOF7sLTQCeP+X+pp8MTEIW2Dce
+3R2nEQ1F60i5Ag0ER/VkZxAIAMS0dURsdvrylLF3QQ5hvYlCuIGA1KgZtED34Zlc
+Y6ndW2fgQGXdyUOwbQszc9BEPoRd6JQD8Ulm7OKQjL2Di8cwL94GdIlO2Tgq7aCQ
+B/yWjEMh0oz4kOgPEdaO1w+6c7K0goteVgImU8BJfwbG7gs348zsUfhZWtyYZhaK
+ybCEd+GtUMgsOfwJjQZ6vJsQ+lCKJ/sv55FtNrSiaF0fEnX8Y8jopb39+DYPrhEv
+6L39vTjglP5A/zMJ+nX5R5xvgwDMWiJAv/Jf0YqNNjQpk5X5Sfk8s1renzN0499y
+eSQ0UfYgQTBb4sdbfGrULx3UHSHHocI3/NsHDYS9GGSHGY8AAwUH/j1JlGakr17B
+R1LkRqBWEXft0f+tjZAsKeVO9n8nU240CpklB5okZ2+yOIAvqjztMMtzbiicMSFY
+hGARja7pM5rTHZ+VTnt11D+ntvCoyqy++AfFqG8/2iXyoLhys325CyigF3JEa1F9
+theRJWyhR6gGKWH5I9yfuLsHBkC6DoygRw7XSOpVMYpNb44V/bwGzfOXgOhdORJA
+oy0d+KzRTzZGgSlWQ9JjVzeGUBpn5GeGKsOURQKS3FpgSJ0vARKtOKNVk1LTDv9G
+r8ua6/pW+ES0FNS2DEaVumldogTZCeNJu6grYvqdOk1+2Pzwjc7NUPdbmlEKUHno
+vXcMrsb1kGGISQQYEQIACQUCR/VkZwIbDAAKCRBLG91tFv5xol/dAJ99iplD6ys6
+CbWZmqfLYguoUIJ8GgCgii5/S9FZVC0vbHINlijt0ugFhiw=
+=LwSy
+-----END PGP PUBLIC KEY BLOCK-----

Propchange: incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/abdera/java/branches/abdera-0.4.0-incubating/KEYS
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/NOTICE?rev=644564&r1=644563&r2=644564&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/NOTICE
(original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/NOTICE
Thu Apr  3 17:21:38 2008
@@ -58,3 +58,9 @@
 these Data Files or Software without prior written authorization of the 
 copyright holder.
 
+====
+
+Additional copyright notices and license terms applicable are
+present in the lib directory of this distribution.
+
+

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=644564&r1=644563&r2=644564&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
Thu Apr  3 17:21:38 2008
@@ -39,10 +39,11 @@
             <directory>target/maven-shared-archive-resources/META-INF</directory>
             <outputDirectory>apache-abdera-${version}/</outputDirectory>
             <includes>
-                <include>NOTICE</include>
-                <include>DISCLAIMER</include>
-                <include>LICENSE</include>
+                <include>*</include>
             </includes>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>../docs</directory>

Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/pom.xml?rev=644564&r1=644563&r2=644564&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/pom.xml (original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/pom.xml Thu Apr  3 17:21:38 2008
@@ -150,7 +150,7 @@
       </plugin>
       <plugin>
           <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.0-beta-2</version>
+          <version>1.0</version>
           <executions>
               <execution>
                   <id>compile</id>
@@ -160,7 +160,7 @@
                   <configuration>
                       <resourceBundles>
                           <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-                          <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+                          <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
                       </resourceBundles>
                       <supplementalModels>
                           <supplementalModel>${topDir}/etc/notice-supplements.xml</supplementalModel>
@@ -213,6 +213,19 @@
             </excludes>
           </configuration>
         </plugin>
+              <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin> 
       </plugins>
     </pluginManagement>    
   </build>
@@ -374,7 +387,7 @@
     <repository>
       <id>apache.snapshots</id>
       <name>Apache Incubating Repository</name>
-      <url>scpexe://people.apache.org/home/dandiep/public_html/abdera-take5</url>
+      <url>scpexe://netzooid.com/home/dan/public_html/abdera-take7</url>
     </repository>
   </distributionManagement>
 



Mime
View raw message