diff --git a/README.md b/README.md index 8103c39fe..0e85b7dcd 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,11 @@ Notable features in recent releases, details are found in [releases](https://git Note that the version numbers of the plantuml.lib plugin are a bit special, since they use the version of the included plantuml.jar +## [1.1.30](https://github.com/hallvard/plantuml/releases/tag/1.1.30) +- Fixed access to environment variables from PlantUML code, using PlantUML functions like %getenv("MY_ENV_VAR"), see [PlantUML security profiles](https://plantuml.com/en/security). +- Fixed installation on Windows without having to explicitly install Graphviz ([issue #175](https://github.com/hallvard/plantuml/discussions/175)) +- Updated PlantUML library version to 1.2023.11 ([issue #145](https://github.com/hallvard/plantuml/issues/145)), see [changes](https://plantuml.com/changes). + ## [1.1.29](https://github.com/hallvard/plantuml/releases/tag/1.1.29) - Updated PlantUML library version to 1.2023.10 ([issue #145](https://github.com/hallvard/plantuml/issues/145)), see [changes](https://plantuml.com/changes). - Fixed duplicated Java type members entries in diagrams created from Java packages. diff --git a/bundles/net.sourceforge.plantuml.eclipse.imagecontrol/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.eclipse.imagecontrol/META-INF/MANIFEST.MF index 96928aa8c..301e195d9 100644 --- a/bundles/net.sourceforge.plantuml.eclipse.imagecontrol/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.eclipse.imagecontrol/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Image Control Plug-in Bundle-SymbolicName: net.sourceforge.plantuml.eclipse.imagecontrol -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.jface;bundle-version="3.10.2" Bundle-ActivationPolicy: lazy diff --git a/bundles/net.sourceforge.plantuml.eclipse/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.eclipse/META-INF/MANIFEST.MF index 707aed5d9..4bde71f32 100644 --- a/bundles/net.sourceforge.plantuml.eclipse/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.eclipse/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml Plug-in Bundle-SymbolicName: net.sourceforge.plantuml.eclipse; singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Activator: net.sourceforge.plantuml.eclipse.Activator Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.ui.ide;bundle-version="3.10.2", org.eclipse.ui;bundle-version="3.106.1", org.eclipse.core.resources;bundle-version="3.9.1", - net.sourceforge.plantuml.lib;bundle-version="1.2021.3" + net.sourceforge.plantuml.lib;bundle-version="1.2023.11" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: net.sourceforge.plantuml.eclipse.imagecontrol, diff --git a/bundles/net.sourceforge.plantuml.ecore/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.ecore/META-INF/MANIFEST.MF index ace74eda2..9762e0a23 100644 --- a/bundles/net.sourceforge.plantuml.ecore/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.ecore/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ecore PlantUML mapping Bundle-SymbolicName: net.sourceforge.plantuml.ecore; singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: net.sourceforge.plantuml.ecore Import-Package: net.sourceforge.plantuml.eclipse.utils, diff --git a/bundles/net.sourceforge.plantuml.jdt/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.jdt/META-INF/MANIFEST.MF index 778c19682..02e94cb42 100644 --- a/bundles/net.sourceforge.plantuml.jdt/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.jdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PlantUML Java Support Bundle-SymbolicName: net.sourceforge.plantuml.jdt;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.19", net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.19", diff --git a/bundles/net.sourceforge.plantuml.lib.elk/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.lib.elk/META-INF/MANIFEST.MF index d77fe4794..c6440733d 100644 --- a/bundles/net.sourceforge.plantuml.lib.elk/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.lib.elk/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Bundle-SymbolicName: net.sourceforge.plantuml.lib.elk Bundle-Version: 0.7.1 -Fragment-Host: net.sourceforge.plantuml.lib;bundle-version="1.2023.10" +Fragment-Host: net.sourceforge.plantuml.lib;bundle-version="1.2023.11" Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: lib/elk-full.jar diff --git a/bundles/net.sourceforge.plantuml.lib.jlatexmath/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.lib.jlatexmath/META-INF/MANIFEST.MF index 611938770..8e8020c7e 100644 --- a/bundles/net.sourceforge.plantuml.lib.jlatexmath/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.lib.jlatexmath/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JLatexMath Bundle-SymbolicName: net.sourceforge.plantuml.lib.jlatexmath Bundle-Version: 1.0.7 -Fragment-Host: net.sourceforge.plantuml.lib;bundle-version="1.2021.3" +Fragment-Host: net.sourceforge.plantuml.lib;bundle-version="1.2023.11" Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: lib/jlatexmath-1.0.7.jar, . diff --git a/bundles/net.sourceforge.plantuml.lib/.classpath b/bundles/net.sourceforge.plantuml.lib/.classpath index 01efaa16c..1d53ec50e 100644 --- a/bundles/net.sourceforge.plantuml.lib/.classpath +++ b/bundles/net.sourceforge.plantuml.lib/.classpath @@ -1,7 +1,11 @@ - + + + + + - + diff --git a/bundles/net.sourceforge.plantuml.lib/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.lib/META-INF/MANIFEST.MF index c823b9e87..b27063104 100644 --- a/bundles/net.sourceforge.plantuml.lib/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.lib/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml library plug-in Bundle-SymbolicName: net.sourceforge.plantuml.lib -Bundle-Version: 1.2023.10 +Bundle-Version: 1.2023.11 Bundle-Vendor: PlantUML Team Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy -Export-Package: net.sourceforge.plantuml;version="1.2023.10", - net.sourceforge.plantuml.core;version="1.2023.10", - net.sourceforge.plantuml.security;version="1.2023.10" -Bundle-ClassPath: lib/plantuml-epl-1.2023.10.jar +Export-Package: net.sourceforge.plantuml;version="1.2023.11", + net.sourceforge.plantuml.core;version="1.2023.11", + net.sourceforge.plantuml.security;version="1.2023.11" +Bundle-ClassPath: lib/plantuml-epl-1.2023.11.jar diff --git a/bundles/net.sourceforge.plantuml.lib/README.md b/bundles/net.sourceforge.plantuml.lib/README.md index dd351811f..8fd145e67 100644 --- a/bundles/net.sourceforge.plantuml.lib/README.md +++ b/bundles/net.sourceforge.plantuml.lib/README.md @@ -5,5 +5,5 @@ This plugin wraps the EPL-ed version of the plantuml.jar file. The plugin's vers Once in a while it should be updated with a new version. This isn't currently automated, so the following manual steps are needed: - Download the EPL-ed version from https://plantuml.com/download and unzip -- Copy the jar into this plugin's lib folder and change its name to include the version and license name, e.g. plantuml-epl-1.2021.3.jar +- Copy the jar into this plugin's lib folder, e.g. plantuml-epl-1.2023.11.jar - Search and replace the previous version with the new one throughout the workspace _except_ `compositeArtifacts.xml` and `compositeContent.xml` in the `releng/composite` module, to update meta-data in plug-in and feature projects (`MANIFEST.MF`, `build.properties`, `pom.xml`, `feature.xml`, `category.xml`) diff --git a/bundles/net.sourceforge.plantuml.lib/build.properties b/bundles/net.sourceforge.plantuml.lib/build.properties index 3115d79ea..d7c0fa89a 100644 --- a/bundles/net.sourceforge.plantuml.lib/build.properties +++ b/bundles/net.sourceforge.plantuml.lib/build.properties @@ -1,4 +1,11 @@ bin.includes = META-INF/,\ - epl-v10.html,\ + epl-v20.html,\ lib/,\ - lib/plantuml-epl-1.2023.10.jar + lib/plantuml-epl-1.2023.11.jar +bin.excludes = lib/plantuml-epl-1.2023.11-sources.jar,\ + lib/.DS_Store +src.includes = README.md,\ + epl-v20.html,\ + lib/ +src.excludes = lib/plantuml-epl-1.2023.11.jar,\ + lib/.DS_Store diff --git a/bundles/net.sourceforge.plantuml.lib/epl-v10.html b/bundles/net.sourceforge.plantuml.lib/epl-v10.html deleted file mode 100644 index fd391227c..000000000 --- a/bundles/net.sourceforge.plantuml.lib/epl-v10.html +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - -Eclipse Public License - Version 1.0 - - - - - - -

Eclipse Public License - v 1.0

- -

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 Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.

- -

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 hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.

- -

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 Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.

- -

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 claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.

- -

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 this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.

- -

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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

- -

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 -Recipient relating to the Program shall continue and survive.

- -

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 responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.

- -

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.

- - - - diff --git a/bundles/net.sourceforge.plantuml.lib/epl-v20.html b/bundles/net.sourceforge.plantuml.lib/epl-v20.html new file mode 100644 index 000000000..626fd4a62 --- /dev/null +++ b/bundles/net.sourceforge.plantuml.lib/epl-v20.html @@ -0,0 +1,300 @@ + + + + + Eclipse Public License - Version 2.0 + + + +

Eclipse Public License - v 2.0

+

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:

+ +

“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 + or any Secondary License (as applicable), including Contributors. +

+

“Derivative Works” shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. +

+

“Modified Works” shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. +

+

“Distribute” means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. +

+

“Source Code” means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. +

+

“Secondary License” means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. +

+

2. GRANT OF RIGHTS

+ +

3. REQUIREMENTS

+

3.1 If a Contributor Distributes the Program in any form, then:

+ +

3.2 When the Program is Distributed as Source Code:

+ +

3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. +

+

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 Contributor”) + hereby agrees to defend and indemnify every other Contributor + (“Indemnified Contributor”) against any losses, damages and costs + (collectively “Losses”) arising from claims, lawsuits and other legal actions + brought by a third party against the Indemnified Contributor to the extent + caused by the acts or omissions of such Commercial Contributor in connection + with its distribution of the Program in a commercial product offering. + The obligations in this section do not apply to any claims or Losses relating + to any actual or alleged intellectual property infringement. In order to + qualify, an Indemnified Contributor must: a) promptly notify the + Commercial Contributor in writing of such claim, and b) allow the Commercial + Contributor to control, and cooperate with the Commercial Contributor in, + the defense and any related settlement negotiations. The Indemnified + Contributor may participate in any such claim at its own expense. +

