Skip to content
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.

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

PAYARA-4251 Woodstock cleanup (a bit of) #4299

Merged
merged 2 commits into from Nov 19, 2019

Conversation

@dmatej
Copy link
Contributor

dmatej commented Nov 5, 2019

Description

This is a build improvement - it is simplier and faster.

  • reduced dependency management without impact (console-core)
  • admingui war module
    • using Maven only, no Ant needed
    • Manifest is generated
    • no repacking, proper dependency management is faster and without mysteries
    • sun-web.xml - using Maven filtering, no hardcoded versions
  • appserver/pom.xml and appserver/admingui/pom.xml
    • using properties to define versions
    • properties are used also for filtering sun-web.xml
  • sources - code formatting, logging
  • result: upgrade means only changing the version property, checking changes
    in artifact dependencies and testing. You can use also snapshots.

Second commit:

  • no default dependencies (or less than before at least)
  • dependency management uses provided scope as a default
  • removed redundant relativePath elements (../pom.xml is default!)
  • removed some dead code - commented out parts
  • admin gui war uses admingui parent, does not skip it to payara-parent
    • it's dependencies moved here if not used in any other module outside
  • console-common
    • changed order of dependencies - our first, external after that,
      classpath conflicts will prefer our implementation (but it does not
      apply to the runtime Payara Server, only for build!)
  • dataprovider
    • osgi repackaging of the woodstock artifact => the original artifact
      is excluded from all dependencies and only our is used
  • imqjmx vs. admingui
    • not used in admingui, even not packaged
    • packaged in other featuresets
    • tested: resulting zip file contains same 4 files with imqjmx in name as
      it contained before
  • jsftemplating
    • dependency shared also by admingui plugins, that's why it is not included
      in the war file, it is included by the packager to the the admingui
      featureset

Important Info

Dependant PRs

Following branches/PR do not block this PR, but they are related (can be used to test it):
payara/patched-src-woodstock-suntheme#16

  • using maven for build.
  • not required for this PR, it can be merged much later

https://github.com/dmatej/patched-src-woodstock/tree/branch-v4.0.2.10

  • using maven for build.
  • not required for this or the second PR
  • differs from Payara/Woodstock repository, but works with that too

Testing

Testing Performed

Manual testing done:

  • build artifacts as snapshots (ie. woodstock-jsf-suntheme)
  • change version of dependency in Payara and build (-Dwoodstock-jsf-suntheme.version=4.0.2.10.payara-p17-SNAPSHOT)
  • install Payara and use DAS GUI on 4848
  • checked output war file - same content as in previous version (except some manifest headers)
@Cousjava

This comment has been minimized.

Copy link
Member

Cousjava commented Nov 7, 2019

There is already a Payara fork of Woodstock at https://github.com/payara/woodstock

@dmatej

This comment has been minimized.

Copy link
Contributor Author

dmatej commented Nov 7, 2019

There is already a Payara fork of Woodstock at https://github.com/payara/woodstock

I know, I found it later (even Andrew did not remember) ... and the second thing is that it is not usable. It is only a copy of files, as it is written in some JIRA issue.
Later we can decide if we should grab sources from that repository and use them here or use this directly. Actually we don't need to release new version and there exist even newer release (but that may mean differences for our css etc).
Or we will stop using Woodstock in Payara 6.

At least I know how it works and now we can release templates without renumbering this artifact.

@dmatej

This comment has been minimized.

Copy link
Contributor Author

dmatej commented Nov 7, 2019

I updated the description

nucleus/pom.xml Outdated Show resolved Hide resolved
appserver/admingui/core/pom.xml Show resolved Hide resolved
appserver/admingui/core/pom.xml Outdated Show resolved Hide resolved
@dmatej dmatej added the DO NOT MERGE label Nov 13, 2019
@dmatej dmatej force-pushed the dmatej:PAYARA-4251-simplier-woodstock-updates branch from 06db248 to 99788bf Nov 15, 2019
@dmatej dmatej removed the DO NOT MERGE label Nov 15, 2019
@dmatej dmatej requested a review from pdudits Nov 15, 2019
@dmatej

