diff --git a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineExportTaskLocalService.java b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineExportTaskLocalService.java index 896963240e62df..0b1386ae518a99 100644 --- a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineExportTaskLocalService.java +++ b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineExportTaskLocalService.java @@ -72,7 +72,6 @@ public interface BatchEngineExportTaskLocalService public BatchEngineExportTask addBatchEngineExportTask( BatchEngineExportTask batchEngineExportTask); - @Transactional(propagation = Propagation.REQUIRES_NEW) public BatchEngineExportTask addBatchEngineExportTask( String externalReferenceCode, long companyId, long userId, String callbackURL, String className, String contentType, diff --git a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineImportTaskLocalService.java b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineImportTaskLocalService.java index 10064fb173e5dc..4a9f9ffd56ace3 100644 --- a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineImportTaskLocalService.java +++ b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/service/BatchEngineImportTaskLocalService.java @@ -73,7 +73,6 @@ public interface BatchEngineImportTaskLocalService public BatchEngineImportTask addBatchEngineImportTask( BatchEngineImportTask batchEngineImportTask); - @Transactional(propagation = Propagation.REQUIRES_NEW) public BatchEngineImportTask addBatchEngineImportTask( String externalReferenceCode, long companyId, long userId, long batchSize, String callbackURL, String className, @@ -83,7 +82,6 @@ public BatchEngineImportTask addBatchEngineImportTask( String taskItemDelegateName) throws PortalException; - @Transactional(propagation = Propagation.REQUIRES_NEW) public BatchEngineImportTask addBatchEngineImportTask( String externalReferenceCode, long companyId, long userId, long batchSize, String callbackURL, String className, diff --git a/modules/apps/batch-engine/batch-engine-api/src/main/resources/com/liferay/batch/engine/service/packageinfo b/modules/apps/batch-engine/batch-engine-api/src/main/resources/com/liferay/batch/engine/service/packageinfo index 3bfba5374021c0..0597d4d3ab105e 100644 --- a/modules/apps/batch-engine/batch-engine-api/src/main/resources/com/liferay/batch/engine/service/packageinfo +++ b/modules/apps/batch-engine/batch-engine-api/src/main/resources/com/liferay/batch/engine/service/packageinfo @@ -1 +1 @@ -version 6.0.0 \ No newline at end of file +version 6.0.1 \ No newline at end of file diff --git a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineExportTaskLocalServiceImpl.java b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineExportTaskLocalServiceImpl.java index 313f91c1869fd1..ad897a139cef02 100644 --- a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineExportTaskLocalServiceImpl.java +++ b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineExportTaskLocalServiceImpl.java @@ -32,7 +32,6 @@ public class BatchEngineExportTaskLocalServiceImpl extends BatchEngineExportTaskLocalServiceBaseImpl { @Override - @Transactional(propagation = Propagation.REQUIRES_NEW) public BatchEngineExportTask addBatchEngineExportTask( String externalReferenceCode, long companyId, long userId, String callbackURL, String className, String contentType, diff --git a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineImportTaskLocalServiceImpl.java b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineImportTaskLocalServiceImpl.java index 349130d4d4c59e..62ebc9f294d06d 100644 --- a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineImportTaskLocalServiceImpl.java +++ b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/service/impl/BatchEngineImportTaskLocalServiceImpl.java @@ -42,7 +42,6 @@ public class BatchEngineImportTaskLocalServiceImpl extends BatchEngineImportTaskLocalServiceBaseImpl { @Override - @Transactional(propagation = Propagation.REQUIRES_NEW) public BatchEngineImportTask addBatchEngineImportTask( String externalReferenceCode, long companyId, long userId, long batchSize, String callbackURL, String className, @@ -64,7 +63,6 @@ public BatchEngineImportTask addBatchEngineImportTask( } @Override - @Transactional(propagation = Propagation.REQUIRES_NEW) public BatchEngineImportTask addBatchEngineImportTask( String externalReferenceCode, long companyId, long userId, long batchSize, String callbackURL, String className, diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/portalsmoke/PortalSmoke.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/portalsmoke/PortalSmoke.testcase index c12e723dbc6168..35683eb8640df9 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/portalsmoke/PortalSmoke.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/portalsmoke/PortalSmoke.testcase @@ -122,6 +122,7 @@ definition { property app.server.types = "tomcat,wildfly,weblogic"; property database.jndi.enabled = "true"; property database.types = "db2,mariadb,mysql,oracle,postgresql,sqlserver"; + property environment.acceptance = "true"; property portal.smoke = "false"; SignIn.signInTestSetup(); diff --git a/test.properties b/test.properties index 13602d986072bd..69f7a2648323c8 100644 --- a/test.properties +++ b/test.properties @@ -4152,6 +4152,22 @@ # functional-redhat8-tomcat90-mysql57,\ # functional-redhat9-tomcat90-mysql57,\ # functional-rockylinux91-tomcat90-mysql57,\ + functional-smoke-tomcat90-db2111,\ + functional-smoke-tomcat90-db2115,\ + functional-smoke-tomcat90-mariadb102,\ + functional-smoke-tomcat90-mariadb104,\ + functional-smoke-tomcat90-mariadb106,\ + functional-smoke-tomcat90-mysql57,\ + functional-smoke-tomcat90-mysql80,\ + functional-smoke-tomcat90-oracle193,\ + functional-smoke-tomcat90-postgresql121,\ + functional-smoke-tomcat90-postgresql134,\ + functional-smoke-tomcat90-postgresql144,\ + functional-smoke-tomcat90-postgresql153,\ + functional-smoke-tomcat90-postgresql163,\ + functional-smoke-tomcat90-sqlserver2017,\ + functional-smoke-tomcat90-sqlserver2019,\ + functional-smoke-tomcat90-sqlserver2022,\ # functional-suse15-tomcat90-mysql57,\ functional-tomcat90-db2111,\ functional-tomcat90-db2115,\