+

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 claims and + warranties, and if a court requires any other Contributor to pay any damages + as a result, the Commercial Contributor must pay those damages. +

+

5. NO WARRANTY

+

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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 this Agreement, including but not limited to the + risks and costs of program errors, compliance with applicable laws, damage + to or loss of data, programs or equipment, and unavailability or + interruption of operations. +

+

6. DISCLAIMER OF LIABILITY

+

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +

+

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 Recipient relating to the + Program shall continue and survive. +

+

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 responsibility to serve as + the Agreement Steward to a suitable separate entity. Each new version of + the Agreement will be given a distinguishing version number. The Program + (including Contributions) may always be Distributed subject to the version + of the Agreement under which it was received. In addition, after a new + version of the Agreement is published, Contributor may elect to Distribute + the Program (including its Contributions) under the new version. +

+

Except as expressly stated in Sections 2(a) and 2(b) above, Recipient + receives no rights or licenses to the intellectual property of any + Contributor under this Agreement, whether expressly, by implication, + estoppel or otherwise. All rights in the Program not expressly granted + under this Agreement are reserved. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. +

+

Exhibit A – Form of Secondary Licenses Notice

+

“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.” +

+
+

Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. +

+

If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. +

+

You may add additional accurate notices of copyright ownership.

+
+ + \ No newline at end of file diff --git a/bundles/net.sourceforge.plantuml.lib/lib/COPYING b/bundles/net.sourceforge.plantuml.lib/lib/COPYING index 102b2a2c1..50cc7aa2f 100644 --- a/bundles/net.sourceforge.plantuml.lib/lib/COPYING +++ b/bundles/net.sourceforge.plantuml.lib/lib/COPYING @@ -5,14 +5,14 @@ PlantUML : a free UML diagram generator (C) Copyright 2009-2023, Arnaud Roques THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC -LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0] +LICENSE ("AGREEMENT"). [Eclipse Public License - v 2.0] ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. You may obtain a copy of the License at - http://www.eclipse.org/legal/epl-v10.html + https://www.eclipse.org/legal/epl-2.0/ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -22,175 +22,280 @@ RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. ======================================================================== -Eclipse Public License - v 1.0 +Eclipse Public License - v 2.0 -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. + 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. + a) in the case of the initial Contributor, the initial content + 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 changes or additions to the Program that + are not Modified Works. + +"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 +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. 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 Contribution causes such combination to be -covered by the Licensed Patents. The patent license shall not apply to any other combinations which include -the Contribution. No hardware per se is licensed hereunder. - -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 hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. For example, if a third -party patent license is required to allow Recipient to distribute the Program, it is Recipient's -responsibility to acquire that license before distributing the Program. - -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. + 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. + + 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 or other 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 Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + 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 hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + 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. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). 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: +3.1 If a Contributor Distributes the Program in any form, then: -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; + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, -indirect, special, incidental and consequential damages, such as lost profits; + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other 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; -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone -and not by any other party; and + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; -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. + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and -When the Program is made available in source code form: + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. -a) it must be made available under this Agreement; and +3.2 When the Program is Distributed as Source Code: -b) a copy of this Agreement must be included with each copy of the Program. + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and -Contributors may not remove or alter any copyright notices contained within the Program. + b) a copy of this Agreement must be included with each copy of + 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. +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. 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 Contributor") hereby agrees to -defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a -third party against the Indemnified Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program in a commercial product offering. -The obligations in this section do not apply to any claims or Losses relating to any actual or alleged -intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, -and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. -The Indemnified Contributor may participate in any such claim at its own expense. - -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 claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. +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 Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +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 +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. 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 this Agreement , including but not limited to the risks -and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or -equipment, and unavailability or interruption of operations. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, 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 this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. 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, EVEN IF ADVISED OF THE +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, 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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 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 Recipient relating to the Program shall continue -and survive. - -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 responsibility to serve as the Agreement Steward -to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. -The Program (including Contributions) may always be distributed subject to the version of the Agreement under -which it was received. In addition, after a new version of the Agreement is published, Contributor may elect -to distribute the Program (including its Contributions) under the new version. Except as expressly stated in -Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any -Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in -the Program not expressly granted under this Agreement are reserved. - -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. +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 Recipient relating to the Program shall continue and survive. + +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 +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. \ No newline at end of file diff --git a/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11-sources.jar b/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11-sources.jar new file mode 100644 index 000000000..a12ba8bf6 Binary files /dev/null and b/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11-sources.jar differ diff --git a/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.10.jar b/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11.jar similarity index 62% rename from bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.10.jar rename to bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11.jar index 6ea1da411..ac42521d8 100644 Binary files a/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.10.jar and b/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11.jar differ diff --git a/bundles/net.sourceforge.plantuml.osgi/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.osgi/META-INF/MANIFEST.MF index ea22c1bcf..9c590ca5a 100644 --- a/bundles/net.sourceforge.plantuml.osgi/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.osgi/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: OSGi Manifest support Bundle-SymbolicName: net.sourceforge.plantuml.osgi;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.30.qualifier", +Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.30", no.hal.osgi.emf, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - net.sourceforge.plantuml.text;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.text;bundle-version="1.1.30", org.eclipse.ui;bundle-version="3.106.1", org.eclipse.jface;bundle-version="3.10.2", org.eclipse.pde.ui;bundle-version="3.8.100" diff --git a/bundles/net.sourceforge.plantuml.svg/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.svg/META-INF/MANIFEST.MF index dfb3e0841..382440b87 100644 --- a/bundles/net.sourceforge.plantuml.svg/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.svg/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml Plug-in Bundle-SymbolicName: net.sourceforge.plantuml.svg; singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", diff --git a/bundles/net.sourceforge.plantuml.text/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.text/META-INF/MANIFEST.MF index ceac53341..e9fb69f05 100644 --- a/bundles/net.sourceforge.plantuml.text/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PlantUML Text Editor Support Bundle-SymbolicName: net.sourceforge.plantuml.text;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: net.sourceforge.plantuml.text Import-Package: net.sourceforge.plantuml.eclipse, diff --git a/bundles/net.sourceforge.plantuml.xcore/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.xcore/META-INF/MANIFEST.MF index 6f608216b..488693988 100644 --- a/bundles/net.sourceforge.plantuml.xcore/META-INF/MANIFEST.MF +++ b/bundles/net.sourceforge.plantuml.xcore/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xcore PlantUML mapping Bundle-SymbolicName: net.sourceforge.plantuml.xcore; singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: net.sourceforge.plantuml.eclipse.utils, net.sourceforge.plantuml.ecore, diff --git a/bundles/no.hal.osgi.emf/META-INF/MANIFEST.MF b/bundles/no.hal.osgi.emf/META-INF/MANIFEST.MF index 70c97d225..04626440f 100644 --- a/bundles/no.hal.osgi.emf/META-INF/MANIFEST.MF +++ b/bundles/no.hal.osgi.emf/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: no.hal.osgi.emf;singleton:=true Automatic-Module-Name: no.hal.osgi.emf -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/pom.xml b/bundles/pom.xml index 299e7db1d..4a1d6176e 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../releng/net.sourceforge.plantuml.parent diff --git a/features/net.sourceforge.plantuml.ecore.feature/feature.xml b/features/net.sourceforge.plantuml.ecore.feature/feature.xml index 885df2890..7cae5cc7e 100644 --- a/features/net.sourceforge.plantuml.ecore.feature/feature.xml +++ b/features/net.sourceforge.plantuml.ecore.feature/feature.xml @@ -2,7 +2,7 @@ @@ -18,7 +18,7 @@ - + @@ -33,7 +33,7 @@ id="net.sourceforge.plantuml.ecore" download-size="0" install-size="0" - version="1.1.30.qualifier" + version="1.1.30" unpack="false"/> diff --git a/features/net.sourceforge.plantuml.feature/feature.xml b/features/net.sourceforge.plantuml.feature/feature.xml index b2a8143bf..6265d61f4 100644 --- a/features/net.sourceforge.plantuml.feature/feature.xml +++ b/features/net.sourceforge.plantuml.feature/feature.xml @@ -2,7 +2,7 @@ @@ -37,43 +37,43 @@ - - + + diff --git a/features/net.sourceforge.plantuml.lib.elk.feature/feature.xml b/features/net.sourceforge.plantuml.lib.elk.feature/feature.xml index 8dd6f18cb..de37aae85 100644 --- a/features/net.sourceforge.plantuml.lib.elk.feature/feature.xml +++ b/features/net.sourceforge.plantuml.lib.elk.feature/feature.xml @@ -18,7 +18,7 @@ - + - - - - - -Eclipse Public License - Version 1.0 - - - - - - -

