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/04/04 03:01:50 UTC
svn commit: r644566 - in
/incubator/abdera/java/branches/abdera-0.4.0-incubating:
dependencies/legal/log4j-LICENSE.txt
distribution/src/main/appended-resources/META-INF/LICENSE.vm
distribution/src/main/assembly/src.xml pom.xml
Author: dandiep
Date: Thu Apr 3 18:01:50 2008
New Revision: 644566
URL: http://svn.apache.org/viewvc?rev=644566&view=rev
Log:
Fix top level pom to use the right url. Properly generate a LICENSE file for the distribution which only includes additional license notices for the non-ASL licenses.
Added:
incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm (with props)
Removed:
incubator/abdera/java/branches/abdera-0.4.0-incubating/dependencies/legal/log4j-LICENSE.txt
Modified:
incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml
incubator/abdera/java/branches/abdera-0.4.0-incubating/pom.xml
Added: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm?rev=644566&view=auto
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm Thu Apr 3 18:01:50 2008
@@ -0,0 +1,41 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
+##
+
+Apache Abdera includes a number of components and libraries with
+separate copyright notices and license terms. Your use of those
+components are subject to the terms and conditions of the following
+licenses.
+
+#set ( $apacheTxt1 = "The Apache Software License, Version 2.0" )
+#set ( $apacheTxt2 = "Apache License" )
+#set ( $apacheTxt3 = "Apache License Version 2.0" )
+
+#foreach ( $project in $projects )
+#foreach ( $license in $project.licenses)
+#if ( ! ($apacheTxt1 == $license.name) &&! ($apacheTxt2 == $license.name) &&! ($apacheTxt3 == $license.name) )
+
+$project.name #if ($project.url)($project.url)#end $project.artifact
+ License: $license.name #if ($license.url) ($license.url)#end
+
+#end
+#end
+#end
+
Propchange: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=644566&r1=644565&r2=644566&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 Thu Apr 3 18:01:50 2008
@@ -56,6 +56,7 @@
<exclude>**/.project</exclude>
<exclude>**/.wtpmodules</exclude>
<exclude>**/surefire*</exclude>
+ <exclude>**/velocity.log</exclude>
<exclude>**/cobertura.ser</exclude>
<exclude>**/.svn</exclude>
<exclude>bin</exclude>
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=644566&r1=644565&r2=644566&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 18:01:50 2008
@@ -61,7 +61,7 @@
<licenses>
<license>
- <name>Apache License 2.0</name>
+ <name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -109,6 +109,7 @@
</reporting>
<build>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -166,8 +167,6 @@
<supplementalModel>${topDir}/etc/notice-supplements.xml</supplementalModel>
</supplementalModels>
<properties>
- <addLicense>true</addLicense>
- <addArtifact>true</addArtifact>
<projectName>Apache Abdera</projectName>
</properties>
</configuration>
@@ -387,7 +386,7 @@
<repository>
<id>apache.snapshots</id>
<name>Apache Incubating Repository</name>
- <url>scpexe://netzooid.com/home/dan/public_html/abdera-take7</url>
+ <url>scp://people.apache.org/home/dandiep/public_html/abdera-take7</url>
</repository>
</distributionManagement>