LPS-125550 rebase on LPS-128599 #2168

yuhai · 2021-03-04T07:12:58Z

@tinatian, I add the last two commits for you review clearly. And do the change about the commit 2a4259f (because the pr rebased on shuyangzhou#9823). In addition, after LPS-128599 merged to master. The pr should lack packageinfo change due to the commit 2a4259f (I add new constructor for CaptureAppender and LogEvent).

cc @dantewang

….test.log to com.liferay.portal.test.log.log4j, deprecate original ones

…portal.kernel.test to com.liferay.portal.test.log.jdk, deprecate original ones

…og4J Appender to avoid exposing Log4J API

…tRule

…s to avoid startup issue like https://issues.liferay.com/browse/LPS-100336

…onfiguration.

…stPermission" "register")" during ant all.

…keep rename action, do it as one commit), this is needed as the proeprty file name is hard coded in log4j2.

…to log4j2 DefaultMergeStrategy to custom our merge rule. Merge new configuration to our centralizedConfiguration.

…ows "null".

…Log4jLogFactoryImpl.

…rn can replace log4j1's SimplyLayout.

…erver-admin-web.

…es, setAdditive let log event will not be propagated to parents.

… a little different about output format.

…r's level is null or fake, it will use its parent Logger level (default Root logger level is Error); 2),Log4j2 logger's appender is aggregated, log4j1 logger's appender is overrided.

…ired by log4j-core.jar as it is exporting package "org.apache.logging.log4j.core.osgi" which contains a class referencing osgi related classes

liferay-continuous-integration · 2021-03-04T07:13:02Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

yuhai · 2021-03-04T07:13:36Z

ci:test:sf

liferay-continuous-integration · 2021-03-04T07:24:35Z

❌ ci:test:relevant - 0 out of 1 jobs passed in 11 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4ef1e49a5565418b5bf991238ee548fb8a8965e2

Upstream Comparison:

Branch GIT ID: 4ef1e49a5565418b5bf991238ee548fb8a8965e2
Jenkins Build URL: Acceptance Upstream DXP (master) #1603

ci:test:relevant - 0 out of 1 jobs PASSED

1 Failed Jobs:

~~test-portal-acceptance-pullrequest(master)~~

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest(master)

Job Results:

0 Jobs Passed.
1 Job Failed.

A CI failure has occurred. QA Engineering has been notified. Please try again later or contact QA Engineering for an update.

For upstream results, click here.

liferay-continuous-integration · 2021-03-04T07:30:37Z

❌ ci:test:sf - 0 out of 1 jobs passed in 17 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4ef1e49a5565418b5bf991238ee548fb8a8965e2

Sender Branch:

Branch Name: LPS-125550-0304
Branch GIT ID: ec60c367649102dad8de55fd203dd4c75af6b46d

0 out of 1jobs PASSED

1 Failed Jobs:

~~test-portal-source-format~~

For more details click here.

     [java] java.lang.Exception: Found 3 formatting issues:
     [java] 1: Combine the literal string 'price-value-inactive' with 'StringPool.SPACE': ./modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/default.jsp 23 (Checkstyle:PlusStatementCheck)
     [java] 2: Combine the literal string 'price-value-inactive' with 'StringPool.SPACE': ./modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/promo.jsp 23 (Checkstyle:PlusStatementCheck)
     [java] 3: ./modules/apps/data-engine/data-engine-service/src/main/java/com/liferay/data/engine/internal/exportimport/data/handler/DEDataDefinitionFieldLinkStagedModelDataHandler.java expected:<...initionFieldLink.set[MvccVersion(
     [java] 				existingDEDataDefinitionFieldLink.getMvccVersion());
     [java] 			importedDEDataDefinitionFieldLink.set]DeDataDefinitionFiel...> but was:<...initionFieldLink.set[]DeDataDefinitionFiel...>
     [java] 
     [java] 	at com.liferay.source.formatter.SourceFormatter.format(SourceFormatter.java:445)
     [java] 	at com.liferay.source.formatter.SourceFormatter.main(SourceFormatter.java:290)