Eclipse Public License - v 1.0

- -

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 Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.

- -

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 hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.

- -

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 Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.

- -

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 claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.

- -

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 this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.

- -

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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

- -

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 -Recipient relating to the Program shall continue and survive.

- -

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 responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.

- -

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.

- - - - diff --git a/features/net.sourceforge.plantuml.lib.feature/epl-v20.html b/features/net.sourceforge.plantuml.lib.feature/epl-v20.html new file mode 100644 index 000000000..626fd4a62 --- /dev/null +++ b/features/net.sourceforge.plantuml.lib.feature/epl-v20.html @@ -0,0 +1,300 @@ + + + + + Eclipse Public License - Version 2.0 + + + +

Eclipse Public License - v 2.0

+

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:

+ +

“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 + or any Secondary License (as applicable), including Contributors. +

+

“Derivative Works” shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. +

+

“Modified Works” shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. +

+

“Distribute” means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. +

+

“Source Code” means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. +

+

“Secondary License” means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. +

+

2. GRANT OF RIGHTS

+ +

3. REQUIREMENTS

+

3.1 If a Contributor Distributes the Program in any form, then:

+ +

3.2 When the Program is Distributed as Source Code:

+ +

3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. +

+

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 Contributor”) + hereby agrees to defend and indemnify every other Contributor + (“Indemnified Contributor”) against any losses, damages and costs + (collectively “Losses”) arising from claims, lawsuits and other legal actions + brought by a third party against the Indemnified Contributor to the extent + caused by the acts or omissions of such Commercial Contributor in connection + with its distribution of the Program in a commercial product offering. + The obligations in this section do not apply to any claims or Losses relating + to any actual or alleged intellectual property infringement. In order to + qualify, an Indemnified Contributor must: a) promptly notify the + Commercial Contributor in writing of such claim, and b) allow the Commercial + Contributor to control, and cooperate with the Commercial Contributor in, + the defense and any related settlement negotiations. The Indemnified + Contributor may participate in any such claim at its own expense. +

