From fe0c37bee5445507747e835c7e943f41b2d0eee0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Mon, 13 Nov 2023 10:07:58 +0300
Subject: [PATCH] wip: update tycho build scripts

---
 MatCalcitePlugin/META-INF/MANIFEST.MF         | 53 +++++++++++++--
 MatCalcitePlugin/build.properties             |  2 -
 MatCalcitePlugin/pom.xml                      | 64 ++++++++++++++++---
 .../MatCalciteTargetPlatform.target           | 31 ++++++++-
 pom.xml                                       | 39 ++++++-----
 5 files changed, 156 insertions(+), 33 deletions(-)

diff --git a/MatCalcitePlugin/META-INF/MANIFEST.MF b/MatCalcitePlugin/META-INF/MANIFEST.MF
index 57bc898..6201f2d 100644
--- a/MatCalcitePlugin/META-INF/MANIFEST.MF
+++ b/MatCalcitePlugin/META-INF/MANIFEST.MF
@@ -4,12 +4,57 @@ Bundle-Name: MatCalcitePlugin
 Bundle-SymbolicName: MatCalcitePlugin;singleton:=true
 Bundle-Version: 1.6.0.qualifier
 Bundle-Vendor: Vladimir Sitnikov
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.mat.api;bundle-version="1.8.0",
- org.eclipse.mat.ui;bundle-version="1.8.0",
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Require-Bundle: org.eclipse.mat.api;bundle-version="1.14.0",
+ org.eclipse.mat.ui;bundle-version="1.14.0",
+ com.fasterxml.jackson.core.jackson-annotations,
+ com.fasterxml.jackson.core.jackson-core,
+ com.fasterxml.jackson.core.jackson-databind,
+ com.fasterxml.jackson.dataformat.jackson-dataformat-yaml,
+ org.jsr-305,
+ com.google.errorprone.annotations,
+ com.google.guava.failureaccess,
+ com.google.guava,
+ com.github.vlsi.mat.calcite.com.google.guava.listenablefuture,
+ com.github.vlsi.mat.calcite.com.google.j2objc.j2objc-annotations,
+ com.google.protobuf,
+ com.github.vlsi.mat.calcite.com.google.uzaygezen.uzaygezen-core,
+ com.googlecode.json-simple,
+ json-path,
+ com.github.vlsi.mat.calcite.com.yahoo.datasketches.memory,
+ com.github.vlsi.mat.calcite.com.yahoo.datasketches.sketches-core,
+ org.apache.commons.commons-codec,
+ org.apache.commons.commons-io,
+ org.apache.commons.lang,
+ org.apache.commons.logging,
+ com.github.vlsi.mat.calcite.net.hydromatic.aggdesigner-algorithm,
+ net.minidev.accessors-smart,
+ net.minidev.json-smart,
+ com.github.vlsi.mat.calcite.org.apache.calcite.avatica.avatica-core,
+ com.github.vlsi.mat.calcite.org.apache.calcite.avatica.avatica-metrics,
+ com.github.vlsi.mat.calcite.org.apache.calcite.calcite-core,
+ com.github.vlsi.mat.calcite.org.apache.calcite.calcite-linq4j,
+ org.apache.commons.commons-dbcp2;resolution:=optional,
+ org.apache.commons.lang3,
+ org.apache.commons.math3,
+ org.apache.commons.commons-pool2,
+ org.apache.commons.commons-text,
+ com.github.vlsi.mat.calcite.org.apache.httpcomponents.client5.httpclient5,
+ com.github.vlsi.mat.calcite.org.apache.httpcomponents.core5.httpcore5,
+ com.github.vlsi.mat.calcite.org.apache.httpcomponents.core5.httpcore5-h2,
+ org.apiguardian.api,
+ checker-qual,
+ org.codehaus.janino.commons-compiler,
+ org.codehaus.janino.janino,
+ com.github.vlsi.mat.calcite.org.locationtech.jts.io.jts-io-common,
+ org.locationtech.jts.jts-core,
+ org.locationtech.proj4j,
+ org.objectweb.asm,
+ org.apache.geronimo.specs.geronimo-jta_1.1_spec,
+ slf4j.api,
+ org.yaml.snakeyaml,
  org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.jface.text;bundle-version="3.7.2",
  org.eclipse.core.resources;bundle-version="3.7.101"
-Bundle-ClassPath: .,target/dependency/MatCalciteDependencies.jar
 Export-Package: com.github.vlsi.mat.calcite
