LPS-89131 Fix rebase mistakes

[marcelabc]

No description provided.

[liferay-continuous-integration]

CI is automatically triggering "ci:test:sf" and "ci:test:relevant" for this pull to run Source Formatter and relevant tests.

Comment "ci:test" to run the full PR Tester for this pull.

[liferay-continuous-integration]

✔️ ci:test:sf - 1 out of 1 jobs passed in 1 minute 42 seconds 800 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4dda6fa7afb54feef301333920a523f214b8e05c

Sender Branch:

Branch Name: LPS-89131-NEW
Branch GIT ID: 4730696ad08ea44ac7cf181871a72001abc0e0bd

1 out of 1jobs PASSED

1 Successful Jobs:

• test-portal-source-format

For more details click here.

[liferay-continuous-integration]

❌ ci:test:relevant - 19 out of 21 jobs passed in 1 hour 9 minutes 47 seconds 936 ms

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 4dda6fa7afb54feef301333920a523f214b8e05c

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 1116e93dcbd0a318a5291a7bccd0d28001839476

19 out of 21 jobs PASSED

2 Failed Jobs:

• test-portal-acceptance-pullrequest(master)
• test-portal-acceptance-pullrequest-batch(master)/pmd-jdk8

19 Successful Jobs:

• test-portal-acceptance-pullrequest-batch(master)/central-requirements-jdk8
• test-portal-acceptance-pullrequest-batch(master)/functional-smoke-tomcat90-mysql57-jdk11_open/0
• test-portal-acceptance-pullrequest-batch(master)/functional-smoke-tomcat90-mysql57-jdk8/0
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/0
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/1
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/2
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/3
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/4
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/5
• test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/6
• test-portal-acceptance-pullrequest-batch(master)/js-unit-jdk8
• test-portal-acceptance-pullrequest-batch(master)/lpkg-base-jdk8
• test-portal-acceptance-pullrequest-batch(master)/lpkg-controller-jdk8
• test-portal-acceptance-pullrequest-batch(master)/modules-compile-jdk8
• test-portal-acceptance-pullrequest-batch(master)/modules-integration-mysql57-jdk8
• test-portal-acceptance-pullrequest-batch(master)/modules-semantic-versioning-jdk8
• test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk8
• test-portal-acceptance-pullrequest-batch(master)/modules-unit-project-templates-jdk8
• test-portal-acceptance-pullrequest-batch(master)/semantic-versioning-jdk8

For more details click here.

---

Failures unique to this pull:

1. test-portal-acceptance-pullrequest-batch(master)/pmd-jdk8

   Job Results:

   0 Tests Passed.
   1 Test Failed.

   1. AXIS_VARIABLE=0,label_exp=!master #31522

      [beanshell] local.git.branch.cached=true
      [beanshell] github.origin.name=liferay
      [beanshell] 
         [delete] Deleting: /opt/dev/projects/github/liferay-jenkins-ee/json.data
           [echo] curl --output /opt/dev/projects/github/liferay-jenkins-ee/json.data --silent --write-out %{http_code} 'http://cloud-10-0-0-31/osb-jenkins-web/map/test-1-5/test-portal-acceptance-pullrequest%28master%29/3810/test-portal-acceptance-pullrequest%28master%29/git.portal.properties'
           [exec] 200
         [delete] Deleting: /opt/dev/projects/github/liferay-jenkins-ee/commands/20190218203240846
      [beanshell] 
      [beanshell] ##
      [beanshell] ## http://cloud-10-0-0-31/osb-jenkins-web/map/test-1-5/test-portal-acceptance-pullrequest%28master%29/3810/test-portal-acceptance-pullrequest%28master%29/git.portal.properties
      [beanshell] ##
      [beanshell] 
      [beanshell] github.upstream.branch.name=master
      [beanshell] github.sender.branch.sha=4730696ad08ea44ac7cf181871a72001abc0e0bd
      [beanshell] github.receiver.username=brianchandotcom
      [beanshell] github.sender.branch.name=LPS-89131-NEW
      [beanshell] github.pull.request.number=68210
      [beanshell] github.upstream.branch.sha=4dda6fa7afb54feef301333920a523f214b8e05c
      [beanshell] github.sender.username=marcelabc
      [beanshell] local.git.branch.cached=true
      [beanshell] github.origin.name=marcelabc
      [beanshell] 
         [delete] Deleting: /opt/dev/projects/github/liferay-jenkins-ee/json.data
           [echo] WARNING: pmd-jdk8 does not match existing test types (blade-samples,database-upgrade-client,functional,jsf,plugins,portal-startup,service-builder,tck,modules-integration,integration,modules-unit,unit)
           [echo] WARNING: pmd-jdk8 does not match existing test types (blade-samples,database-upgrade-client,functional,jsf,plugins,portal-startup,service-builder,tck,modules-integration,integration,modules-unit,unit)
      BUILD FAILED
      
      /opt/dev/projects/github/liferay-jenkins-ee/commands/build-common.xml:10412: The following error occurred while executing this line:
      
      /opt/dev/projects/github/liferay-portal/build-test-batch.xml:5275: 1 PMD violation(s) were found.
      PMD VIOLATION: /opt/dev/projects/github/liferay-portal/modules/private/apps/portal-workflow/portal-workflow-metrics-rest-impl/src/main/java/com/liferay/portal/workflow/metrics/rest/internal/graphql/mutation/v1_0/Mutation.java:30 > Avoid unused local variables such as 'bundle'. (PMD Rule: UnusedLocalVariable)
      
      For more information, please see https://pmd.github.io/pmd-6.8.0/pmd_rules_java_bestpractices.html#unusedlocalvariable.

For upstream results, click here.

[brianchandotcom]

Merged. Thank you.
View total diff: 8deb856...ef6d45a