+

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 claims and + warranties, and if a court requires any other Contributor to pay any damages + as a result, the Commercial Contributor must pay those damages. +

+

5. NO WARRANTY

+

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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 this Agreement, including but not limited to the + risks and costs of program errors, compliance with applicable laws, damage + to or loss of data, programs or equipment, and unavailability or + interruption of operations. +

+

6. DISCLAIMER OF LIABILITY

+

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, 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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +

+

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 Recipient relating to the + Program shall continue and survive. +

+

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 responsibility to serve as + the Agreement Steward to a suitable separate entity. Each new version of + the Agreement will be given a distinguishing version number. The Program + (including Contributions) may always be Distributed subject to the version + of the Agreement under which it was received. In addition, after a new + version of the Agreement is published, Contributor may elect to Distribute + the Program (including its Contributions) under the new version. +

+

Except as expressly stated in Sections 2(a) and 2(b) above, Recipient + receives no rights or licenses to the intellectual property of any + Contributor under this Agreement, whether expressly, by implication, + estoppel or otherwise. All rights in the Program not expressly granted + under this Agreement are reserved. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. +

+

Exhibit A – Form of Secondary Licenses Notice

+

“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.” +

+
+

Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. +

+

If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. +

+

You may add additional accurate notices of copyright ownership.

