[feature/java-23] Upgrade to Java 23

.mvn/extensions.xml

@@ -6,8 +6,8 @@
     <version>2.1.1</version>
   </extension>
   <extension>
-    <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
+    <groupId>io.github.gitflow-incremental-builder</groupId>
     <artifactId>gitflow-incremental-builder</artifactId>
-    <version>3.12.0</version>
+    <version>4.5.4</version>
   </extension>
 </extensions>

.mvn/jvm.config

@@ -0,0 +1 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

adks/e2e-sdk/app/steps/system_config.ts

@@ -34,4 +34,14 @@ Given('I update the system config for Slack delivery', async function() {
   }
 
   await world.systemConfigApi.createOrUpdateSystemConfigs(update);
+
+  const updatedConfigResult = await world.systemConfigApi.getSystemConfig(['slack.']);
+  expect(updatedConfigResult.status).to.eq(200);
+  const updatedCOnfig = updatedConfigResult.data;
+  expect(updatedCOnfig.configs.find(s => s.key === 'slack.enabled')?.value).to.eq(true);
+  expect(updatedCOnfig.configs.find(s => s.key === 'slack.delivery.url')?.value).to.eq(slackApiUrl);
+
+  const webhooks = await world.webhookApi.getWebhookTypes();
+  expect(webhooks.status).to.eq(200);
+  expect(webhooks.data.types.find(s => s.messageType === 'integration/slack-v1'), `Unable to find slack webhook in ${JSON.stringify(webhooks.data)}`).to.not.be.undefined;
 });

adks/e2e-sdk/app/steps/webhook_steps.ts

@@ -22,9 +22,11 @@ Given(/^I test the webhook$/, async function () {
   if (!process.env.EXTERNAL_NGROK && process.env.REMOTE_BACKEND) {
     return;
   }
+
   await world.webhookApi.testWebhook(new WebhookCheck({
     messageType: webhookType.messageType,
     envId: world.environment.id,
+    config: {}
   }));
 });
 

adks/e2e-sdk/pom.xml

@@ -85,12 +85,12 @@
       <plugin>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-maven-plugin</artifactId>
-        <version>5.2.1</version>
+        <version>7.12.0</version>
         <dependencies>
           <dependency>
             <groupId>com.bluetrainsoftware.maven</groupId>
             <artifactId>openapi-tsaxios-generator</artifactId>
-            <version>1.4</version>
+            <version>2.3</version>
           </dependency>
         </dependencies>
         <executions>

admin-frontend/releases_api/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

all-build

@@ -0,0 +1 @@
+# keep

backend/.mvn/jvm.config

@@ -0,0 +1 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

backend/composite-parent/pom.xml

@@ -49,12 +49,12 @@
   </scm>
 
   <properties>
-    <jersey.version>3.1.7</jersey.version>
-    <jackson.version>2.17.2</jackson.version>
+    <jersey.version>3.1.10</jersey.version>
+    <jackson.version>2.18.3</jackson.version>
     <sticky.version>1.3</sticky.version>
-    <groovy.version>4.0.22</groovy.version>
-    <ebean.version>15.4.0</ebean.version>
-    <ebean.tile.version>15.5.0</ebean.tile.version>
+    <groovy.version>4.0.26</groovy.version>
+    <ebean.version>15.10.0</ebean.version>
+    <ebean.tile.version>15.10.0</ebean.tile.version>
     <h2.version>2.3.230</h2.version>
     <handlebars-version>4.3.1</handlebars-version>
   </properties>

backend/edge-api/pom.xml

@@ -129,7 +129,7 @@
         <configuration>
           <filtering>false</filtering>
           <tiles>
-            <tile>io.featurehub.tiles:tile-java8:[1.1,2)</tile>
+            <tile>io.featurehub.tiles:tile-java:[1.1,2)</tile>
             <tile>io.featurehub.tiles:tile-release:[1.1,2)</tile>
           </tiles>
         </configuration>

backend/mr-db-ebean/src/main/resources/dbmigration/h2/1.33.sql