[stopwatch] [run.batch.test.action: 15:03.317 sec]
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/portal-impl/build.xml:562: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/portal-impl/build.xml:706: Java returned: 1
      [get] Getting: http://test-1-10/job/test-portal-source-format/2592//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20210303233017748.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20210303233017748.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null2000262577.properties
merge-test-results:

[mkdir] Created dir: /opt/dev/projects/github/liferay-portal/test-results

[junitreport] Processing /opt/dev/projects/github/liferay-portal/test-results/TESTS-TestSuites.xml to /tmp/null240071277

[junitreport] Loading stylesheet jar:file:/opt/java/ant/lib/ant-junit.jar!/org/apache/tools/ant/taskdefs/optional/junit/xsl/junit-frames.xsl

[junitreport] Transform time: 431ms

[junitreport] Deleting: /tmp/null240071277

[echo] A report with all the test results can be found at test-results/html/index.html.

[mkdir] Created dir: /opt/dev/projects/github/liferay-jenkins-ee/test-results

dantewang · 2021-03-04T08:04:28Z

modules/core/portal-bootstrap/system.packages.extra.bnd

@@ -223,6 +223,12 @@ Export-Package:\
 	org.apache.commons.logging.impl;version="1.2",\
 	org.apache.commons.validator.routines;version='1.5.1',\
 	org.apache.log4j;version='2.14.0',\
+	org.apache.log4j.bridge;version='2.14.0',\


@yuhai portal-test is deployed as a module, but my RollingFileAppenderBuilder is in petra-log4j which is deployed as a lib in core, which is in the same class loader as log4j jars. What packages does the latter one need?

@dantewang, except org.apache.log4j.spi, RollingFileAppenderBuilder needs the other packages. I will remove these.

@dantewang, I just push force the change. Only keep portal-test needed.

yuhai · 2021-03-04T08:46:45Z

ci:test:sf

liferay-continuous-integration · 2021-03-04T09:03:28Z

❌ ci:test:sf - 0 out of 1 jobs passed in 16 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4ef1e49a5565418b5bf991238ee548fb8a8965e2

Sender Branch:

Branch Name: LPS-125550-0304
Branch GIT ID: 73922e4e5f97817e14f932b35e4654badc9bc027

0 out of 1jobs PASSED

1 Failed Jobs:

~~test-portal-source-format~~

For more details click here.

     [java] java.lang.Exception: Found 3 formatting issues:
     [java] 1: Combine the literal string 'price-value-inactive' with 'StringPool.SPACE': ./modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/default.jsp 23 (Checkstyle:PlusStatementCheck)
     [java] 2: Combine the literal string 'price-value-inactive' with 'StringPool.SPACE': ./modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/promo.jsp 23 (Checkstyle:PlusStatementCheck)
     [java] 3: ./modules/apps/data-engine/data-engine-service/src/main/java/com/liferay/data/engine/internal/exportimport/data/handler/DEDataDefinitionFieldLinkStagedModelDataHandler.java expected:<...initionFieldLink.set[MvccVersion(
     [java] 				existingDEDataDefinitionFieldLink.getMvccVersion());
     [java] 			importedDEDataDefinitionFieldLink.set]DeDataDefinitionFiel...> but was:<...initionFieldLink.set[]DeDataDefinitionFiel...>
     [java] 
     [java] 	at com.liferay.source.formatter.SourceFormatter.format(SourceFormatter.java:445)
     [java] 	at com.liferay.source.formatter.SourceFormatter.main(SourceFormatter.java:290)
[stopwatch] [run.batch.test.action: 16:26.188 sec]
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/portal-impl/build.xml:562: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/portal-impl/build.xml:706: Java returned: 1
      [get] Getting: http://test-1-16/job/test-portal-source-format/5094//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20210304013649195.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20210304013649195.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null1387895271.properties
merge-test-results:

[mkdir] Created dir: /opt/dev/projects/github/liferay-portal/test-results

[junitreport] Processing /opt/dev/projects/github/liferay-portal/test-results/TESTS-TestSuites.xml to /tmp/null1287152935

[junitreport] Loading stylesheet jar:file:/opt/java/ant/lib/ant-junit.jar!/org/apache/tools/ant/taskdefs/optional/junit/xsl/junit-frames.xsl

[junitreport] Transform time: 223ms

