You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2021/12/10 14:00:30 UTC
[cayenne] branch STABLE-4.1 updated (e1cc7a7 -> 7602afb)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from e1cc7a7 Allow "https:" link in the license header
new 1665f0a Set maven-war-plugin version (it's used in a tutorial)
new 65e65a0 Cleanup LICENSE and NOTICE files, and use different content for the source and binary packages.
new 7602afb Add NOTICE file template to RAT exclusions
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assembly/pom.xml | 77 +++++--
.../cayenne/{LICENSE.txt => LICENSE.txt.vm} | 231 ++++++++-------------
.../META-INF/cayenne/{NOTICE.txt => NOTICE.txt.vm} | 12 +-
pom.xml | 11 +
4 files changed, 167 insertions(+), 164 deletions(-)
rename build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/{LICENSE.txt => LICENSE.txt.vm} (76%)
rename build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/{NOTICE.txt => NOTICE.txt.vm} (92%)
[cayenne] 01/03: Set maven-war-plugin version (it's used in a tutorial)
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 1665f0a44a3c95f393c1833828d5d63b8e273a1d
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Jun 28 11:31:29 2021 +0300
Set maven-war-plugin version (it's used in a tutorial)
(cherry picked from commit 056ce2a1ec10578d163514728763ffb2cd37af6c)
---
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pom.xml b/pom.xml
index 53bb99e..7e1b172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,6 +856,11 @@
<artifactId>docker-maven-plugin</artifactId>
<version>0.29.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
</plugins>
</pluginManagement>
[cayenne] 03/03: Add NOTICE file template to RAT exclusions
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 7602afbbe2b779b2df059795fe4b3977d37437ec
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Nov 24 18:41:49 2021 +0300
Add NOTICE file template to RAT exclusions
(cherry picked from commit fda0ae4a720b33ec7163d7420d063b22e7b40905)
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index d4f9aa3..2fcd6e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -963,6 +963,9 @@
<exclude>**/*.log</exclude>
<exclude>**/*.iml</exclude>
+
+ <!-- This is a template of a NOTICE file, that will be included to the build artifacts -->
+ <exclude>**/NOTICE.txt.vm</exclude>
</excludes>
</configuration>
</plugin>
[cayenne] 02/03: Cleanup LICENSE and NOTICE files, and use different content for the source and binary packages.
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 65e65a0ac8825cbb5f06f831090069a921ec85a1
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Jun 10 18:07:28 2021 +0300
Cleanup LICENSE and NOTICE files, and use different content for the source and binary packages.
(cherry picked from commit 49b092d0d1c47b2bbbc2d3f598357f6786565d02)
---
assembly/pom.xml | 77 +++++--
.../cayenne/{LICENSE.txt => LICENSE.txt.vm} | 231 ++++++++-------------
.../META-INF/cayenne/{NOTICE.txt => NOTICE.txt.vm} | 12 +-
pom.xml | 3 +
4 files changed, 159 insertions(+), 164 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5fc5ecd..eb3d87b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -196,6 +196,22 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/legal</outputDirectory>
+ <properties>
+ <binary>false</binary>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -222,19 +238,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/legal</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -281,6 +284,22 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/legal</outputDirectory>
+ <properties>
+ <binary>true</binary>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -338,6 +357,22 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/legal</outputDirectory>
+ <properties>
+ <binary>true</binary>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -431,6 +466,22 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/legal</outputDirectory>
+ <properties>
+ <binary>true</binary>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
diff --git a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm
similarity index 76%
rename from build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt
rename to build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm
index ad10aba..c279cb8 100644
--- a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt
+++ b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm
@@ -263,6 +263,68 @@ information on the ObjectStyle Group, please see
<http://objectstyle.org/>.
=====================================================================
+3. ASHWOOD LICENSE
+
+ *
+ * Copyright(c) 2003, Andriy Shapochka
+ * 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 ASHWOOD 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.
+ *
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by
+ * individuals on behalf of the ASHWOOD Project and was originally
+ * created by Andriy Shapochka.
+ */
+=====================================================================
+
+concurrentlinkedhashmap License
+
+
+Copyright 2010 Google Inc. All Rights Reserved.
+
+ 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
+
+ https://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.
+
+#if($binary == "true")
+=====================================================================
CAUCHO LICENSE
Copyright (c) 2001-2004 Caucho Technology, Inc. All rights reserved.
@@ -308,49 +370,7 @@ CAUCHO LICENSE
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.
-
-=====================================================================
-3. ASHWOOD LICENSE
- *
- * Copyright(c) 2003, Andriy Shapochka
- * 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 ASHWOOD 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.
- *
- * ====================================================================
- *
- * This software consists of voluntary contributions made by
- * individuals on behalf of the ASHWOOD Project and was originally
- * created by Andriy Shapochka.
- */
=====================================================================
JGOODIES LICENSE
@@ -359,30 +379,30 @@ JGOODIES LICENSE
Copyright (c) 2003 JGoodies Karsten Lentzsch. All rights reserved.
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
- o Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- o 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.
-
- o Neither the name of JGoodies Karsten Lentzsch 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,
+ o Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ o 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.
+
+ o Neither the name of JGoodies Karsten Lentzsch 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.
=====================================================================
@@ -418,86 +438,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// DAMAGE.
=====================================================================
-Eclipse Public License -v 1.0
-
-(plain text)
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
- b) in the case of each subsequent Contributor:
- i) changes to the Program, and
- ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
- b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contrib [...]
- c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted [...]
- d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
- 3. REQUIREMENTS
-
- A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
- b) its license agreement:
- i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
- ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
- iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
- iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
- When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
- b) a copy of this Agreement must be included with each copy of the Program.
-
- Contributors may not remove or alter any copyright notices contained within the Program.
-
- Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
- 4. COMMERCIAL DISTRIBUTION
-
- Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial [...]
-
- For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance cla [...]
-
- 5. NO WARRANTY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under thi [...]
-
- 6. DISCLAIMER OF LIABILITY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVE [...]
-
- 7. GENERAL
-
- If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
- If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
- All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by [...]
-
- Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the res [...]
-
- This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-
-=====================================================================
VPP License
Copyright (c) 2003, FoundryLogic, LLC
@@ -838,4 +778,5 @@ SLF4J License
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.
\ No newline at end of file
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#end
\ No newline at end of file
diff --git a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm
similarity index 92%
rename from build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
rename to build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm
index 57b833a..af6a8a8 100644
--- a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
+++ b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm
@@ -4,23 +4,26 @@ Copyright 2001-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
+#if($binary == "true")
RUNTIME FRAMEWORK
+#end
* ObjectStyle Cayenne Notice: This software is derived from Cayenne Framework,
originally developed at The ObjectStyle Group and donated to the ASF by its authors
(http://objectstyle.org)
* This software includes Ashwood graph library developed by Andriy Shapochka.
(http://objectstyle.org/ashwood/)
+#if($binary == "true")
* This software includes VPP library developed by FoundryLogic, LLC.
(http://vpp.sourceforge.net/)
+#end
* This software includes concurrentlinkedhashmap library developed by Google Inc.
(http://code.google.com/p/concurrentlinkedhashmap/)
-
+#if($binary == "true")
GUI TOOLS
* CayenneModeler includes JGoodies library developed by Karsten Lentzsch.
@@ -29,9 +32,6 @@ GUI TOOLS
* CayenneModeler includes OGNL library developed by Drew Davidson and Luke Blanshard
(http://commons.apache.org/ognl/)
-* CayenneModeler includes GIF binary images developed by Eclipse Foundation.
-(http://www.eclipse.org/).
-
* CayenneModeler includes jEdit-syntax library developed by Slava Pestov, Artur Biesiadowski,
Clancy Malcolm, Jonathan Revusky, Juha Lindfors and Mike Dillon.
(http://jedit-syntax.sourceforge.net/)
@@ -41,4 +41,4 @@ Clancy Malcolm, Jonathan Revusky, Juha Lindfors and Mike Dillon.
* CayenneModeler includes JGraph library developed by JGraph Ltd
(http://www.jgraph.com)
-
+#end
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7e1b172..d4f9aa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -806,6 +806,9 @@
org.apache.cayenne.build-tools:cayenne-legal:${project.version}
</resourceBundle>
</resourceBundles>
+ <properties>
+ <binary>false</binary>
+ </properties>
</configuration>
</plugin>
<plugin>