Merge branch 'release/2.12.2' into develop

2021-02-24 07:05:00 +00:00 · 2021-02-24 07:05:00 +00:00 · 7af5593fd4
parent e264ab2cbe df77af64ca
commit 7af5593fd4
19 changed files with 21 additions and 21 deletions
--- a/features/com.minres.scviewer.database.feature/pom.xml
+++ b/features/com.minres.scviewer.database.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>3.0.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.e4.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.e4.platform.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.0.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.feature/pom.xml
+++ b/features/com.minres.scviewer.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.ui.feature/pom.xml
+++ b/features/com.minres.scviewer.ui.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- a/plugins/com.minres.scviewer.database.sqlite/pom.xml
+++ b/plugins/com.minres.scviewer.database.sqlite/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.text/pom.xml
+++ b/plugins/com.minres.scviewer.database.text/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.1</version>
+		<version>2.12.2</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>3.0.0-SNAPSHOT</version>
--- a/plugins/com.minres.scviewer.database.vcd/pom.xml
+++ b/plugins/com.minres.scviewer.database.vcd/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database/pom.xml
+++ b/plugins/com.minres.scviewer.database/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.12.1
+Bundle-Version: 2.12.2
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
 org.eclipse.core.runtime;bundle-version="3.11.1",
--- a/plugins/com.minres.scviewer.e4.application/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.1</version>
+		<version>2.12.2</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.ui/pom.xml
+++ b/plugins/com.minres.scviewer.ui/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/pom.xml
+++ b/pom.xml
@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>2.12.1</version>
+	<version>2.12.2</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>releng/com.minres.scviewer.target</module>
@ -67,7 +67,7 @@
 						<artifact>
 							<groupId>com.minres.scviewer</groupId>
 							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.12.1</version>
+							<version>2.12.2</version>
 						</artifact>
 					</target>
 					<environments>
--- a/products/com.minres.scviewer.e4.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product/pom.xml
@ -6,11 +6,11 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.1</version>
+		<version>2.12.2</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product name="SCViewer" uid="product" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.12.1" useFeatures="true" includeLaunchers="true">
+<product name="SCViewer" uid="product" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.12.2" useFeatures="true" includeLaunchers="true">

   <configIni use="default">
   </configIni>
--- a/releng/com.minres.scviewer.target/pom.xml
+++ b/releng/com.minres.scviewer.target/pom.xml
@ -12,7 +12,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.12.1</version>
+  	<version>2.12.2</version>
  	<relativePath>../..</relativePath>
  </parent>

--- a/releng/com.minres.scviewer.updateSite/pom.xml
+++ b/releng/com.minres.scviewer.updateSite/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.1</version>
+		<version>2.12.2</version>
 		<relativePath>../..</relativePath>
 	</parent>
    <build>
--- a/tests/com.minres.scviewer.database.test/pom.xml
+++ b/tests/com.minres.scviewer.database.test/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.12.1</version>
+		<version>2.12.2</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>