diff --git a/.launch/Build and deploy SCViewer.launch b/.launch/Build and deploy SCViewer.launch
index e514693..81ced40 100644
--- a/.launch/Build and deploy SCViewer.launch
+++ b/.launch/Build and deploy SCViewer.launch
@@ -12,7 +12,8 @@
+
+
-
diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml
index 2e5ffac..643ebfe 100644
--- a/features/com.minres.scviewer.database.feature/pom.xml
+++ b/features/com.minres.scviewer.database.feature/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
3.0.0-SNAPSHOT
diff --git a/features/com.minres.scviewer.e4.feature/pom.xml b/features/com.minres.scviewer.e4.feature/pom.xml
index 450f38d..80493fe 100644
--- a/features/com.minres.scviewer.e4.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.feature/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
1.1.0-SNAPSHOT
diff --git a/features/com.minres.scviewer.e4.platform.feature/pom.xml b/features/com.minres.scviewer.e4.platform.feature/pom.xml
index 1b87945..2be41b3 100644
--- a/features/com.minres.scviewer.e4.platform.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
1.0.0-SNAPSHOT
diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml
index 38242c5..084cb4e 100644
--- a/features/com.minres.scviewer.feature/pom.xml
+++ b/features/com.minres.scviewer.feature/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
1.1.0-SNAPSHOT
diff --git a/features/com.minres.scviewer.ui.feature/pom.xml b/features/com.minres.scviewer.ui.feature/pom.xml
index e39a845..c087771 100644
--- a/features/com.minres.scviewer.ui.feature/pom.xml
+++ b/features/com.minres.scviewer.ui.feature/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
1.1.0-SNAPSHOT
diff --git a/plugins/com.minres.scviewer.database.sqlite/pom.xml b/plugins/com.minres.scviewer.database.sqlite/pom.xml
index d1451ec..1b98e33 100644
--- a/plugins/com.minres.scviewer.database.sqlite/pom.xml
+++ b/plugins/com.minres.scviewer.database.sqlite/pom.xml
@@ -4,7 +4,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-plugin
diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml
index 013716c..570f099 100644
--- a/plugins/com.minres.scviewer.database.text/pom.xml
+++ b/plugins/com.minres.scviewer.database.text/pom.xml
@@ -6,7 +6,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-plugin
diff --git a/plugins/com.minres.scviewer.database.ui.swt/pom.xml b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
index 2222c7b..48f1cce 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
4.0.0-SNAPSHOT
diff --git a/plugins/com.minres.scviewer.database.vcd/pom.xml b/plugins/com.minres.scviewer.database.vcd/pom.xml
index c8e296f..27fd80d 100644
--- a/plugins/com.minres.scviewer.database.vcd/pom.xml
+++ b/plugins/com.minres.scviewer.database.vcd/pom.xml
@@ -5,7 +5,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-plugin
diff --git a/plugins/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml
index 005d021..53eacb9 100644
--- a/plugins/com.minres.scviewer.database/pom.xml
+++ b/plugins/com.minres.scviewer.database/pom.xml
@@ -4,7 +4,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-plugin
diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 9a48b3f..238bf63 100644
--- 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.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",
diff --git a/plugins/com.minres.scviewer.e4.application/pom.xml b/plugins/com.minres.scviewer.e4.application/pom.xml
index 2667214..beb3020 100644
--- a/plugins/com.minres.scviewer.e4.application/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application/pom.xml
@@ -6,7 +6,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-plugin
diff --git a/plugins/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml
index d3d6f7b..4044d75 100644
--- a/plugins/com.minres.scviewer.ui/pom.xml
+++ b/plugins/com.minres.scviewer.ui/pom.xml
@@ -4,7 +4,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-plugin
diff --git a/pom.xml b/pom.xml
index 512c01a..e293896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
pom
releng/com.minres.scviewer.target
@@ -29,6 +29,8 @@
1.5.0
3.6.0-03
3.0.3-01
+
+ ${project.build.directory}/../
@@ -67,7 +69,7 @@
com.minres.scviewer
com.minres.scviewer.target
- 2.14.2
+ 2.15.0
@@ -125,7 +127,6 @@
-
diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml
index ada73c4..ae119b7 100644
--- a/products/com.minres.scviewer.e4.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product/pom.xml
@@ -6,11 +6,11 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
com.minres.scviewer.e4.product
- 2.14.2
+ 2.15.0
eclipse-repository
com.minres.scviewer
diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product
index c7685a6..21f73f0 100644
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@@ -1,7 +1,7 @@
-
+
diff --git a/releng/com.minres.scviewer.target/pom.xml b/releng/com.minres.scviewer.target/pom.xml
index 4f8f83b..6b7b8d3 100644
--- a/releng/com.minres.scviewer.target/pom.xml
+++ b/releng/com.minres.scviewer.target/pom.xml
@@ -12,7 +12,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
diff --git a/releng/com.minres.scviewer.updateSite/.gitignore b/releng/com.minres.scviewer.updateSite/.gitignore
index aea1bd3..b097aaa 100644
--- a/releng/com.minres.scviewer.updateSite/.gitignore
+++ b/releng/com.minres.scviewer.updateSite/.gitignore
@@ -3,3 +3,4 @@
/artifacts.jar
/content.jar
/target/
+/gh-pages/
diff --git a/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant b/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant
new file mode 100644
index 0000000..cbfff8a
--- /dev/null
+++ b/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+
+
+
+
+
+
+
diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml
index 2152a62..5031047 100644
--- a/releng/com.minres.scviewer.updateSite/pom.xml
+++ b/releng/com.minres.scviewer.updateSite/pom.xml
@@ -7,22 +7,23 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
-
-
-
-
- org.eclipse.tycho
- tycho-p2-repository-plugin
- ${tycho-version}
-
- ${project.artifactId}-${qualifiedVersion}
-
-
-
-
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-repository-plugin
+ ${tycho-version}
+
+ ${project.artifactId}-${qualifiedVersion}
+
+
+
+
+
@@ -33,38 +34,78 @@
- com.carrotgarden.maven
- bintray-maven-plugin
- 1.5.20191113165555
-
- false
-
- minres
-
- eclipse
-
- SCViewer
-
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
-
- true
-
- https://git.minres.com/VP-Tools/SCViewer.git
- EPL-1.0
-
- ${project.build.directory}/repository
-
- SCViewer/${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-
- bintray-minres-deploy
-
+ org.codehaus.mojo
+ exec-maven-plugin
+ 3.0.0
-
package
- upload
-
+ exec
+
+
+
+
+ bash
+
+ ${software.download.area}
+
+ -c
+ 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
+
+
+ en_US
+
+
+
+
+ org.eclipse.tycho.extras
+ tycho-eclipserun-plugin
+ ${tycho-version}
+
+
+ -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"
+
+
+ 2020-03
+ p2
+ http://download.eclipse.org/releases/2020-03/
+
+
+
+
+ org.eclipse.ant.core
+ eclipse-plugin
+
+
+ org.apache.ant
+ eclipse-plugin
+
+
+ org.eclipse.equinox.p2.repository.tools
+ eclipse-plugin
+
+
+ org.eclipse.equinox.p2.core.feature
+ eclipse-feature
+
+
+ org.eclipse.equinox.p2.extras.feature
+ eclipse-feature
+
+
+ org.eclipse.equinox.ds
+ eclipse-plugin
+
+
+
+
+
+ add-p2-composite-repository
+ package
+
+ eclipse-run
+
diff --git a/tests/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml
index d33f4cc..d9eaba2 100644
--- a/tests/com.minres.scviewer.database.test/pom.xml
+++ b/tests/com.minres.scviewer.database.test/pom.xml
@@ -6,7 +6,7 @@
com.minres.scviewer
com.minres.scviewer.parent
- 2.14.2
+ 2.15.0
../..
eclipse-test-plugin