fix repository build and build numbers

com.minres.scviewer.target/pom.xml

@@ -12,7 +12,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.0.0-SNAPSHOT</version>
+  	<version>2.11.0</version>
   	<relativePath>..</relativePath>
   </parent>
 

features/com.minres.scviewer.database.feature/build.properties

@@ -1,2 +1,4 @@
 bin.includes = feature.xml,\
                feature.properties
+src.includes = feature.properties,\
+               feature.xml

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

features/com.minres.scviewer.e4.feature/feature.xml

@@ -21,14 +21,6 @@
       <update label="SC Viewer Updates" url="http://www.minres.com/scviewer/update"/>
    </url>
 
-   <includes
-         id="com.minres.scviewer.database.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.minres.scviewer.ui.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.11.1" match="greaterOrEqual"/>
@@ -40,13 +32,10 @@
       <import plugin="org.eclipse.e4.core.di" version="1.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.e4.ui.di" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.e4.core.contexts" version="1.4.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.jobs"/>
       <import plugin="org.eclipse.osgi"/>
-      <import plugin="com.google.guava"/>
       <import plugin="org.eclipse.equinox.preferences"/>
       <import plugin="org.eclipse.core.expressions"/>
       <import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="greaterOrEqual"/>
@@ -59,6 +48,8 @@
       <import feature="org.eclipse.sdk" version="4.15.0.v20200305-0155"/>
       <import feature="org.eclipse.rcptt.core" version="2.5.1.M3"/>
       <import plugin="org.eclipse.core.commands"/>
+      <import feature="com.minres.scviewer.database.feature" version="3.0.0.qualifier"/>
+      <import feature="com.minres.scviewer.ui.feature" version="1.1.0.qualifier"/>
    </requires>
 
    <plugin

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.0.0-SNAPSHOT</version>
+  	<version>2.11.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.0.0-SNAPSHOT</version>
+  	<version>2.11.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

features/com.minres.scviewer.feature/build.properties

@@ -1,2 +1,4 @@
 bin.includes = feature.xml,\
                feature.properties
+src.includes = feature.properties,\
+               feature.xml

features/com.minres.scviewer.feature/feature.xml

@@ -24,22 +24,11 @@ http://www.eclipse.org/legal/epl-v10.html
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://www.minres.com/scviewer/update"/>
       <discovery label="MINRES Website" url="http://www.minres.com"/>
    </url>
 
-   <includes
-         id="com.minres.scviewer.database.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.minres.scviewer.ui.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.jface.text"/>
@@ -51,7 +40,8 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface"/>
-      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+      <import feature="com.minres.scviewer.database.feature" version="3.0.0.qualifier"/>
+      <import feature="com.minres.scviewer.ui.feature" version="1.1.0.qualifier"/>
    </requires>
 
    <plugin

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

features/com.minres.scviewer.ui.feature/build.properties

@@ -1 +1,4 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               feature.properties
+src.includes = feature.properties,\
+               feature.xml

features/com.minres.scviewer.ui.feature/feature.xml

@@ -25,18 +25,13 @@ http://www.eclipse.org/legal/epl-v10.html
       <discovery label="MINRES Website" url="http://www.minres.com"/>
    </url>
 
-   <includes
-         id="com.minres.scviewer.database.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.equinox.registry"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.osgi"/>
+      <import feature="com.minres.scviewer.database.feature" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin

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

p2repositories/com.minres.scviewer.updateSite/category.xml

@@ -1,18 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="com.minres.scviewer.feature">
+   <feature id="com.minres.scviewer.feature" version="0.0.0">
-      <category name="com.minres.scviewer"/>
+      <category name="ide_components"/>
    </feature>
-   <feature id="com.minres.scviewer.database.feature">
+   <feature id="com.minres.scviewer.feature.source" version="0.0.0">
-      <category name="com.minres.scviewer.database"/>
+      <category name="ide_components"/>
    </feature>
-   <feature id="com.minres.scviewer.ui.feature">
+   <feature id="com.minres.scviewer.ui.feature" version="0.0.0">
-      <category name="com.minres.scviewer.database"/>
+      <category name="devel_components"/>
    </feature>
-   <category-def name="com.minres.scviewer" label="SCViewer">
+   <feature id="com.minres.scviewer.ui.feature.source" version="0.0.0">
+      <category name="devel_components.source"/>
+   </feature>
+   <feature id="com.minres.scviewer.database.feature" version="0.0.0">
+      <category name="devel_components"/>
+   </feature>
+   <feature id="com.minres.scviewer.database.feature.source" version="0.0.0">
+      <category name="devel_components.source"/>
+   </feature>
+   <category-def name="ide_components" label="SCViewer">
       <description>
-         Viewer for SystemC Verification (SCV) library&apos;s transaction recording
+         Viewer for transaction recording outputs of the SystemC Verification (SCV) library
       </description>
    </category-def>
