Merge branch '1.1.29-release'

hallvard · Jul 19, 2023 · 3f4f484 · 3f4f484
2 parents 9387287 + a1bad9f
commit 3f4f484
Show file tree

Hide file tree

Showing 38 changed files with 99 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,7 @@ Note that the version numbers of the plantuml.lib plugin are a bit special, sinc
 
 ## [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.
 
 ## [1.1.28](https://github.com/hallvard/plantuml/releases/tag/1.1.28)
 - Updated to use PlantUML library version 1.2023.5 ([issue #145](https://github.com/hallvard/plantuml/issues/145)), see [changes](https://plantuml.com/changes).

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.29.qualifier
+Bundle-Version: 1.1.29
 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,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plantuml Plug-in
 Bundle-SymbolicName: net.sourceforge.plantuml.eclipse; singleton:=true
-Bundle-Version: 1.1.29.qualifier
+Bundle-Version: 1.1.29
 Bundle-Activator: net.sourceforge.plantuml.eclipse.Activator
 Bundle-Vendor: PlantUML Team
 Require-Bundle: org.eclipse.ui.ide;bundle-version="3.10.2",

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.29.qualifier
+Bundle-Version: 1.1.29
 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.29.qualifier
+Bundle-Version: 1.1.29
 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.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.29.qualifier
+Bundle-Version: 1.1.29
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.29.qualifier",
+Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.29",
  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.29.qualifier",
+ net.sourceforge.plantuml.text;bundle-version="1.1.29",
  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
@@ -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.29.qualifier
+Bundle-Version: 1.1.29
 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
@@ -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.29.qualifier
+Bundle-Version: 1.1.29
 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
@@ -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.29.qualifier
+Bundle-Version: 1.1.29
 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
@@ -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.29.qualifier
+Bundle-Version: 1.1.29
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.29-SNAPSHOT</version>
+	  	<version>1.1.29</version>
 	  	<relativePath>../releng/net.sourceforge.plantuml.parent</relativePath>
 	  </parent>
 

diff --git a/features/net.sourceforge.plantuml.ecore.feature/feature.xml b/features/net.sourceforge.plantuml.ecore.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.sourceforge.plantuml.ecore.feature"
       label="%featureName"
-      version="1.1.29.qualifier"
+      version="1.1.29"
       provider-name="PlantUML Team">
 
    <description url="http://plantuml.sourceforge.net/">
@@ -18,14 +18,22 @@
    </license>
 
    <requires>
-      <import feature="net.sourceforge.plantuml.feature" version="1.1.20"/>
+      <import feature="net.sourceforge.plantuml.feature" version="1.1.29"/>
+      <import plugin="net.sourceforge.plantuml.eclipse"/>
+      <import plugin="net.sourceforge.plantuml.text"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.emf.common"/>
+      <import plugin="org.eclipse.emf.ecore"/>
+      <import plugin="org.eclipse.emf.edit"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.ui.ide"/>
    </requires>
 
    <plugin
          id="net.sourceforge.plantuml.ecore"
          download-size="0"
          install-size="0"
-         version="1.1.29.qualifier"
+         version="1.1.29"
          unpack="false"/>
 
 </feature>
diff --git a/features/net.sourceforge.plantuml.feature/feature.xml b/features/net.sourceforge.plantuml.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.sourceforge.plantuml.feature"
       label="%featureName"
-      version="1.1.29.qualifier"
+      version="1.1.29"
       provider-name="PlantUML Team">
 
    <description url="http://plantuml.sourceforge.net/">
@@ -18,42 +18,62 @@
    </license>
 
    <requires>
-      <import feature="net.sourceforge.plantuml.lib.feature" version="1.2021.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.10.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.106.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.9.1" match="greaterOrEqual"/>
+      <import plugin="net.sourceforge.plantuml.eclipse.imagecontrol"/>
+      <import plugin="org.eclipse.core.jobs"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.ui.workbench"/>
+      <import plugin="org.eclipse.osgi"/>
+      <import plugin="net.sourceforge.plantuml.eclipse"/>
+      <import plugin="net.sourceforge.plantuml.text"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.jdt.debug.ui"/>
+      <import plugin="org.eclipse.jdt.core.manipulation"/>
+      <import plugin="org.eclipse.jdt.ui"/>
+      <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.8.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.jface" version="3.10.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.browser" version="3.4.200" match="greaterOrEqual"/>
+      <import feature="net.sourceforge.plantuml.lib.feature" version="1.2023.10" match="greaterOrEqual"/>
+      <import plugin="net.sourceforge.plantuml.lib" version="1.2023.10" match="greaterOrEqual"/>
    </requires>
 
    <plugin
          id="net.sourceforge.plantuml.eclipse"
          download-size="0"
          install-size="0"
-         version="1.1.29.qualifier"
+         version="1.1.29"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.jdt"
          download-size="0"
          install-size="0"
-         version="1.1.29.qualifier"
+         version="1.1.29"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.text"
          download-size="0"
          install-size="0"
-         version="1.1.29.qualifier"
+         version="1.1.29"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.eclipse.imagecontrol"
          download-size="0"
          install-size="0"
-         version="1.1.29.qualifier"
+         version="1.1.29"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.svg"
          download-size="0"
          install-size="0"
-         version="1.1.29.qualifier"
+         version="1.1.29"
          unpack="false"/>
 
 </feature>
diff --git a/features/net.sourceforge.plantuml.lib.elk.feature/feature.xml b/features/net.sourceforge.plantuml.lib.elk.feature/feature.xml
@@ -17,6 +17,10 @@
       %license
    </license>
 
+   <requires>
+      <import plugin="net.sourceforge.plantuml.lib" version="1.2023.10" match="greaterOrEqual"/>
+   </requires>
+
    <plugin
          id="net.sourceforge.plantuml.lib.elk"
          download-size="0"

diff --git a/features/net.sourceforge.plantuml.lib.jlatexmath.feature/feature.xml b/features/net.sourceforge.plantuml.lib.jlatexmath.feature/feature.xml
@@ -17,6 +17,10 @@
       %license
    </license>
 
+   <requires>
+      <import plugin="net.sourceforge.plantuml.lib" version="1.2023.10" match="greaterOrEqual"/>
+   </requires>
+
    <plugin
          id="net.sourceforge.plantuml.lib.jlatexmath"
          download-size="0"

diff --git a/features/pom.xml b/features/pom.xml
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.29-SNAPSHOT</version>
+	  	<version>1.1.29</version>
 	  	<relativePath>../releng/net.sourceforge.plantuml.parent</relativePath>
 	  </parent>
 

diff --git a/releng/net.sourceforge.plantuml.aggregator/pom.xml b/releng/net.sourceforge.plantuml.aggregator/pom.xml
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.29-SNAPSHOT</version>
+	  	<version>1.1.29</version>
 	  	<relativePath>../net.sourceforge.plantuml.parent</relativePath>
 	  </parent>
 

diff --git a/releng/net.sourceforge.plantuml.composite/README.md b/releng/net.sourceforge.plantuml.composite/README.md
@@ -6,6 +6,7 @@ Module for building and releasing new version.
 
 ### Pre-release
 
+- re-calculate / update all features' dependencies
 - build and test and build and test...
 - run `mvn clean install` on project `net.sourceforge.plantuml.composite` or just run the launch configuration *Build all with Maven*
   (that builds and runs all non-UI unit tests)

diff --git a/releng/net.sourceforge.plantuml.composite/pom.xml b/releng/net.sourceforge.plantuml.composite/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.sourceforge.plantuml</groupId>
 		<artifactId>net.sourceforge.plantuml.parent</artifactId>
-		<version>1.1.29-SNAPSHOT</version>
+		<version>1.1.29</version>
 		<relativePath>../net.sourceforge.plantuml.parent</relativePath>
 	</parent>
 
@@ -83,7 +83,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/target/gh-pages/plantuml.eclipse/1.1.29-SNAPSHOT</outputDirectory>
+							<outputDirectory>${basedir}/target/gh-pages/plantuml.eclipse/1.1.29</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../net.sourceforge.plantuml.repository/target/repository</directory>
@@ -167,7 +167,7 @@
                                 <argument>${basedir}/target/gh-pages</argument>
                                 <argument>commit</argument>
                                 <argument>-m</argument>
-                                <argument>New release (1.1.29-SNAPSHOT)</argument>
+                                <argument>New release (1.1.29)</argument>
                             </arguments>
                         </configuration>
                     </execution>

diff --git a/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml b/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml
@@ -28,6 +28,6 @@
 		<child location='plantuml.eclipse/1.1.26' />
 		<child location='plantuml.eclipse/1.1.27' />
 		<child location='plantuml.eclipse/1.1.28' />
-		<child location='plantuml.eclipse/1.1.29-SNAPSHOT' />
+		<child location='plantuml.eclipse/1.1.29' />
 	</children>
 </repository>
diff --git a/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml b/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml
@@ -28,6 +28,6 @@
 		<child location='plantuml.eclipse/1.1.26' />
 		<child location='plantuml.eclipse/1.1.27' />
 		<child location='plantuml.eclipse/1.1.28' />
-		<child location='plantuml.eclipse/1.1.29-SNAPSHOT' />
+		<child location='plantuml.eclipse/1.1.29' />
 	</children>
 </repository>
diff --git a/releng/net.sourceforge.plantuml.lib.aggregator/pom.xml b/releng/net.sourceforge.plantuml.lib.aggregator/pom.xml
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.29-SNAPSHOT</version>
+	  	<version>1.1.29</version>
 	  	<relativePath>../net.sourceforge.plantuml.parent</relativePath>
 	  </parent>
 

diff --git a/releng/net.sourceforge.plantuml.lib.repository/pom.xml b/releng/net.sourceforge.plantuml.lib.repository/pom.xml
@@ -6,7 +6,7 @@
   <parent>
   	<groupId>net.sourceforge.plantuml</groupId>
   	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-  	<version>1.1.29-SNAPSHOT</version>
+  	<version>1.1.29</version>
   	<relativePath>../net.sourceforge.plantuml.parent</relativePath>
   </parent>
 

diff --git a/releng/net.sourceforge.plantuml.parent/pom.xml b/releng/net.sourceforge.plantuml.parent/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sourceforge.plantuml</groupId>
 	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	<version>1.1.29-SNAPSHOT</version>
+	<version>1.1.29</version>
 	<packaging>pom</packaging>
 	<name>net.sourceforge.plantuml Eclipse plug-in maven parent project</name>
 
@@ -71,7 +71,7 @@
 						<artifact>
 							<groupId>net.sourceforge.plantuml</groupId>
 							<artifactId>eclipse-2022-09</artifactId>
-							<version>1.1.29-SNAPSHOT</version>
+							<version>1.1.29</version>
 						</artifact>
 					</target>
 					<environments>

diff --git a/releng/net.sourceforge.plantuml.repository/category.xml b/releng/net.sourceforge.plantuml.repository/category.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/net.sourceforge.plantuml.ecore.feature_1.1.29.qualifier.jar" id="net.sourceforge.plantuml.ecore.feature" version="1.1.29.qualifier">
+   <feature url="features/net.sourceforge.plantuml.ecore.feature_1.1.29.jar" id="net.sourceforge.plantuml.ecore.feature" version="1.1.29">
       <category name="net.sourceforge.plantuml.feature"/>
    </feature>
-   <feature url="features/net.sourceforge.plantuml.feature_1.1.29.qualifier.jar" id="net.sourceforge.plantuml.feature" version="1.1.29.qualifier">
+   <feature url="features/net.sourceforge.plantuml.feature_1.1.29.jar" id="net.sourceforge.plantuml.feature" version="1.1.29">
       <category name="net.sourceforge.plantuml.feature"/>
    </feature>
    <category-def name="net.sourceforge.plantuml.feature" label="PlantUML Eclipse support"/>
 
    <!-- Source code feature(s) -->
    <category-def name="net.sourceforge.plantuml.feature.source" label="Source"/>
-   <feature id="net.sourceforge.plantuml.feature.source" version="1.1.29.qualifier">
+   <feature id="net.sourceforge.plantuml.feature.source" version="1.1.29">
       <category name="net.sourceforge.plantuml.feature.source"/>
    </feature>
-   <feature id="net.sourceforge.plantuml.ecore.feature.source" version="1.1.29.qualifier">
+   <feature id="net.sourceforge.plantuml.ecore.feature.source" version="1.1.29">
       <category name="net.sourceforge.plantuml.feature.source"/>
    </feature>
 </site>
diff --git a/releng/net.sourceforge.plantuml.target/pom.xml b/releng/net.sourceforge.plantuml.target/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.plantuml</groupId>
     <artifactId>net.sourceforge.plantuml.parent</artifactId>
-    <version>1.1.29-SNAPSHOT</version>
+    <version>1.1.29</version>
     <relativePath>../net.sourceforge.plantuml.parent/pom.xml</relativePath>
   </parent>
 

diff --git a/releng/pom.xml b/releng/pom.xml
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.29-SNAPSHOT</version>
+	  	<version>1.1.29</version>
 	  	<relativePath>../releng/net.sourceforge.plantuml.parent</relativePath>
 	  </parent>