Prepare for release 1.1.23

hallvard · Apr 4, 2019 · 9167d05 · 9167d05
1 parent 8fd16d8
commit 9167d05
Show file tree

Hide file tree

Showing 33 changed files with 58 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -33,15 +33,15 @@ We use github pages @ http://hallvard.github.io/plantuml as the update site URL,
 
 # Releases
 
-Notable features in recent releases, details are found in [../../releases].
+Notable features in recent releases, details are found in [releases](../../releases).
 Note that the version numbers are a bit special, since they include the version of the included plantuml.jar
 
 ## [1.1.23](../../releases/tag/1.1.23)
 - Support for generating diagrams for views, e.g. Java element selected in Package Explorer ([issue #84](../../issues/84)).
 - Support for generating diagrams from console output.
 - Preference page for enabling/disabling diagram providers.
 - Avoid generating diagram (image) when PlantUml view is hidden. 
-- Moved list of diagram into sub-menu of view menu, handles [issue #87](../../issues/87)).
+- Moved list of diagram into sub-menu of view menu, handles [issue #87](../../issues/87).
 - Now requires Java 1.8.
 
 ## [1.1.22](../../releases/tag/1.1.22)

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: Plantuml Plug-in
 Bundle-SymbolicName: net.sourceforge.plantuml.eclipse.imagecontrol
-Bundle-Version: 1.1.23.qualifier
+Bundle-Version: 1.1.23
 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.23.qualifier
+Bundle-Version: 1.1.23
 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.23.qualifier
+Bundle-Version: 1.1.23
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 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.23.qualifier
+Bundle-Version: 1.1.23
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 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.23.qualifier
+Bundle-Version: 1.1.23
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.23.qualifier",
+Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.23",
  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.23.qualifier",
+ net.sourceforge.plantuml.text;bundle-version="1.1.23",
  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.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.23.qualifier
+Bundle-Version: 1.1.23
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: net.sourceforge.plantuml.text
 Import-Package: net.sourceforge.plantuml.eclipse.utils,

diff --git a/bundles/net.sourceforge.plantuml.uml2/META-INF/MANIFEST.MF b/bundles/net.sourceforge.plantuml.uml2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UML2 PlantUML mapping
 Bundle-SymbolicName: net.sourceforge.plantuml.uml2; singleton:=true
-Bundle-Version: 1.1.23.qualifier
+Bundle-Version: 1.1.23
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: net.sourceforge.plantuml.uml2
 Import-Package: net.sourceforge.plantuml.eclipse.utils,

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.23.qualifier
+Bundle-Version: 1.1.23
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: no.hal.osgi.emf;singleton:=true
-Bundle-Version: 1.1.23.qualifier
+Bundle-Version: 1.1.23
 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.23-SNAPSHOT</version>
+	  	<version>1.1.23</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.23.qualifier"
+      version="1.1.23"
       provider-name="PlantUML Team">
 
    <description url="http://plantuml.sourceforge.net/">
@@ -25,7 +25,7 @@
          id="net.sourceforge.plantuml.ecore"
          download-size="0"
          install-size="0"
-         version="1.1.23.qualifier"
+         version="1.1.23"
          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.23.qualifier"
+      version="1.1.23"
       provider-name="PlantUML Team">
 
    <description url="http://plantuml.sourceforge.net/">
@@ -25,28 +25,28 @@
          id="net.sourceforge.plantuml.eclipse"
          download-size="0"
          install-size="0"
-         version="1.1.23.qualifier"
+         version="1.1.23"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.jdt"
          download-size="0"
          install-size="0"
-         version="1.1.23.qualifier"
+         version="1.1.23"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.text"
          download-size="0"
          install-size="0"
-         version="1.1.23.qualifier"
+         version="1.1.23"
          unpack="false"/>
 
    <plugin
          id="net.sourceforge.plantuml.eclipse.imagecontrol"
          download-size="0"
          install-size="0"
-         version="1.1.23.qualifier"
+         version="1.1.23"
          unpack="false"/>
 
 </feature>
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.23-SNAPSHOT</version>
+	  	<version>1.1.23</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.23-SNAPSHOT</version>
+	  	<version>1.1.23</version>
 	  	<relativePath>../net.sourceforge.plantuml.parent</relativePath>
 	  </parent>
 
@@ -37,4 +37,5 @@
 
 		<module>../net.sourceforge.plantuml.repository</module>
 	</modules>
+<version>1.1.23</version>
 </project>
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.23-SNAPSHOT</version>
+		<version>1.1.23</version>
 		<relativePath>../net.sourceforge.plantuml.parent</relativePath>
 	</parent>
 
@@ -80,7 +80,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/target/plantuml.eclipse/1.1.23-SNAPSHOT</outputDirectory>
+							<outputDirectory>${basedir}/target/plantuml.eclipse/1.1.23</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../net.sourceforge.plantuml.repository/target/repository</directory>

diff --git a/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml b/releng/net.sourceforge.plantuml.composite/repository/compositeArtifacts.xml
@@ -9,12 +9,13 @@
 		<property name='p2.atomic.composite.loading' value='true' />
 	 -->
 	</properties>
-	<children size='6'>
+	<children size='7'>
 		<child location='plantuml.lib/1.2018.9' />
 		<child location='plantuml.lib/1.2018.12' />
 		<child location='plantuml.lib/1.2019.0' />
 		<child location='plantuml.eclipse/1.1.20' />
 		<child location='plantuml.eclipse/1.1.21' />
 		<child location='plantuml.eclipse/1.1.22' />
+		<child location='plantuml.eclipse/1.1.23' />
 	</children>
 </repository>
diff --git a/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml b/releng/net.sourceforge.plantuml.composite/repository/compositeContent.xml
@@ -16,5 +16,6 @@
 		<child location='plantuml.eclipse/1.1.20' />
 		<child location='plantuml.eclipse/1.1.21' />
 		<child location='plantuml.eclipse/1.1.22' />
+		<child location='plantuml.eclipse/1.1.23' />
 	</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.23-SNAPSHOT</version>
+	  	<version>1.1.23</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.23-SNAPSHOT</version>
+  	<version>1.1.23</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,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sourceforge.plantuml</groupId>
 	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	<version>1.1.23-SNAPSHOT</version>
+	<version>1.1.23</version>
 	<packaging>pom</packaging>
 	<name>net.sourceforge.plantuml maven parent project</name>
 
 	<properties>
-		<tycho-maven-plugin-version>1.0.0</tycho-maven-plugin-version>
-		<tycho-version>1.0.0</tycho-version>
+		<tycho-maven-plugin-version>1.3.0</tycho-maven-plugin-version>
+		<tycho-version>1.3.0</tycho-version>
 		<xtextVersion>2.9.1</xtextVersion>
 		<xtend-maven-plugin-version>2.9.1</xtend-maven-plugin-version>
 
@@ -80,7 +80,7 @@
 						<artifact>
 							<groupId>net.sourceforge.plantuml</groupId>
 							<artifactId>net.sourceforge.plantuml.target</artifactId>
-							<version>1.1.23-SNAPSHOT</version>
+							<version>1.1.23</version>
 						</artifact>
 					</target>
 					<filters>

diff --git a/releng/net.sourceforge.plantuml.repository/category.xml b/releng/net.sourceforge.plantuml.repository/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/net.sourceforge.plantuml.ecore.feature_1.1.23.qualifier.jar" id="net.sourceforge.plantuml.ecore.feature" version="1.1.23.qualifier">
+   <feature url="features/net.sourceforge.plantuml.ecore.feature_1.1.23.jar" id="net.sourceforge.plantuml.ecore.feature" version="1.1.23">
       <category name="net.sourceforge.plantuml.feature"/>
    </feature>
-   <feature url="features/net.sourceforge.plantuml.feature_1.1.23.qualifier.jar" id="net.sourceforge.plantuml.feature" version="1.1.23.qualifier">
+   <feature url="features/net.sourceforge.plantuml.feature_1.1.23.jar" id="net.sourceforge.plantuml.feature" version="1.1.23">
       <category name="net.sourceforge.plantuml.feature"/>
    </feature>
    <category-def name="net.sourceforge.plantuml.feature" label="PlantUML Eclipse support"/>

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

diff --git a/releng/net.sourceforge.plantuml.target/pom.xml b/releng/net.sourceforge.plantuml.target/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>net.sourceforge.plantuml</groupId>
 		<artifactId>net.sourceforge.plantuml.parent</artifactId>
-		<version>1.1.23-SNAPSHOT</version>
+		<version>1.1.23</version>
 		<relativePath>../net.sourceforge.plantuml.parent</relativePath>
 	</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
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plantuml Plug-in test
 Bundle-SymbolicName: net.sourceforge.plantuml.eclipse.tests
-Bundle-Version: 1.1.23.qualifier
+Bundle-Version: 1.1.23
 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.23.qualifier",
- net.sourceforge.plantuml.eclipse;bundle-version="1.1.23.qualifier",
+ net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.23",
+ net.sourceforge.plantuml.eclipse;bundle-version="1.1.23",
  org.junit,
  org.eclipse.ui;bundle-version="3.106.1",
  org.eclipse.ui.editors;bundle-version="3.8.200",

diff --git a/tests/net.sourceforge.plantuml.eclipse.tests/pom.xml b/tests/net.sourceforge.plantuml.eclipse.tests/pom.xml
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.23-SNAPSHOT</version>
+	  	<version>1.1.23</version>
 	  	<relativePath>../../releng/net.sourceforge.plantuml.parent</relativePath>
 	  </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
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plantuml Java Support Test
 Bundle-SymbolicName: net.sourceforge.plantuml.jdt.tests
-Bundle-Version: 1.1.23.qualifier
+Bundle-Version: 1.1.23
 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.23.qualifier",
+ net.sourceforge.plantuml.eclipse;bundle-version="1.1.23",
  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.23.qualifier",
+ net.sourceforge.plantuml.jdt;bundle-version="1.1.23",
  org.eclipse.jdt.core;bundle-version="3.10.2",
- net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.23.qualifier",
+ net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.23",
  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
@@ -7,7 +7,7 @@
 	  <parent>
 	  	<groupId>net.sourceforge.plantuml</groupId>
 	  	<artifactId>net.sourceforge.plantuml.parent</artifactId>
-	  	<version>1.1.23-SNAPSHOT</version>
+	  	<version>1.1.23</version>
 	  	<relativePath>../../releng/net.sourceforge.plantuml.parent</relativePath>
 	  </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
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plantuml Text Editor Support Test
 Bundle-SymbolicName: net.sourceforge.plantuml.text.tests
-Bundle-Version: 1.1.23.qualifier
+Bundle-Version: 1.1.23
 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.23.qualifier",
- net.sourceforge.plantuml.eclipse;bundle-version="1.1.23.qualifier",
+ net.sourceforge.plantuml.eclipse.imagecontrol;bundle-version="1.1.23",
+ net.sourceforge.plantuml.eclipse;bundle-version="1.1.23",
  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.eclipse.tests;bundle-version="1.1.23.qualifier",
- net.sourceforge.plantuml.text;bundle-version="1.1.23.qualifier"
+ net.sourceforge.plantuml.eclipse.tests;bundle-version="1.1.23",
+ net.sourceforge.plantuml.text;bundle-version="1.1.23"
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: net.sourceforge.plantuml.text.test