diff --git a/MatCalcitePlugin/build.properties b/MatCalcitePlugin/build.properties
index ea54891..31ffbdf 100644
--- a/MatCalcitePlugin/build.properties
+++ b/MatCalcitePlugin/build.properties
@@ -3,7 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               target/dependency/MatCalciteDependencies.jar,\
                resources/
 jars.compile.order = .
-jars.extra.classpath = target/dependency/MatCalciteDependencies.jar
diff --git a/MatCalcitePlugin/pom.xml b/MatCalcitePlugin/pom.xml
index 5dc03e2..411cc91 100644
--- a/MatCalcitePlugin/pom.xml
+++ b/MatCalcitePlugin/pom.xml
@@ -16,9 +16,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.github.vlsi.mat.calcite</groupId>
-            <artifactId>MatCalciteDependencies</artifactId>
-            <version>${project.version}</version>
+            <groupId>net.minidev</groupId>
+            <artifactId>accessors-smart</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.calcite</groupId>
+            <artifactId>calcite-core</artifactId>
+            <version>1.36.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.3-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
 
@@ -33,6 +63,20 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>5.1.9</version>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -67,13 +111,13 @@
                 <version>${tycho-version}</version>
                 <configuration>
                     <verbose>true</verbose>
-                    <extraClasspathElements>
-                        <extraClasspathElement>
-                            <groupId>com.github.vlsi.mat.calcite</groupId>
-                            <artifactId>MatCalciteDependencies</artifactId>
-                            <version>${project.version}</version>
-                        </extraClasspathElement>
-                    </extraClasspathElements>
+<!--                    <extraClasspathElements>-->
+<!--                        <extraClasspathElement>-->
+<!--                            <groupId>com.github.vlsi.mat.calcite</groupId>-->
+<!--                            <artifactId>MatCalciteDependencies</artifactId>-->
+<!--                            <version>${project.version}</version>-->
+<!--                        </extraClasspathElement>-->
+<!--                    </extraClasspathElements>-->
                 </configuration>
             </plugin>
             <plugin>
diff --git a/MatCalciteTargetPlatform/MatCalciteTargetPlatform.target b/MatCalciteTargetPlatform/MatCalciteTargetPlatform.target
index 3e7c108..04a25d9 100644
--- a/MatCalciteTargetPlatform/MatCalciteTargetPlatform.target
+++ b/MatCalciteTargetPlatform/MatCalciteTargetPlatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.5"?>
 
-<target name="eclipse 4.5.0">
+<target name="eclipse 4.5.0" includeMode="feature">
 <locations>
 <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
 <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
@@ -9,5 +9,34 @@
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/releases/2023-09"/>
 </location>
+<location includeDependencyDepth="infinite" includeDependencyScopes="compile,runtime" label="Maven Central" missingManifest="generate" type="Maven">
+    <dependencies>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>accessors-smart</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.calcite</groupId>
+            <artifactId>calcite-core</artifactId>
+            <version>1.36.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.3-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+    </dependencies>
+</location>
 </locations>
 </target>
diff --git a/pom.xml b/pom.xml
index db01013..648c3f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
 
     <properties>
         <tycho-version>4.0.3</tycho-version>
-        <tycho-extras-version>2.7.5</tycho-extras-version>
         <eclipse-repository>https://download.eclipse.org/releases/2023-09</eclipse-repository>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
@@ -53,22 +52,14 @@
                             <goal>plugin-source</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>feature-source</id>
+                        <goals>
+                            <goal>feature-source</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.eclipse.tycho.extras</groupId>-->
-<!--                <artifactId>tycho-source-feature-plugin</artifactId>-->
-<!--                <version>${tycho-extras-version}</version>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>source-feature</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>source-feature</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-p2-plugin</artifactId>
@@ -87,6 +78,21 @@
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-packaging-plugin</artifactId>
                 <version>${tycho-version}</version>
+                <executions>
+                    <execution>
+                        <id>validate-pom</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify-osgi-pom</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>true</addMavenDescriptor>
+                    </archive>
+                    <mapP2Dependencies>true</mapP2Dependencies>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
@@ -111,7 +117,8 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <version>${tycho-version}</version>
                 <configuration>
-                    <!--<pomDependencies>consider</pomDependencies>-->
+                    <pomDependencies>wrapAsBundle</pomDependencies>
+                    <executionEnvironment>JavaSE-17</executionEnvironment>
                     <target>
                         <artifact>
                             <groupId>com.github.vlsi.mat.calcite</groupId>