This comment has been minimized.

Copy link
Contributor Author

dmatej commented Nov 15, 2019

Jenkins test please

@dmatej dmatej self-assigned this Nov 15, 2019
@Cousjava

This comment has been minimized.

Copy link
Member

Cousjava commented Nov 18, 2019

The latest upstream woodstock is at https://github.com/eclipse-ee4j/glassfish-woodstock, which is buildable.

@dmatej

This comment has been minimized.

Copy link
Contributor Author

dmatej commented Nov 18, 2019

@Cousjava When we will start using it? This PR also is not about Woodstock artifact, but about Payara build. Please check out. It should be merged before any upgrade of Woodstock, because makes upgrades simplier.

dmatej added 2 commits Nov 5, 2019
- reduced dependency management without impact (console-core)
- admingui war module
  - using Maven only, no Ant needed
  - Manifest is generated
  - no repacking, proper dependency management is faster and without mysteries
  - sun-web.xml - using Maven filtering, no hardcoded versions
- appserver/pom.xml
  - using properties to define versions
  - properties are used also for filtering sun-web.xml
- sources - code formatting, logging
- result: upgrade means only changing the version property, checking changes
  in artifact dependencies and testing. You can use also snapshots.
- no default dependencies (or less than before at least)
- dependency management uses provided scope as a default
- removed redundant relativePath elements (../pom.xml is default!)
- removed some dead code - commented out parts
- admin gui war uses admingui parent, does not skip it to payara-parent
  - it's dependencies moved here if not used in any other module outside
- console-common
  - changed order of dependencies - our first, external after that,
    classpath conflicts will prefer our implementation (but it does not
    apply to the runtime Payara Server, only for build!)
- dataprovider
  - osgi repackaging of the woodstock artifact => the original artifact
    is excluded from all dependencies and only our is used
- imqjmx vs. admingui
  - not used in admingui, even not packaged
  - packaged in other featuresets
  - tested: resulting zip file contains same 4 files with imqjmx in name as
    it contained before
- jsftemplating
  - dependency shared also by admingui plugins, that's why it is not included
    in the war file, it is included by the packager to the the admingui
    featureset
@dmatej dmatej force-pushed the dmatej:PAYARA-4251-simplier-woodstock-updates branch from 99788bf to 080d78a Nov 18, 2019
@dmatej

This comment has been minimized.

Copy link
Contributor Author

dmatej commented Nov 19, 2019

Jenkins test please

@dmatej dmatej merged commit b658393 into payara:master Nov 19, 2019
58 checks passed
58 checks passed
Payara Quick Build and Test Quick build and test passed!
Details
security/snyk - api/payara-api/pom.xml (payara-ci) No new issues
Details
security/snyk - api/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/admin/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/admingui/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/ant-tasks/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/appclient/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/batch/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/common/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/concurrent/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/connectors/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/core/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/deployment/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/distributions/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/ejb/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/extras/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/featuresets/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/flashlight/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/grizzly/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/ha/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/installer/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/jdbc/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/jms/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/load-balancer/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/orb/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/osgi-platforms/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/packager/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/payara-appserver-modules/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/persistence/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/registration/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/resources/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/security/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/tests/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/transaction/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/web/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/webservices/pom.xml (payara-ci) No new issues
Details
security/snyk - copyright/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/admin/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/cluster/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/common/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/core/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/deployment/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/diagnostics/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/distributions/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/flashlight/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/grizzly/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/hk2/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/osgi-platforms/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/packager/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/payara-modules/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/resources-l10n/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/resources/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/security/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/test-utils/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/tests/pom.xml (payara-ci) No new issues
Details
security/snyk - pom.xml (payara-ci) No new issues
Details
@dmatej dmatej deleted the dmatej:PAYARA-4251-simplier-woodstock-updates branch Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.