Skip to content

Lpd x test batch engine tx #6207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Lpd x test batch engine tx #6207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e66a26
LPD-x Remove @Transactional(propagation = Propagation.REQUIRES_NEW)
tinatian Mar 14, 2025
585cb1b
LPD-x Auto generated
tinatian Mar 14, 2025
8bb894b
LPD-36417 Add smoke test to environments test suite
tinatian Mar 14, 2025
485eb8e
LPD-36417 Add PortalSmoke#SmokeWithJNDI to environment.acceptance
tinatian Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...api/src/main/java/com/liferay/batch/engine/service/BatchEngineExportTaskLocalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions ...api/src/main/java/com/liferay/batch/engine/service/BatchEngineImportTaskLocalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...h-engine/batch-engine-api/src/main/resources/com/liferay/batch/engine/service/packageinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 6.0.0
version 6.0.1
1 change: 0 additions & 1 deletion ...ain/java/com/liferay/batch/engine/service/impl/BatchEngineExportTaskLocalServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions ...ain/java/com/liferay/batch/engine/service/impl/BatchEngineImportTaskLocalServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions portal-web/test/functional/com/liferay/portalweb/tests/portalsmoke/PortalSmoke.testcase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
16 changes: 16 additions & 0 deletions test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down