+
+ + \ No newline at end of file diff --git a/features/net.sourceforge.plantuml.lib.feature/feature.properties b/features/net.sourceforge.plantuml.lib.feature/feature.properties index 77a55a7fb..177f863eb 100644 --- a/features/net.sourceforge.plantuml.lib.feature/feature.properties +++ b/features/net.sourceforge.plantuml.lib.feature/feature.properties @@ -3,7 +3,7 @@ description=PlantUML library feature # "licenseURL" property - URL of the "Feature License" # do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html +licenseURL=epl-v20.html # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" diff --git a/features/net.sourceforge.plantuml.lib.feature/feature.xml b/features/net.sourceforge.plantuml.lib.feature/feature.xml index 2d9f5dc3d..4be2fc5df 100644 --- a/features/net.sourceforge.plantuml.lib.feature/feature.xml +++ b/features/net.sourceforge.plantuml.lib.feature/feature.xml @@ -2,10 +2,10 @@ - + %description @@ -21,6 +21,6 @@ id="net.sourceforge.plantuml.lib" download-size="0" install-size="0" - version="1.2023.10"/> + version="1.2023.11"/> diff --git a/features/net.sourceforge.plantuml.lib.feature/license.html b/features/net.sourceforge.plantuml.lib.feature/license.html deleted file mode 100644 index fd391227c..000000000 --- a/features/net.sourceforge.plantuml.lib.feature/license.html +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - -Eclipse Public License - Version 1.0 - - - - - - -

Eclipse Public License - v 1.0

- -

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 Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.

- -

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 hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.

- -

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 Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.

- -

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 claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.

- -

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 this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.

- -

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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

- -

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 -Recipient relating to the Program shall continue and survive.

- -

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 responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.

- -

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.

