Merge branch 'release/2.15.0' into develop

.launch/Build and deploy SCViewer.launch

@@ -12,7 +12,8 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/AdoptOpenJDK 8 [1.8.0_232]"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
 </launchConfiguration>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>3.0.0-SNAPSHOT</version>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

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.14.2</version>
+		<version>2.15.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>4.0.0-SNAPSHOT</version>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

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.14.2
+Bundle-Version: 2.15.0
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",

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.14.2</version>
+		<version>2.15.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

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.14.2</version>
+  	<version>2.15.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>2.14.2</version>
+	<version>2.15.0</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>releng/com.minres.scviewer.target</module>
@@ -29,6 +29,8 @@
 		<tycho-version>1.5.0</tycho-version>
 		<groovy-eclipse-compiler-version>3.6.0-03</groovy-eclipse-compiler-version>
 		<groovy-eclipse-batch-version>3.0.3-01</groovy-eclipse-batch-version>
+<!-- 		<software.download.area>${user.home}/deployment-work/${DEPLOY_WORK_DIRECTORY}</software.download.area> -->
+		<software.download.area>${project.build.directory}/../</software.download.area>
 	</properties>
 
 	<build>
@@ -67,7 +69,7 @@
 						<artifact>
 							<groupId>com.minres.scviewer</groupId>
 							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.14.2</version>
+							<version>2.15.0</version>
 						</artifact>
 					</target>
 					<environments>
@@ -125,7 +127,6 @@
 						<plugin id="org.hamcrest.core" />
 						<plugin id="org.junit" />						
 						<plugin id="com.minres.scviewer.e4.product" />
-						<plugin id="com.minres.scviewer.e4.product_slim" />
 						<plugin id="org.eclipse.core.filesystem.linux.x86_64" />
 						<plugin id="org.eclipse.core.filesystem.win32.x86_64" />
 						<plugin id="com.opcoach.e4.preferences" />

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.14.2</version>
+		<version>2.15.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.14.2</version>
+  	<version>2.15.0</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>

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.14.2" 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.15.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

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.14.2</version>
+  	<version>2.15.0</version>
   	<relativePath>../..</relativePath>
   </parent>
 

releng/com.minres.scviewer.updateSite/.gitignore

@@ -3,3 +3,4 @@
 /artifacts.jar
 /content.jar
 /target/
+/gh-pages/

releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant

@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<project name="project">
+
+    <target name="getMajorMinorVersion">
+        <script language="javascript">
+            <![CDATA[
+
+                  // getting the value
+                  buildnumber = project.getProperty("unqualifiedVersion");
+                  index = buildnumber.lastIndexOf(".");
+                  counter = buildnumber.substring(0, index);
+            project.setProperty("majorMinorVersion",counter);
+
+              ]]>
+        </script>
+    </target>
+
+    <target name="test_getMajorMinor" depends="getMajorMinorVersion">
+        <echo message="majorMinorVersion: ${majorMinorVersion}"/>
+    </target>
+
+    <!--
+    site.label      The name/title/label of the created composite site
+    unqualifiedVersion  The version without any qualifier replacement
+    buildQualifier    The build qualifier
+  -->
+    <target name="compute.child.repository.data" depends="getMajorMinorVersion">
+        <property name="full.version" value="${unqualifiedVersion}" />
+
+        <property name="software.download.area" location="${user.home}/p2.repositories" />
+        <property name="updates.dir" value="updates" />
+
+        <property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
+        <property name="main.site.composite.name" value="${site.label} All Versions" />
+
+    	<!--
+        <property name="main.composite.repository.directory" location="${software.download.area}/${updates.dir}" />
+      -->
+        <property name="main.composite.repository.directory" location="${software.download.area}" />
+
+        <property name="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" />
+        <property name="child.repository" value="${full.version}" />
+        <property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" />
+    </target>
+
+    <target name="p2.composite.add" depends="compute.child.repository.data">
+        <property name="source.repository" location="${project.build.directory}/repository"/>
+
+        <echo message=" " />
+
+        <echo message="Source repository path: ${source.repository}" />
+
+        <echo message="Copying to ${child.repository.directory}..." />
+
+        <mkdir dir="${child.repository.directory}"/>
+        <copy todir="${child.repository.directory}" overwrite="true">
+            <fileset dir="${source.repository}" />
+        </copy>
+
+        <add.composite.repository.internal
+      composite.repository.location="${composite.repository.directory}"
+      composite.repository.name="${site.composite.name}"
+      composite.repository.child="${child.repository}"
+    />
+
+        <add.composite.repository.internal
+      composite.repository.location="${main.composite.repository.directory}"
+      composite.repository.name="${main.site.composite.name}"
+      composite.repository.child="${majorMinorVersion}"
+    />
+
+    </target>
+
+    <!-- = = = = = = = = = = = = = = = = =
+          macrodef: add.composite.repository.internal          
+         = = = = = = = = = = = = = = = = = -->
+    <macrodef name="add.composite.repository.internal">
+        <attribute name="composite.repository.location" />
+        <attribute name="composite.repository.name" />
+        <attribute name="composite.repository.child" />
+        <sequential>
+
+            <echo message=" " />
+            <echo message="Composite repository       : @{composite.repository.location}" />
+            <echo message="Composite name             : @{composite.repository.name}" />
+            <echo message="Adding child repository    : @{composite.repository.child}" />
+
+            <p2.composite.repository>
+                <repository compressed="false" location="@{composite.repository.location}" name="@{composite.repository.name}" />
+                <add>
+                    <repository location="@{composite.repository.child}" />
+                </add>
+            </p2.composite.repository>
+
+            <echo file="@{composite.repository.location}/p2.index">version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+</echo>
+
+        </sequential>
+    </macrodef>
+
+
+</project>