-   <category-def name="com.minres.scviewer.database" label="SCViewer Databases"/>
+   <category-def name="devel_components" label="Developer Resources">
+      <description>
+         Components to deal with the transaction recording outputs of the SystemC Verification (SCV) library
+      </description>
+   </category-def>
+   <category-def name="devel_components.source" label="Developer Resources (Source)"/>
 </site>

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

@@ -3,11 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.minres.scviewer.updateSite</artifactId>
+	<version>2.11.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.11.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
     <build>
@@ -21,6 +22,19 @@
                     <finalName>${project.artifactId}-${qualifiedVersion}</finalName>
                 </configuration>
             </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 	<profiles>
@@ -44,12 +58,12 @@
 							<repository>eclipse</repository>
 							<!-- Bintray package name. -->
 							<bintrayPackage>SCViewer</bintrayPackage>
-							<bintrayVersion>2.10</bintrayVersion>
+							<bintrayVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</bintrayVersion>
-							<packageVcsUrl>https://github.com/Minres/SCViewer.git</packageVcsUrl>
+							<packageVcsUrl>https://git.minres.com/VP-Tools/SCViewer.git</packageVcsUrl>
 							<!-- Local folder content to sync to the remote repo. -->
 							<sourceFolder>${project.build.directory}/repository</sourceFolder>
 							<!-- Remote folder for local content upload, relative path. -->
-							<targetFolder>repository</targetFolder>
+							<targetFolder>scviewer-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</targetFolder>
 
 							<!-- Bintray credentials in settings.xml. -->
 							<serverId>bintray-minres-deploy</serverId>

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.0.0-SNAPSHOT</version>
+  	<version>2.11.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.0.0-SNAPSHOT</version>
+		<version>2.11.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.0.0-SNAPSHOT</version>
+  	<version>2.11.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>3.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.0.0-SNAPSHOT</version>
+  	<version>2.11.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.0.0-SNAPSHOT</version>
+  	<version>2.11.0</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.e4.application/pom.xml

@@ -1,12 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-  <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  <artifactId>com.minres.scviewer.e4.application</artifactId>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <version>2.11.0-SNAPSHOT</version>
+	<modelVersion>4.0.0</modelVersion>
-  <parent>
+	<artifactId>com.minres.scviewer.e4.application</artifactId>
-  	<groupId>com.minres.scviewer</groupId>
+	<version>2.11.0-SNAPSHOT</version>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
+	<parent>
-  	<version>2.0.0-SNAPSHOT</version>
+		<groupId>com.minres.scviewer</groupId>
-	<relativePath>../..</relativePath>
+		<artifactId>com.minres.scviewer.parent</artifactId>
-  </parent>
+		<version>2.11.0</version>
-  <packaging>eclipse-plugin</packaging>
+		<relativePath>../..</relativePath>
-  </project>
+	</parent>
+	<packaging>eclipse-plugin</packaging>
+</project>

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.0.0-SNAPSHOT</version>
+  	<version>2.11.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.0.0-SNAPSHOT</version>
+	<version>2.11.0</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>com.minres.scviewer.target</module>
@@ -27,6 +27,7 @@
 	</modules>
 
 	<properties>
+		<project-version>2.11.0-SNAPSHOT</project-version>
 		<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>
@@ -40,7 +41,43 @@
 				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
-<!--
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<target>
+						<artifact>
+							<groupId>com.minres.scviewer</groupId>
+							<artifactId>com.minres.scviewer.target</artifactId>
+							<version>2.11.0</version>
+						</artifact>
+					</target>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -56,7 +93,7 @@
 				</executions>
 			</plugin>
 
- 			<plugin>
+			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-source-feature-plugin</artifactId>
 				<version>${tycho-version}</version>
@@ -73,12 +110,15 @@
 
 				<configuration>
 					<excludes>
-						provide plug-ins not containing any source code
+						<plugin id="com.google.guava" />
-						<plugin id="org.codehaus.groovy" />
+						<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" />
 					</excludes>
 				</configuration>
 			</plugin>
- -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
@@ -94,53 +134,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-versions-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<target>
-						<artifact>
-							<groupId>com.minres.scviewer</groupId>
-							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.0.0-SNAPSHOT</version>
-						</artifact>
-					</target>
-					<environments>
-<!-- 						<environment> -->
-<!-- 							<os>linux</os> -->
-<!-- 							<ws>gtk</ws> -->
-<!-- 							<arch>x86</arch> -->
-<!-- 						</environment> -->
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-<!-- 						<environment> -->
-<!-- 							<os>win32</os> -->
-<!-- 							<ws>win32</ws> -->
-<!-- 							<arch>x86</arch> -->
-<!-- 						</environment> -->
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>

products/com.minres.scviewer.e4.product/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.11.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>

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.10.0.qualifier" 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.11.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

products/com.minres.scviewer.e4.product_slim/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.11.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product_slim</artifactId>

products/com.minres.scviewer.e4.product_slim/scviewer.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="product_slim" id="com.minres.scviewer.e4.application.product_slim" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.10.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="SCViewer" uid="product_slim" id="com.minres.scviewer.e4.application.product_slim" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.11.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

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.0.0-SNAPSHOT</version>
+		<version>2.11.0</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>