@@ -0,0 +1,6 @@
+-- drop dependencies
+-- alter table fh_env_feature_strategy drop constraint if exists fk_fh_env_feature_strategy_fk_who_updated;
+-- alter table fh_fv_version drop constraint if exists fk_fh_fv_version_fk_who_updated;
+-- foreign keys and indices
+-- alter table fh_env_feature_strategy add constraint fk_fh_env_feature_strategy_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;
+-- alter table fh_fv_version add constraint fk_fh_fv_version_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;

backend/mr-db-ebean/src/main/resources/dbmigration/h2/1.34__dropsFor_1.33.sql

@@ -0,0 +1,4 @@
+-- apply alter tables
+alter table fh_organization drop column fk_named_cache;
+-- apply post alter
+drop table if exists fh_cache;

backend/mr-db-ebean/src/main/resources/dbmigration/mariadb/1.33.sql

@@ -0,0 +1,6 @@
+-- drop dependencies
+-- alter table fh_env_feature_strategy drop foreign key fk_fh_env_feature_strategy_fk_who_updated;
+-- alter table fh_fv_version drop foreign key fk_fh_fv_version_fk_who_updated;
+-- foreign keys and indices
+-- alter table fh_env_feature_strategy add constraint fk_fh_env_feature_strategy_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;
+-- alter table fh_fv_version add constraint fk_fh_fv_version_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;

backend/mr-db-ebean/src/main/resources/dbmigration/mariadb/1.34__dropsFor_1.33.sql

@@ -0,0 +1,4 @@
+-- apply alter tables
+alter table fh_organization drop column fk_named_cache;
+-- apply post alter
+drop table if exists fh_cache;

backend/mr-db-ebean/src/main/resources/dbmigration/model/1.33.model.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply">
+        <alterColumn columnName="fk_who_updated" tableName="fh_env_feature_strategy" references="fh_person.id" foreignKeyName="fk_fh_env_feature_strategy_fk_who_updated" foreignKeyIndex="ix_fh_env_feature_strategy_fk_who_updated" dropForeignKey="fk_fh_env_feature_strategy_fk_who_updated" dropForeignKeyIndex="ix_fh_env_feature_strategy_fk_who_updated"/>
+        <alterColumn columnName="fk_who_updated" tableName="fh_fv_version" references="fh_person.id" foreignKeyName="fk_fh_fv_version_fk_who_updated" foreignKeyIndex="ix_fh_fv_version_fk_who_updated" dropForeignKey="fk_fh_fv_version_fk_who_updated" dropForeignKeyIndex="ix_fh_fv_version_fk_who_updated"/>
+    </changeSet>
+    <changeSet type="pendingDrops">
+        <dropColumn columnName="fk_named_cache" tableName="fh_organization"/>
+        <dropTable name="fh_cache"/>
+    </changeSet>
+</migration>

backend/mr-db-ebean/src/main/resources/dbmigration/model/1.34__dropsFor_1.33.model.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply" dropsFor="1.33">
+        <dropColumn columnName="fk_named_cache" tableName="fh_organization"/>
+        <dropTable name="fh_cache"/>
+    </changeSet>
+</migration>

backend/mr-db-ebean/src/main/resources/dbmigration/mysql/1.33.sql

@@ -0,0 +1,6 @@
+-- drop dependencies
+-- alter table fh_env_feature_strategy drop foreign key fk_fh_env_feature_strategy_fk_who_updated;
+-- alter table fh_fv_version drop foreign key fk_fh_fv_version_fk_who_updated;
+-- foreign keys and indices
+-- alter table fh_env_feature_strategy add constraint fk_fh_env_feature_strategy_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;
+-- alter table fh_fv_version add constraint fk_fh_fv_version_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;

backend/mr-db-ebean/src/main/resources/dbmigration/mysql/1.34__dropsFor_1.33.sql

@@ -0,0 +1,4 @@
+-- apply alter tables
+alter table fh_organization drop column fk_named_cache;
+-- apply post alter
+drop table if exists fh_cache;