[junitreport] Deleting: /tmp/null1287152935

[echo] A report with all the test results can be found at test-results/html/index.html.

[mkdir] Created dir: /opt/dev/projects/github/liferay-jenkins-ee/test-results

yuhai · 2021-03-04T09:17:03Z

ci:test:relevant

liferay-continuous-integration · 2021-03-04T09:19:43Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#7835
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:tinatian#2168
Spira Release:/Liferay DXP 7.4/Pull Request/ci:test:relevant
Spira Release Build:master - yuhai > tinatian - PR#2168 - 2021-03-03[23:14:00]
Spira Jenkins Build:publish-spira-report#16923

liferay-continuous-integration · 2021-03-04T09:25:01Z

Jenkins Build:test-portal-source-format#2592
Jenkins Report:jenkins-report.html
Jenkins Suite: sf
Pull Request:tinatian#2168
Spira Release:/Liferay DXP 7.4/Pull Request/ci:test:sf
Spira Release Build:master - yuhai > tinatian - PR#2168 - 2021-03-03[23:13:50]
Spira Jenkins Build:publish-spira-report#16924

liferay-continuous-integration · 2021-03-04T11:04:26Z

❌ ci:test:relevant - 0 out of 1 jobs passed in 11 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4ef1e49a5565418b5bf991238ee548fb8a8965e2

Upstream Comparison:

Branch GIT ID: 4ef1e49a5565418b5bf991238ee548fb8a8965e2
Jenkins Build URL: Acceptance Upstream DXP (master) #1603

ci:test:relevant - 0 out of 1 jobs PASSED

1 Failed Jobs:

~~test-portal-acceptance-pullrequest(master)~~

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest(master)

Job Results:

0 Jobs Passed.
1 Job Failed.

A CI failure has occurred. QA Engineering has been notified. Please try again later or contact QA Engineering for an update.

For upstream results, click here.

liferay-continuous-integration · 2021-03-04T12:05:55Z

Jenkins Build:test-portal-source-format#5094
Jenkins Report:jenkins-report.html
Jenkins Suite: sf
Pull Request:tinatian#2168
Spira Release:/Liferay DXP 7.4/Pull Request/ci:test:sf
Spira Release Build:master - yuhai > tinatian - PR#2168 - 2021-03-04[00:47:04]
Spira Jenkins Build:publish-spira-report#20983

liferay-continuous-integration · 2021-03-04T14:07:34Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#7971
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:tinatian#2168
Spira Release:/Liferay DXP 7.4/Pull Request/ci:test:relevant
Spira Release Build:master - yuhai > tinatian - PR#2168 - 2021-03-04[02:53:46]
Spira Jenkins Build:publish-spira-report#17141

yichenroy · 2021-03-04T19:57:10Z

@yuhai @tinatian should the following pull request go to liferay-plugins-ee instead of liferay-plugins?

shuyangzhou/liferay-plugins#162

hai.yu and others added 28 commits March 3, 2021 09:06

LPS-128599 Copy Log4J related testing classes from com.liferay.portal…

e4f1a04

….test.log to com.liferay.portal.test.log.log4j, deprecate original ones

LPS-128599 update usages.

d6023e9

LPS-128599 Copy JDK logging related testing classes from com.liferay.…

ed5ccbd

…portal.kernel.test to com.liferay.portal.test.log.jdk, deprecate original ones

LPS-128599 update usages

06c3529

LPS-128599 Change CaptureAppender from is-a Log4J Appender to has-a L…

f48051a

…og4J Appender to avoid exposing Log4J API

LPS-128599 Apply same pattern to the appender used by LogAssertionTes…

ea4db7f

…tRule

LPS-128599 bnd and packageinfo

5cc5393

LPS-128599 SF, inline the only usages

b3ef7b5

LPS-125550 Patch log4j-core and log4j-api to exclude META-INF/version…

25c3320

…s to avoid startup issue like https://issues.liferay.com/browse/LPS-100336

LPS-125550 FAKE GRADLE CACHE

4b3062c

LPS-125550 Upgrade log4j jars and run "build-lib-versions"

b783ffe

LPS-125550 Update references to log4j jars

2fa2ced

LPS-125550 Set this to create a single LoggerContext using a single c…

