* Update "old version" in maven

* Add instance migration project * Adjust create scripts * Create upgrade scripts * Add the new changeSets to liquibase * add migration fixture for 7.23 * update old engine test * remove telemetry fields from old engine cfg * chore(database): remove telemetryReporterActivate from old-engine and rolling-update tests * adjust old version for spin and connect * exclude DatabaseNamingConsistencyTest in test-old-engine * chore(database): activate oracle23 in old-engine stage in CI (#4677) related to operaton#203 related to camunda/camunda-bpm-platform#4556 Backported commit 396d635ce7 from the camunda-bpm-platform repository. Original author: psavidis <[email protected]>
ambientelivre · Dec 7, 2024 · 86a8cf6 · 86a8cf6
1 parent f7eb790
commit 86a8cf6
Show file tree

Hide file tree

Showing 30 changed files with 404 additions and 56 deletions.
diff --git a/connect/pom.xml b/connect/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <commons-codec.version>1.15</commons-codec.version>
-    <connect.version.old>1.6.0</connect.version.old>
+    <connect.version.old>7.22.0</connect.version.old>
     <maven-bundle-plugin.version>5.1.1</maven-bundle-plugin.version>
 
     <license.includeTransitiveDependencies>false</license.includeTransitiveDependencies>

diff --git a/database/pom.xml b/database/pom.xml
@@ -30,7 +30,7 @@
     <version.liquibase>4.8.0</version.liquibase>
 
     <!-- needed for sql script and backward compatibility checks -->
-    <operaton.version.old>7.21.0</operaton.version.old>
+    <operaton.version.old>7.22.0</operaton.version.old>
 
     <!-- Testcontainers JDBC URL parameters. By default, an empty string -->
     <database.tc.params />

diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.db2.create.engine.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.db2.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64) not null,

diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.h2.create.engine.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.h2.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),

diff --git a/...e/src/main/resources/org/operaton/bpm/engine/db/create/activiti.mariadb.create.engine.sql b/...e/src/main/resources/org/operaton/bpm/engine/db/create/activiti.mariadb.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),

diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.mssql.create.engine.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.mssql.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ nvarchar(64),

diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.mysql.create.engine.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/create/activiti.mysql.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),

diff --git a/...ne/src/main/resources/org/operaton/bpm/engine/db/create/activiti.oracle.create.engine.sql b/...ne/src/main/resources/org/operaton/bpm/engine/db/create/activiti.oracle.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ NVARCHAR2(64),

diff --git a/.../src/main/resources/org/operaton/bpm/engine/db/create/activiti.postgres.create.engine.sql b/.../src/main/resources/org/operaton/bpm/engine/db/create/activiti.postgres.create.engine.sql
@@ -66,7 +66,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.22.0');
+values ('0', CURRENT_TIMESTAMP, '7.23.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),

diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/liquibase/operaton-changelog.xml b/engine/src/main/resources/org/operaton/bpm/engine/db/liquibase/operaton-changelog.xml
@@ -140,8 +140,16 @@
              stripComments="true"/>
   </changeSet>
 
-  <changeSet author="Camunda" id="7.22.0-tag">
-    <tagDatabase tag="7.22.0"/>
+  <changeSet author="Camunda" id="7.22-to-7.23">
+    <sqlFile path="upgrade/${db.name}_engine_7.22_to_7.23.sql"
+             encoding="UTF-8"
+             relativeToChangelogFile="true"
+             splitStatements="true"
+             stripComments="true"/>
+  </changeSet>
+
+  <changeSet author="Camunda" id="7.23.0-tag">
+    <tagDatabase tag="7.23.0"/>
   </changeSet>
 
 </databaseChangeLog>
diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/db2_engine_7.22_to_7.23.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/db2_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/h2_engine_7.22_to_7.23.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/h2_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/mariadb_engine_7.22_to_7.23.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/mariadb_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/mssql_engine_7.22_to_7.23.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/mssql_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/mysql_engine_7.22_to_7.23.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/mysql_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/oracle_engine_7.22_to_7.23.sql b/engine/src/main/resources/org/operaton/bpm/engine/db/upgrade/oracle_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/...ne/src/main/resources/org/operaton/bpm/engine/db/upgrade/postgres_engine_7.22_to_7.23.sql b/...ne/src/main/resources/org/operaton/bpm/engine/db/upgrade/postgres_engine_7.22_to_7.23.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1200', CURRENT_TIMESTAMP, '7.23.0');
diff --git a/qa/test-db-instance-migration/pom.xml b/qa/test-db-instance-migration/pom.xml
@@ -42,6 +42,7 @@
     <module>test-fixture-720</module>
     <module>test-fixture-721</module>
     <module>test-fixture-722</module>
+    <module>test-fixture-723</module>
     <module>test-migration</module>
   </modules>
 

diff --git a/qa/test-db-instance-migration/test-fixture-722/pom.xml b/qa/test-db-instance-migration/test-fixture-722/pom.xml
@@ -12,23 +12,20 @@
   <name>operaton BPM - QA - upgrade - instance migration - test fixture - 7.22.0</name>
 
   <properties>
-    <!-- delete when 7.22 is released -->
-    <operaton.version.current>${project.version}</operaton.version.current>
-    <operaton.version.previous>7.21.0</operaton.version.previous>
+    <operaton.version.previous>7.22.0</operaton.version.previous>
   </properties>
 
-  <!-- uncomment when 7.22 is released -->
-<!--   <dependencyManagement> -->
-<!--     <dependencies> -->
-<!--       <dependency> -->
-<!--         <groupId>org.operaton.bpm</groupId> -->
-<!--         <artifactId>operaton-bom</artifactId> -->
-<!--         <version>7.22.0</version> -->
-<!--         <scope>import</scope> -->
-<!--         <type>pom</type> -->
-<!--       </dependency> -->
-<!--     </dependencies> -->
-<!--   </dependencyManagement> -->
+   <dependencyManagement>
+     <dependencies>
+       <dependency>
+         <groupId>org.operaton.bpm</groupId>
+         <artifactId>operaton-bom</artifactId>
+         <version>7.22.0</version>
+         <scope>import</scope>
+         <type>pom</type>
+       </dependency>
+     </dependencies>
+   </dependencyManagement>
 
   <dependencies>
     <dependency>
@@ -106,9 +103,7 @@
                     <artifactItem>
                       <groupId>org.operaton.bpm.distro</groupId>
                       <artifactId>operaton-sql-scripts</artifactId>
-                      <!-- Replace after 7.22.0 release -->
-                      <version>${operaton.version.current}</version>
-                      <!--<version>7.22.0</version>-->
+                      <version>7.22.0</version>
                       <type>test-jar</type>
                       <outputDirectory>${project.build.directory}/scripts-current</outputDirectory>
                       <overWrite>true</overWrite>
@@ -118,8 +113,7 @@
               </execution>
             </executions>
           </plugin>
-          <!-- uncomment when 7.22 is released -->
-          <!--<plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
             <configuration>
@@ -140,7 +134,7 @@
                 </configuration>
               </execution>
             </executions>
-          </plugin>-->
+          </plugin>
         </plugins>
       </build>
     </profile>