Added: qpid/trunk/qpid/java/client/src/main/assembly/LICENSE URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/assembly/LICENSE?rev=1585102&view=auto ============================================================================== --- qpid/trunk/qpid/java/client/src/main/assembly/LICENSE (added) +++ qpid/trunk/qpid/java/client/src/main/assembly/LICENSE Sat Apr 5 15:28:49 2014 @@ -0,0 +1,234 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + + + +############################################### +# Third Party Dependency Licensing Information: +############################################### + +This product bundles the SLF4J API, which is distributed under +the MIT licence: + +Copyright (c) 2004-2013 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +
Added: qpid/trunk/qpid/java/client/src/main/assembly/NOTICE URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/assembly/NOTICE?rev=1585102&view=auto ============================================================================== --- qpid/trunk/qpid/java/client/src/main/assembly/NOTICE (added) +++ qpid/trunk/qpid/java/client/src/main/assembly/NOTICE Sat Apr 5 15:28:49 2014 @@ -0,0 +1,6 @@ +Qpid AMQP 0-x JMS Client +Copyright 2006-2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + Added: qpid/trunk/qpid/java/client/src/main/assembly/README.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/assembly/README.txt?rev=1585102&view=auto ============================================================================== --- qpid/trunk/qpid/java/client/src/main/assembly/README.txt (added) +++ qpid/trunk/qpid/java/client/src/main/assembly/README.txt Sat Apr 5 15:28:49 2014 @@ -0,0 +1,3 @@ +Documentation for the Qpid components can be accessed on our website at: + +http://qpid.apache.org/documentation.html Added: qpid/trunk/qpid/java/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1585102&view=auto ============================================================================== --- qpid/trunk/qpid/java/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (added) +++ qpid/trunk/qpid/java/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Sat Apr 5 15:28:49 2014 @@ -0,0 +1,36 @@ +# +# 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. +# + +#// ------------------------------------------------------------------ +# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS +#// ------------------------------------------------------------------ + + + +From: 'QOS.ch' (http://www.qos.ch) + - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4 + License: MIT License (http://www.opensource.org/licenses/mit-license.php) + +From: 'The Apache Software Foundation' (http://www.apache.org/) + - Qpid Common (http://qpid.apache.org/qpid-java-build/management/qpid-common) org.apache.qpid:qpid-common:jar + License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + + + + Modified: qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml?rev=1585102&r1=1585101&r2=1585102&view=diff ============================================================================== --- qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml (original) +++ qpid/trunk/qpid/java/client/src/main/assembly/qpid-client-bin.xml Sat Apr 5 15:28:49 2014 @@ -8,10 +8,10 @@ <baseDirectory>qpid-client/${project.version}</baseDirectory> <fileSets> <fileSet> - <directory>${project.build.outputDirectory}/META-INF/</directory> + <directory>${basedir}/src/main/assembly/</directory> <outputDirectory>/</outputDirectory> <includes> - <include>README</include> + <include>README.txt</include> <include>NOTICE</include> <include>LICENSE</include> </includes> Modified: qpid/trunk/qpid/java/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1585102&r1=1585101&r2=1585102&view=diff ============================================================================== --- qpid/trunk/qpid/java/pom.xml (original) +++ qpid/trunk/qpid/java/pom.xml Sat Apr 5 15:28:49 2014 @@ -50,15 +50,9 @@ <java.source>1.6</java.source> <java.target>1.6</java.target> - <readme.text>Documentation for the Qpid components can be accessed on our website at:${line.separator}http://qpid.apache.org/documentation.html</readme.text> - <!-- enforcer plugin config properties --> <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp)</supported-test-profiles-regex> - <!-- plugin properties--> - <license-maven-plugin-output-dir>${project.build.directory}/license-maven-plugin</license-maven-plugin-output-dir> - <third-party-license-info-file>${license-maven-plugin-output-dir}/THIRD_PARTY_LICENSE_INFO</third-party-license-info-file> - <!-- test profile properties and defaults--> <qpid.home>${basedir}</qpid.home> <!-- override for broker tests --> <qpid.home.qbtc.output>${qpid.home}${file.separator}target${file.separator}qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests --> @@ -179,32 +173,6 @@ </target> </configuration> </execution> - <execution> - <id>generate-qpid-packaging-artifacts</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <!-- Generate the Qpid README file --> - <echo file="${project.build.outputDirectory}/META-INF/README" message="${readme.text}" /> - <!-- Take a copy of the maven dependencies file for processing --> - <copy file="${project.build.outputDirectory}/META-INF/DEPENDENCIES" - tofile="${third-party-license-info-file}" failonerror="false"/> - <!-- Strip out the unwanted qpid specific dependency info --> - <replaceregexp file="${third-party-license-info-file}" flags="gm" replace=""> - <!-- Regex to remove the maven comments, the qpid project name & the qpid project dependencies --> - <regexp id="stripqpidcontentregexp" pattern="(^\/\/\ .*\n|^Qpid\ .*\n|^.*\-.*Qpid.*\s.*Apache.*\.txt\)\n)"/> - </replaceregexp> - <!-- Append it to the end of the license file --> - <concat destfile="${project.build.outputDirectory}/META-INF/LICENSE" append="true"> - <header filtering="no">${line.separator}3RD PARTY DEPENDENCIES AND LICENSING</header> - <path path="${third-party-license-info-file}"/> - </concat> - </target> - </configuration> - </execution> </executions> </plugin> <plugin> @@ -296,42 +264,6 @@ </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <configuration> - <failIfWarning>true</failIfWarning> - <includedScopes>compile,system</includedScopes> - <excludedGroups>org.apache.qpid</excludedGroups> - <outputDirectory>${license-maven-plugin-output-dir}</outputDirectory> - <thirdPartyFilename>THIRDPARTY</thirdPartyFilename> - <fileTemplate>/org/codehaus/mojo/license/third-party-file-groupByLicense.ftl</fileTemplate> - <licensesOutputFile>${license-maven-plugin-output-dir}/licenses.xml</licensesOutputFile> - <includedLicenses> - <includedLicense>Apache Software License, Version 2.0</includedLicense> - <includedLicense>The MIT License</includedLicense> - <includedLicense>Eclipse Public License - Version 1.0</includedLicense> - <includedLicense>Common Public License Version 1.0</includedLicense> - <includedLicense>BSD License</includedLicense> - <includedLicense>Academic Free License v2.1</includedLicense> - </includedLicenses> - <licenseMerges> - <licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache Software License - Version 2.0|Apache v2|Apache 2</licenseMerge> - <licenseMerge>The MIT License|MIT License</licenseMerge> - <licenseMerge>BSD License|New BSD</licenseMerge> - </licenseMerges> - </configuration> - <executions> - <execution> - <id>check-third-party-licensing</id> - <phase>prepare-package</phase> - <goals> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <executions> Modified: qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml?rev=1585102&r1=1585101&r2=1585102&view=diff ============================================================================== --- qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml (original) +++ qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml Sat Apr 5 15:28:49 2014 @@ -97,7 +97,7 @@ <dependency> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <scope>test</scope> + <scope>provided</scope> <optional>true</optional> </dependency> </dependencies> Modified: qpid/trunk/qpid/java/systests/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/pom.xml?rev=1585102&r1=1585101&r2=1585102&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/pom.xml (original) +++ qpid/trunk/qpid/java/systests/pom.xml Sat Apr 5 15:28:49 2014 @@ -179,7 +179,7 @@ <dependency> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <scope>test</scope> + <scope>provided</scope> <optional>true</optional> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
