Merge branch '1.1.30-release'

hallvard · Oct 18, 2023 · 198d2dc · 198d2dc
2 parents 2c3e202 + f89863b
commit 198d2dc
Show file tree

Hide file tree

Showing 57 changed files with 956 additions and 1,013 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/plantuml-epl-1.2023.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/travkin/Documents/git-repos/plantuml4eclipse/bundles/net.sourceforge.plantuml.lib/lib/plantuml-epl-1.2023.11.jar" sourcepath="lib/plantuml-epl-1.2023.11-sources.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git 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
@@ -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
@@ -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