f781d4f

…onfiguration.

LPS-125550 Solve the error "access denied ("javax.management.MBeanTru…

456e656

…stPermission" "register")" during ant all.

LPS-125550 Rename log4j.properties to log4j2.properties (in order to …

7e11427

…keep rename action, do it as one commit), this is needed as the proeprty file name is hard coded in log4j2.

LPS-125550 Update log4j xml

6751a92

LPS-125550 Use log4j2 configuration to update Log4jConfigUtil. Refer …

dc1069e

…to log4j2 DefaultMergeStrategy to custom our merge rule. Merge new configuration to our centralizedConfiguration.

LPS-125550 SF, just for review check the change, log4j loggerName all…

43ad7c9

…ows "null".

LPS-125550 Add support for LCS

1124622

LPS-125550 Replace log4j1 usage with log4j2, change Log4jLogImpl and …

caf523a

…Log4jLogFactoryImpl.

LPS-125550 Replace log4j1 usage with log4j2, patternLayout with patte…

df040c0

…rn can replace log4j1's SimplyLayout.

LPS-125550 Replace log4j1 usage with log4j2, update package name in s…

64caf30

…erver-admin-web.

LPS-125550 Replace log4j1 usage with log4j2, update portal-test class…

2a4259f

…es, setAdditive let log event will not be propagated to parents.

LPS-125550 Integration Test, PortalLog4jTest(integration test) It has…

402c007

… a little different about output format.

LPS-125550 Unit Test, log4j2 and log4j1 different points: 1),if logge…

f7ea73a

…r's level is null or fake, it will use its parent Logger level (default Root logger level is Error); 2),Log4j2 logger's appender is aggregated, log4j1 logger's appender is overrided.

LPS-125550 Fix, solve portal-impl unit test compile. This jar is requ…

ae94ef4

…ired by log4j-core.jar as it is exporting package "org.apache.logging.log4j.core.osgi" which contains a class referencing osgi related classes

LPS-125550 Update git-commit-plugins

79c897e

LPS-125550 Update com.liferay.portal.test.log.log4j.LogEvent usage.

68551a8

liferay-continuous-integration added ci:test:relevant - failure and removed ci:test:relevant - pending labels Mar 4, 2021

liferay-continuous-integration added ci:test:sf - failure and removed ci:test:sf - pending labels Mar 4, 2021

dantewang reviewed Mar 4, 2021

View reviewed changes

yuhai force-pushed the LPS-125550-0304 branch 2 times, most recently from a337fdb to 73922e4 Compare March 4, 2021 08:45

LPS-125550 portal-test classes imports the package.

73922e4

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - failure and removed ci:test:sf - failure ci:test:sf - pending labels Mar 4, 2021

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - failure and removed ci:test:relevant - failure ci:test:stable - pending ci:test:relevant - pending labels Mar 4, 2021

tinatian closed this Mar 4, 2021

LPS-125550 rebase on LPS-128599 #2168

LPS-125550 rebase on LPS-128599 #2168

Conversation

yuhai commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

yuhai commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

❌ ci:test:relevant - 0 out of 1 jobs passed in 11 minutes

Base Branch:

Upstream Comparison:

1 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest(master)

Job Results:

For upstream results, click here.

liferay-continuous-integration commented Mar 4, 2021

❌ ci:test:sf - 0 out of 1 jobs passed in 17 minutes

Base Branch:

Sender Branch:

1 Failed Jobs:

For more details click here.

dantewang Mar 4, 2021

Choose a reason for hiding this comment

yuhai Mar 4, 2021

Choose a reason for hiding this comment

yuhai Mar 4, 2021

Choose a reason for hiding this comment

yuhai commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

❌ ci:test:sf - 0 out of 1 jobs passed in 16 minutes

Base Branch:

Sender Branch:

1 Failed Jobs:

For more details click here.

yuhai commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

❌ ci:test:relevant - 0 out of 1 jobs passed in 11 minutes

Base Branch:

Upstream Comparison:

1 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest(master)

Job Results:

For upstream results, click here.

liferay-continuous-integration commented Mar 4, 2021

liferay-continuous-integration commented Mar 4, 2021

yichenroy commented Mar 4, 2021