releng/com.minres.scviewer.updateSite/pom.xml

@@ -7,22 +7,23 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.14.2</version>
+		<version>2.15.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
-    <build>
+	<build>
-        <plugins>
+		<plugins>
-            <!-- make sure that zipped p2 repositories have the fully qualified version -->
+			<!-- make sure that zipped p2 repositories have the fully qualified version -->
-            <plugin>
+			<plugin>
-                <groupId>org.eclipse.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-p2-repository-plugin</artifactId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
-                <version>${tycho-version}</version>
+				<version>${tycho-version}</version>
-                <configuration>
+				<configuration>
-                    <finalName>${project.artifactId}-${qualifiedVersion}</finalName>
+					<finalName>${project.artifactId}-${qualifiedVersion}</finalName>
-                </configuration>
+				</configuration>
-            </plugin>
+			</plugin>
-        </plugins>
+		</plugins>
-    </build>
+	</build>
+	
 	<profiles>
 		<profile>
 			<!-- Activate this profile to perform the release to Bintray -->
@@ -33,38 +34,78 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>com.carrotgarden.maven</groupId>
+						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>bintray-maven-plugin</artifactId>
+						<artifactId>exec-maven-plugin</artifactId>
-    					<version>1.5.20191113165555</version>
+						<version>3.0.0</version>
-   						<configuration>
-							<skip>false</skip>
-							<!-- Bintray organization name. -->
-							<subject>minres</subject>
-							<!-- Bintray target repository. -->
-							<repository>eclipse</repository>
-							<!-- Bintray package name -->
-							<bintrayPackage>SCViewer</bintrayPackage>
-							<!-- Bintray package version number -->
-							<bintrayVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</bintrayVersion>
-							<!-- remove any preexisting files -->
-							<performDestroy>true</performDestroy>
-							<!-- information used when creating the package  -->							
-							<packageVcsUrl>https://git.minres.com/VP-Tools/SCViewer.git</packageVcsUrl>
-							<packageLicenses>EPL-1.0</packageLicenses>
-							<!-- Local folder content to sync to the remote repo. -->
-							<sourceFolder>${project.build.directory}/repository</sourceFolder>
-							<!-- Remote folder for local content upload, relative path. -->
-							<targetFolder>SCViewer/${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</targetFolder>
-							<!-- Bintray credentials in settings.xml. -->
-							<serverId>bintray-minres-deploy</serverId>
-						</configuration>
 						<executions>
-							<!-- Activate "bintray:upload" during "package" -->
 							<execution>
 								<phase>package</phase>
 								<goals>
-                                    <goal>upload</goal>
+									<goal>exec</goal>
-                                </goals>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<executable>bash</executable>
+							<!-- optional -->
+							<workingDirectory>${software.download.area}</workingDirectory>
+							<arguments>
+								<argument>-c</argument>
+								<argument>if [ -d gh-pages ]; then cd gh-pages; git pull; else git clone --branch gh-pages https://git.minres.com/VP-Tools/SCViewer.git gh-pages; fi</argument>
+							</arguments>
+							<environmentVariables>
+								<LANG>en_US</LANG>
+							</environmentVariables>
+						</configuration>
+					</plugin>
+ 					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<!-- IMPORTANT: DO NOT split the arg line -->
+							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="SCViewer Software Repository" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dsoftware.download.area="${software.download.area}/gh-pages/repository"</appArgLine>
+							<repositories>
+								<repository>
+									<id>2020-03</id>
+									<layout>p2</layout>
+									<url>http://download.eclipse.org/releases/2020-03/</url>
+								</repository>
+							</repositories>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.ds</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<id>add-p2-composite-repository</id>
+								<phase>package</phase>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
 							</execution>
 						</executions>
 					</plugin>

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.14.2</version>
+		<version>2.15.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>