Skip to content

Commit

Permalink
Merge branch 'flowable:main' into fix/ChangeStateTermination
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stoeoeoe
Stoeoeoe authored Aug 8, 2024
2 parents 6f91f9d + 996056a commit 90f561f
Show file tree
Hide file tree
Showing 132 changed files with 2,283 additions and 8,297 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/oracle.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Test
id: test
# use oracle for the host here because we have specified a container for the job.
# If we were running the job on the VM this would be localhost
# '>-' is a special YAML syntax and means that new lines would be replaced with spaces
Expand All @@ -69,3 +70,9 @@ jobs:
-Doracle.jdbc.version=${{ matrix.driverVersion }}
-Doracle.jdbc.artifact=${{ matrix.driverArtifact }}
-Dmaven.test.redirectTestOutputToFile=false
- name: Upload test artifacts
uses: actions/upload-artifact@v4
if: ${{ failure() && steps.test.conclusion == 'failure' }}
with:
name: surefire-test-reports-${{ matrix.oracle }}
path: '**/target/surefire-reports/*'
7 changes: 7 additions & 0 deletions .github/workflows/sql-server.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Test
id: test
# use localhost for the host here because we have specified a vm for the job.
# If we were running the job on a container this would be mssql
# '>-' is a special YAML syntax and means that new lines would be replaced with spaces
Expand All @@ -66,3 +67,9 @@ jobs:
-Dspring.datasource.username=flowable
-Dspring.datasource.password=flowable
-Dmaven.test.redirectTestOutputToFile=false
- name: Upload test artifacts
uses: actions/upload-artifact@v4
if: ${{ failure() && steps.test.conclusion == 'failure' }}
with:
name: surefire-test-reports-${{ matrix.mssql }}
path: '**/target/surefire-reports/*'
27 changes: 27 additions & 0 deletions ...t/java/org/flowable/app/rest/service/api/repository/DeploymentCollectionResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,33 @@ public void testGetDeployments() throws Exception {
// Check without tenantId filtering
url = baseUrl + "?withoutTenantId=true";
assertResultsPresentInDataResponse(url, firstDeployment.getId());
} finally {
// Always cleanup any created deployments, even if the test failed
List<AppDeployment> deployments = repositoryService.createDeploymentQuery().list();
for (AppDeployment deployment : deployments) {
repositoryService.deleteDeployment(deployment.getId(), true);
}
}
}

public void testGetDeploymentsSorting() throws Exception {

try {
// Alter time to ensure different deployTimes
Calendar yesterday = Calendar.getInstance();
yesterday.add(Calendar.DAY_OF_MONTH, -1);
appEngineConfiguration.getClock().setCurrentTime(yesterday.getTime());

AppDeployment firstDeployment = repositoryService.createDeployment().name("Deployment 1").category("DEF")
.addClasspathResource("org/flowable/app/rest/service/api/repository/oneApp.app")
.tenantId("acme")
.deploy();

appEngineConfiguration.getClock().setCurrentTime(Calendar.getInstance().getTime());
AppDeployment secondDeployment = repositoryService.createDeployment().name("Deployment 2").category("ABC")
.addClasspathResource("org/flowable/app/rest/service/api/repository/oneApp.app")
.tenantId("myTenant")
.deploy();

// Check ordering by name
CloseableHttpResponse response = executeRequest(
Expand Down
2 changes: 1 addition & 1 deletion modules/flowable-app-engine-rest/src/test/resources/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
log4j.rootLogger=INFO, CA
log4j.rootLogger=DEBUG, CA

# ConsoleAppender
log4j.appender.CA=org.apache.log4j.ConsoleAppender
Expand Down
250 changes: 0 additions & 250 deletions modules/flowable-app-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,256 +261,6 @@
</build>
</profile>

<!-- database qa profile -->
<profile>
<id>database</id>
<activation>
<property>
<name>database</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>database-test-create-schema</id>
<phase>process-test-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo
message="updating flowable configuration to db ${database}" />
<copy
file="${basedir}/../../qa/db/flowable.app.cfg.xml"
todir="target/test-classes"
overwrite="true">
<filterset
filtersfile="${user.home}/.flowable/jdbc/build.flowable6.${database}.properties" />
</copy>
</tasks>
</configuration>
</execution>
<execution>
<id>database-test-drop-schema</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo
message="dropping schema in ${database}" />
<java
classname="org.flowable.app.engine.impl.db.DbSchemaDrop"
classpathref="maven.test.classpath" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>databasemssql</id>
<activation>
<property>
<name>databasemssql</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>database-test-create-schema</id>
<phase>process-test-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo
message="updating flowable configuration to db ${databasemssql}" />
<copy
file="${basedir}/../../qa/db/flowable.mssql.app.cfg.xml"
tofile="target/test-classes/flowable.app.cfg.xml"
overwrite="true">
<filterset
filtersfile="${user.home}/.flowable/jdbc/build.flowable6.${databasemssql}.properties" />
</copy>
</tasks>
</configuration>
</execution>
<execution>
<id>database-test-drop-schema</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo
message="dropping schema in ${databasemssql}" />
<java
classname="org.flowable.app.engine.impl.db.DbSchemaDrop"
classpathref="maven.test.classpath" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>databasewithschema</id>
<activation>
<property>
<name>databasewithschema</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>database-test-create-schema</id>
<phase>process-test-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo
message="updating flowable configuration to db ${databasewithschema}" />
<copy
file="${basedir}/../../qa/db/schema/flowable.app.cfg.xml"
todir="target/test-classes"
overwrite="true">
<filterset
filtersfile="${user.home}/.flowable/jdbc/build.flowable6.${databasewithschema}.properties" />
</copy>
</tasks>
</configuration>
</execution>
<execution>
<id>database-test-drop-schema</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo
message="dropping schema in ${databasewithschema}" />
<java
classname="org.flowable.app.engine.impl.db.DbSchemaDrop"
classpathref="maven.test.classpath" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>oracle</id>
<activation>
<property>
<name>database</name>
<value>oracle</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>${oracle.jdbc.artifact}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>oraclewithschema</id>
<activation>
<property>
<name>databasewithschema</name>
<value>oracle</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>${oracle.jdbc.artifact}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>oraclewithschemaasynchistory</id>
<activation>
<property>
<name>databasewithschemaasynchistory</name>
<value>oracle</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>${oracle.jdbc.artifact}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>db2</id>
<activation>
<property>
<name>database</name>
<value>db2</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>jcc</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>db2asynchistory</id>
<activation>
<property>
<name>databaseasynchistory</name>
<value>db2</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.ibm.db2</groupId>
<artifactId>jcc</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>

</profiles>

</project>
64 changes: 0 additions & 64 deletions modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/DbSchemaDrop.java
View file

This file was deleted.

Loading

0 comments on commit 90f561f

Please sign in to comment.