backend/mr-db-ebean/src/main/resources/dbmigration/oracle/1.33.sql

@@ -0,0 +1,6 @@
+-- drop dependencies
+-- alter table fh_env_feature_strategy drop constraint fk_fh_nv_ftr_strtgy_fk_wh_pdtd;
+-- alter table fh_fv_version drop constraint fk_fh_fv_vrsn_fk_wh_pdtd;
+-- foreign keys and indices
+-- alter table fh_env_feature_strategy add constraint fk_fh_nv_ftr_strtgy_fk_wh_pdtd foreign key (fk_who_updated) references fh_person (id);
+-- alter table fh_fv_version add constraint fk_fh_fv_vrsn_fk_wh_pdtd foreign key (fk_who_updated) references fh_person (id);

backend/mr-db-ebean/src/main/resources/dbmigration/oracle/1.34__dropsFor_1.33.sql

@@ -0,0 +1,4 @@
+-- apply alter tables
+alter table fh_organization drop column fk_named_cache;
+-- apply post alter
+drop table fh_cache cascade constraints purge;

backend/mr-db-ebean/src/main/resources/dbmigration/postgres/1.33.sql

@@ -0,0 +1,6 @@
+-- drop dependencies
+-- alter table if exists fh_env_feature_strategy drop constraint if exists fk_fh_env_feature_strategy_fk_who_updated;
+-- alter table if exists fh_fv_version drop constraint if exists fk_fh_fv_version_fk_who_updated;
+-- foreign keys and indices
+-- alter table fh_env_feature_strategy add constraint fk_fh_env_feature_strategy_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;
+-- alter table fh_fv_version add constraint fk_fh_fv_version_fk_who_updated foreign key (fk_who_updated) references fh_person (id) on delete restrict on update restrict;

backend/mr-db-ebean/src/main/resources/dbmigration/postgres/1.34__dropsFor_1.33.sql

@@ -0,0 +1,4 @@
+-- apply alter tables
+alter table fh_organization drop column fk_named_cache;
+-- apply post alter
+drop table if exists fh_cache cascade;

backend/mr-db-ebean/src/test/java/io/featurehub/db/GenerateDbMigration.java

@@ -16,7 +16,7 @@ public static void main(String[] args) throws Exception {
     dbMigration.setMigrationPath("/dbmigration");
     dbMigration.setStrictMode(false);
 
-//    dbMigration.setGeneratePendingDrop("1.25");
+    dbMigration.setGeneratePendingDrop("1.33");
     // generate the migration ddl and xml
     dbMigration.generateMigration();
     // use this if you wish to introduce another database - it will generate it under dbinit/database with the

backend/mr-db-models/pom.xml

@@ -41,6 +41,10 @@
     </license>
   </licenses>
 
+  <properties>
+    <ebean-maven-plugin.args>debug=0</ebean-maven-plugin.args>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.featurehub.mr</groupId>
@@ -76,6 +80,53 @@
           </tiles>
         </configuration>
       </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
+        <configuration>
+          <annotationProcessorPaths>
+            <path> <!-- generate ebean query beans -->
+              <groupId>io.ebean</groupId>
+              <artifactId>querybean-generator</artifactId>
+              <version>${ebean.version}</version>
+            </path>
+          </annotationProcessorPaths>
+          <release>23</release>
+          <useIncrementalCompilation>false</useIncrementalCompilation>
+        </configuration>
+        <executions>
+
+          <!-- Replacing default-compile as it is treated specially by maven -->
+          <execution>
+            <id>default-compile</id>
+            <phase>none</phase>
+            <configuration tiles-keep-id="true" />
+          </execution>
+          <!-- Replacing default-testCompile as it is treated specially by maven -->
+          <execution>
+            <id>default-testCompile</id>
+            <phase>none</phase>
+            <configuration tiles-keep-id="true" />
+          </execution>
+          <execution>
+            <id>java-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration tiles-keep-id="true" />
+          </execution>
+          <execution>
+            <id>java-test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration tiles-keep-id="true" />
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>