I think I have satisfied the demands of Apache's and ASM's bundling policies. If everyone is satisfied, I will roll RC2 of the release.
Matt On Tue, Jan 12, 2016 at 5:14 PM, <mben...@apache.org> wrote: > Author: mbenson > Date: Tue Jan 12 23:14:35 2016 > New Revision: 1724334 > > URL: http://svn.apache.org/viewvc?rev=1724334&view=rev > Log: > handle ASM binary bundling licensing requirements > > Added: > commons/proper/weaver/trunk/LICENSE-asm.txt (with props) > Modified: > commons/proper/weaver/trunk/LICENSE.txt > commons/proper/weaver/trunk/RELEASE-NOTES.txt (props changed) > commons/proper/weaver/trunk/dist/src/assembly/bin.xml > commons/proper/weaver/trunk/dist/src/assembly/src.xml > commons/proper/weaver/trunk/pom.xml > > Added: commons/proper/weaver/trunk/LICENSE-asm.txt > URL: > http://svn.apache.org/viewvc/commons/proper/weaver/trunk/LICENSE-asm.txt?rev=1724334&view=auto > ============================================================================== > --- commons/proper/weaver/trunk/LICENSE-asm.txt (added) > +++ commons/proper/weaver/trunk/LICENSE-asm.txt Tue Jan 12 23:14:35 2016 > @@ -0,0 +1,30 @@ > +Copyright (c) 2000-2011 INRIA, France Telecom > +All rights reserved. > + > +Redistribution and use in source and binary forms, with or without > +modification, are permitted provided that the following conditions > +are met: > + > +1. Redistributions of source code must retain the above copyright > + notice, this list of conditions and the following disclaimer. > + > +2. Redistributions in binary form must reproduce the above copyright > + notice, this list of conditions and the following disclaimer in the > + documentation and/or other materials provided with the distribution. > + > +3. Neither the name of the copyright holders nor the names of its > + contributors may be used to endorse or promote products derived from > + this software without specific prior written permission. > + > +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" > +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE > +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > +THE POSSIBILITY OF SUCH DAMAGE. > + > > Propchange: commons/proper/weaver/trunk/LICENSE-asm.txt > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: commons/proper/weaver/trunk/LICENSE.txt > URL: > http://svn.apache.org/viewvc/commons/proper/weaver/trunk/LICENSE.txt?rev=1724334&r1=1724333&r2=1724334&view=diff > ============================================================================== > --- commons/proper/weaver/trunk/LICENSE.txt (original) > +++ commons/proper/weaver/trunk/LICENSE.txt Tue Jan 12 23:14:35 2016 > @@ -201,3 +201,7 @@ > See the License for the specific language governing permissions and > limitations under the License. > > +------------ > +This product bundles version ${asm.version} of the ASM bytecode library > +under the license provided here as LICENSE-asm.txt. > + > > Propchange: commons/proper/weaver/trunk/RELEASE-NOTES.txt > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: commons/proper/weaver/trunk/RELEASE-NOTES.txt > ('svn:executable' removed) > > Modified: commons/proper/weaver/trunk/dist/src/assembly/bin.xml > URL: > http://svn.apache.org/viewvc/commons/proper/weaver/trunk/dist/src/assembly/bin.xml?rev=1724334&r1=1724333&r2=1724334&view=diff > ============================================================================== > --- commons/proper/weaver/trunk/dist/src/assembly/bin.xml (original) > +++ commons/proper/weaver/trunk/dist/src/assembly/bin.xml Tue Jan 12 23:14:35 > 2016 > @@ -33,10 +33,11 @@ > <fileSet> > <directory>${project.basedir}/..</directory> > <includes> > - <include>LICENSE.txt</include> > + <include>LICENSE*.txt</include> > <include>NOTICE.txt</include> > <include>RELEASE-NOTES.txt</include> > </includes> > + <filtered>true</filtered> > </fileSet> > </fileSets> > </assembly> > > Modified: commons/proper/weaver/trunk/dist/src/assembly/src.xml > URL: > http://svn.apache.org/viewvc/commons/proper/weaver/trunk/dist/src/assembly/src.xml?rev=1724334&r1=1724333&r2=1724334&view=diff > ============================================================================== > --- commons/proper/weaver/trunk/dist/src/assembly/src.xml (original) > +++ commons/proper/weaver/trunk/dist/src/assembly/src.xml Tue Jan 12 23:14:35 > 2016 > @@ -24,8 +24,16 @@ > <fileSets> > <fileSet> > <directory>${project.basedir}/..</directory> > + <includes> > + <include>*.txt</include> > + </includes> > + <filtered>true</filtered> > + </fileSet> > + <fileSet> > + <directory>${project.basedir}/..</directory> > <excludes> > <exclude>${project.build.directory}/**</exclude> > + <exclude>*.txt</exclude> > <exclude>.*/**</exclude> > <exclude>**/${project.build.directory}/**</exclude> > <exclude>**/.*/**</exclude> > @@ -33,4 +41,11 @@ > </excludes> > </fileSet> > </fileSets> > + <files> > + <file> > + <source>${project.basedir}/../src/site/markdown/building.md</source> > + <outputDirectory>/</outputDirectory> > + <destName>BUILDING.txt</destName> > + </file> > + </files> > </assembly> > > Modified: commons/proper/weaver/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/commons/proper/weaver/trunk/pom.xml?rev=1724334&r1=1724333&r2=1724334&view=diff > ============================================================================== > --- commons/proper/weaver/trunk/pom.xml (original) > +++ commons/proper/weaver/trunk/pom.xml Tue Jan 12 23:14:35 2016 > @@ -54,7 +54,6 @@ under the License. > <commons.jira.id>WEAVER</commons.jira.id> > <commons.jira.pid>12315320</commons.jira.pid> > <commons.site.path>commons-weaver</commons.site.path> > - <asm.version>5.0.4</asm.version> > > <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}</commons.scmPubUrl> > > <!-- most Java-related items are defined in parent/pom.xml; > @@ -63,6 +62,7 @@ under the License. > <maven.compiler.target>1.6</maven.compiler.target> > > <ant.version>1.9.4</ant.version> > + <asm.version>5.0.4</asm.version> > </properties> > > <developers> > @@ -186,20 +186,28 @@ under the License. > <union id="notices" /> > <seek name="LICENSE.txt" addto="notices" /> > <seek name="NOTICE.txt" addto="notices" /> > + <seek name="LICENSE-asm.txt" addto="notices" /> > + > + <filterchain id="notice-filter"> > + <expandproperties /> > + </filterchain> > > <mkdir > dir="${project.build.directory}/generated-resources/notices/META-INF" /> > <copy verbose="true" > todir="${project.build.directory}/generated-resources/notices/META-INF"> > <resources refid="notices" /> > + <filterchain refid="notice-filter" /> > </copy> > > <mkdir > dir="${project.build.directory}/generated-test-resources/notices/META-INF" /> > <copy verbose="true" > todir="${project.build.directory}/generated-test-resources/notices/META-INF"> > <resources refid="notices" /> > + <filterchain refid="notice-filter" /> > </copy> > > <mkdir dir="${project.build.directory}/apidocs/META-INF" /> > <copy verbose="true" > todir="${project.build.directory}/apidocs/META-INF"> > <resources refid="notices" /> > + <filterchain refid="notice-filter" /> > </copy> > </sequential> > </target> > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