- - - - diff --git a/features/net.sourceforge.plantuml.lib.jlatexmath.feature/feature.xml b/features/net.sourceforge.plantuml.lib.jlatexmath.feature/feature.xml index 5a59320fa..f7b333e7f 100644 --- a/features/net.sourceforge.plantuml.lib.jlatexmath.feature/feature.xml +++ b/features/net.sourceforge.plantuml.lib.jlatexmath.feature/feature.xml @@ -18,7 +18,7 @@ - + net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../releng/net.sourceforge.plantuml.parent diff --git a/releng/net.sourceforge.plantuml.aggregator/pom.xml b/releng/net.sourceforge.plantuml.aggregator/pom.xml index 16bbd7330..fcc148adb 100644 --- a/releng/net.sourceforge.plantuml.aggregator/pom.xml +++ b/releng/net.sourceforge.plantuml.aggregator/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../net.sourceforge.plantuml.parent diff --git a/releng/net.sourceforge.plantuml.composite/README.md b/releng/net.sourceforge.plantuml.composite/README.md index 41d294f6e..9ab732c6f 100644 --- a/releng/net.sourceforge.plantuml.composite/README.md +++ b/releng/net.sourceforge.plantuml.composite/README.md @@ -22,8 +22,9 @@ Module for building and releasing new version. - do a `mvn clean` to clear target folders - search and replace -SNAPSHOT with in *.* - search and replace .qualifier with in *.* + (it seems, tycho/maven otherwise fails to build the plug-ins with the right non-SNAPSHOT version) - do this also for the `pom.xml` files in folders `bundles`, `features`, `releng`, and `tests` -- do this also for the plantuml.lib version (see README.md in plantuml.lib bundle +- do this also for the plantuml.lib version (see README.md in plantuml.lib bundle) - update `compositeArtifacts.xml` and `compositeContent.xml` files so they list the new version(s) - build with `mvn install` and test - add, commit and push diff --git a/releng/net.sourceforge.plantuml.composite/pom.xml b/releng/net.sourceforge.plantuml.composite/pom.xml index f4dcda216..ae718ff06 100644 --- a/releng/net.sourceforge.plantuml.composite/pom.xml +++ b/releng/net.sourceforge.plantuml.composite/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../net.sourceforge.plantuml.parent @@ -65,7 +65,7 @@ copy-resources - ${basedir}/target/gh-pages/plantuml.lib/1.2023.10 + ${basedir}/target/gh-pages/plantuml.lib/1.2023.11 ../net.sourceforge.plantuml.lib.repository/target/repository @@ -83,7 +83,7 @@ copy-resources - ${basedir}/target/gh-pages/plantuml.eclipse/1.1.30-SNAPSHOT + ${basedir}/target/gh-pages/plantuml.eclipse/1.1.30 ../net.sourceforge.plantuml.repository/target/repository @@ -134,8 +134,10 @@ - clone-bgh-pages - https://github.com/hallvard/plantuml.git + clone + -b + gh-pages + git@github.com:hallvard/plantuml.git ${basedir}/target/gh-pages @@ -167,7 +169,7 @@ ${basedir}/target/gh-pages commit -m - New release (1.1.30-SNAPSHOT) + New release (1.1.30) diff --git a/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml b/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml index b02bfaf73..516f5f144 100644 --- a/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml +++ b/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml @@ -9,7 +9,7 @@ --> - + @@ -19,6 +19,7 @@ + @@ -29,6 +30,6 @@ - + diff --git a/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml b/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml index af2fb4f27..2e725b833 100644 --- a/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml +++ b/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml @@ -9,7 +9,7 @@ --> - + @@ -19,6 +19,7 @@ + @@ -29,6 +30,6 @@ - + diff --git a/releng/net.sourceforge.plantuml.lib.aggregator/pom.xml b/releng/net.sourceforge.plantuml.lib.aggregator/pom.xml index c3ebaa3f3..061d9e647 100644 --- a/releng/net.sourceforge.plantuml.lib.aggregator/pom.xml +++ b/releng/net.sourceforge.plantuml.lib.aggregator/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../net.sourceforge.plantuml.parent diff --git a/releng/net.sourceforge.plantuml.lib.repository/category.xml b/releng/net.sourceforge.plantuml.lib.repository/category.xml index 0f39d265b..674dfd79a 100755 --- a/releng/net.sourceforge.plantuml.lib.repository/category.xml +++ b/releng/net.sourceforge.plantuml.lib.repository/category.xml @@ -1,6 +1,6 @@ - + diff --git a/releng/net.sourceforge.plantuml.lib.repository/pom.xml b/releng/net.sourceforge.plantuml.lib.repository/pom.xml index e93dfc04e..bd5d2b5ea 100644 --- a/releng/net.sourceforge.plantuml.lib.repository/pom.xml +++ b/releng/net.sourceforge.plantuml.lib.repository/pom.xml @@ -6,7 +6,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../net.sourceforge.plantuml.parent diff --git a/releng/net.sourceforge.plantuml.parent/pom.xml b/releng/net.sourceforge.plantuml.parent/pom.xml index 528647c07..8ae7502b6 100644 --- a/releng/net.sourceforge.plantuml.parent/pom.xml +++ b/releng/net.sourceforge.plantuml.parent/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 pom net.sourceforge.plantuml Eclipse plug-in maven parent project @@ -71,7 +71,7 @@ net.sourceforge.plantuml eclipse-2022-09 - 1.1.30-SNAPSHOT + 1.1.30 diff --git a/releng/net.sourceforge.plantuml.repository/category.xml b/releng/net.sourceforge.plantuml.repository/category.xml index b426b3007..dd99ee7e9 100755 --- a/releng/net.sourceforge.plantuml.repository/category.xml +++ b/releng/net.sourceforge.plantuml.repository/category.xml @@ -1,19 +1,19 @@ - + - + - + - + diff --git a/releng/net.sourceforge.plantuml.target/pom.xml b/releng/net.sourceforge.plantuml.target/pom.xml index e56d85e6f..45b068b77 100644 --- a/releng/net.sourceforge.plantuml.target/pom.xml +++ b/releng/net.sourceforge.plantuml.target/pom.xml @@ -4,7 +4,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../net.sourceforge.plantuml.parent/pom.xml diff --git a/releng/pom.xml b/releng/pom.xml index 49a34fff3..0ae9e41d9 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../releng/net.sourceforge.plantuml.parent diff --git a/tests/net.sourceforge.plantuml.eclipse.tests/META-INF/MANIFEST.MF b/tests/net.sourceforge.plantuml.eclipse.tests/META-INF/MANIFEST.MF index 85b4f63fc..876b91711 100644 --- a/tests/net.sourceforge.plantuml.eclipse.tests/META-INF/MANIFEST.MF +++ b/tests/net.sourceforge.plantuml.eclipse.tests/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml Plug-in test Bundle-SymbolicName: net.sourceforge.plantuml.eclipse.tests;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.1", org.eclipse.core.resources;bundle-version="3.3.1", - net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.30.qualifier", - net.sourceforge.plantuml.eclipse;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.30", + net.sourceforge.plantuml.eclipse;bundle-version="1.1.30", org.eclipse.ui;bundle-version="3.106.1", org.eclipse.ui.editors;bundle-version="3.8.200", org.eclipse.ui.ide;bundle-version="3.10.2", diff --git a/tests/net.sourceforge.plantuml.eclipse.tests/pom.xml b/tests/net.sourceforge.plantuml.eclipse.tests/pom.xml index 18038197f..0820584d5 100644 --- a/tests/net.sourceforge.plantuml.eclipse.tests/pom.xml +++ b/tests/net.sourceforge.plantuml.eclipse.tests/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../../releng/net.sourceforge.plantuml.parent diff --git a/tests/net.sourceforge.plantuml.ecore.tests/META-INF/MANIFEST.MF b/tests/net.sourceforge.plantuml.ecore.tests/META-INF/MANIFEST.MF index 8192b6f98..f5f3d27ea 100644 --- a/tests/net.sourceforge.plantuml.ecore.tests/META-INF/MANIFEST.MF +++ b/tests/net.sourceforge.plantuml.ecore.tests/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml Java Support Test Bundle-SymbolicName: net.sourceforge.plantuml.ecore.tests;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.1", org.eclipse.core.resources;bundle-version="3.3.1", - net.sourceforge.plantuml.eclipse;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.eclipse;bundle-version="1.1.30", org.junit, org.eclipse.ui;bundle-version="3.106.1", org.eclipse.ui.editors;bundle-version="3.8.200", org.eclipse.ui.ide;bundle-version="3.10.2", - net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.30.qualifier" + net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.30" Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: net.sourceforge.plantuml.eclipse.test.util diff --git a/tests/net.sourceforge.plantuml.ecore.tests/pom.xml b/tests/net.sourceforge.plantuml.ecore.tests/pom.xml index 67b319c6d..d8d277ea0 100644 --- a/tests/net.sourceforge.plantuml.ecore.tests/pom.xml +++ b/tests/net.sourceforge.plantuml.ecore.tests/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../../releng/net.sourceforge.plantuml.parent diff --git a/tests/net.sourceforge.plantuml.jdt.tests/META-INF/MANIFEST.MF b/tests/net.sourceforge.plantuml.jdt.tests/META-INF/MANIFEST.MF index 093726354..76c25378f 100644 --- a/tests/net.sourceforge.plantuml.jdt.tests/META-INF/MANIFEST.MF +++ b/tests/net.sourceforge.plantuml.jdt.tests/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml Java Support Test Bundle-SymbolicName: net.sourceforge.plantuml.jdt.tests;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.1", org.eclipse.core.resources;bundle-version="3.3.1", - net.sourceforge.plantuml.eclipse;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.eclipse;bundle-version="1.1.30", org.junit, org.eclipse.ui;bundle-version="3.106.1", org.eclipse.ui.editors;bundle-version="3.8.200", org.eclipse.ui.ide;bundle-version="3.10.2", - net.sourceforge.plantuml.jdt;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.jdt;bundle-version="1.1.30", org.eclipse.jdt.core;bundle-version="3.10.2", - net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.30", org.eclipse.jdt.ui;bundle-version="3.10.2", org.eclipse.jdt.launching;bundle-version="3.7.102" Bundle-ClassPath: . diff --git a/tests/net.sourceforge.plantuml.jdt.tests/pom.xml b/tests/net.sourceforge.plantuml.jdt.tests/pom.xml index fc9c17eb9..5064d1c52 100644 --- a/tests/net.sourceforge.plantuml.jdt.tests/pom.xml +++ b/tests/net.sourceforge.plantuml.jdt.tests/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../../releng/net.sourceforge.plantuml.parent diff --git a/tests/net.sourceforge.plantuml.text.tests/META-INF/MANIFEST.MF b/tests/net.sourceforge.plantuml.text.tests/META-INF/MANIFEST.MF index db3746132..47d2697f8 100644 --- a/tests/net.sourceforge.plantuml.text.tests/META-INF/MANIFEST.MF +++ b/tests/net.sourceforge.plantuml.text.tests/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plantuml Text Editor Support Test Bundle-SymbolicName: net.sourceforge.plantuml.text.tests;singleton:=true -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.1", org.eclipse.core.resources;bundle-version="3.3.1", - net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.30.qualifier", - net.sourceforge.plantuml.eclipse;bundle-version="1.1.30.qualifier", + net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.30", + net.sourceforge.plantuml.eclipse;bundle-version="1.1.30", org.junit, org.eclipse.ui;bundle-version="3.106.1", org.eclipse.ui.editors;bundle-version="3.8.200", org.eclipse.ui.ide;bundle-version="3.10.2", org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0", - net.sourceforge.plantuml.text;bundle-version="1.1.30.qualifier" + net.sourceforge.plantuml.text;bundle-version="1.1.30" Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: net.sourceforge.plantuml.text.test diff --git a/tests/net.sourceforge.plantuml.text.tests/pom.xml b/tests/net.sourceforge.plantuml.text.tests/pom.xml index cae1ecad3..c95b6e63d 100644 --- a/tests/net.sourceforge.plantuml.text.tests/pom.xml +++ b/tests/net.sourceforge.plantuml.text.tests/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../../releng/net.sourceforge.plantuml.parent diff --git a/tests/net.sourceforge.plantuml.text.tests/src/net/sourceforge/plantuml/text/test/TextEditorDiagramTextProviderTest2.java b/tests/net.sourceforge.plantuml.text.tests/src/net/sourceforge/plantuml/text/test/TextEditorDiagramTextProviderTest2.java index dbfcb85fc..9b73e4855 100644 --- a/tests/net.sourceforge.plantuml.text.tests/src/net/sourceforge/plantuml/text/test/TextEditorDiagramTextProviderTest2.java +++ b/tests/net.sourceforge.plantuml.text.tests/src/net/sourceforge/plantuml/text/test/TextEditorDiagramTextProviderTest2.java @@ -31,6 +31,7 @@ private void testJavaEditorDiagramText(String path, String expected) throws Exce @Test public void testJavaEditorDiagramFromComment() throws Exception { + // TODO Improve this test, sometimes it fails, maybe because of timing issues testJavaEditorDiagramText("src/net/sourceforge/plantuml/text/test/ClassWithDiagramInComment.java", PlantumlConstants.START_UML + "\nclass ClassWithDiagramInComment {\n\tint field\n}\n" + PlantumlConstants.END_UML); } diff --git a/tests/no.hal.osgi.emf.tests/META-INF/MANIFEST.MF b/tests/no.hal.osgi.emf.tests/META-INF/MANIFEST.MF index 6ccad24fb..8dbc72260 100644 --- a/tests/no.hal.osgi.emf.tests/META-INF/MANIFEST.MF +++ b/tests/no.hal.osgi.emf.tests/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: OSGi EMF tests Bundle-SymbolicName: no.hal.osgi.emf.tests -Bundle-Version: 1.1.30.qualifier +Bundle-Version: 1.1.30 Bundle-Vendor: PlantUML Team Require-Bundle: org.junit, org.eclipse.emf.ecore, org.eclipse.emf.ecore.xmi, org.eclipse.emf.common, - no.hal.osgi.emf;bundle-version="1.1.30.qualifier" + no.hal.osgi.emf;bundle-version="1.1.30" Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/tests/no.hal.osgi.emf.tests/pom.xml b/tests/no.hal.osgi.emf.tests/pom.xml index 5e0a3eb45..c1c494cd4 100644 --- a/tests/no.hal.osgi.emf.tests/pom.xml +++ b/tests/no.hal.osgi.emf.tests/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../../releng/net.sourceforge.plantuml.parent diff --git a/tests/pom.xml b/tests/pom.xml index ea26e51a1..2caf6a84e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.plantuml net.sourceforge.plantuml.parent - 1.1.30-SNAPSHOT + 1.1.30 ../releng/net.sourceforge.plantuml.parent