This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.


    from 9477940  Upgrade some npm libs
     new 6c31025  chore: slight internal refactoring
     new f9ebbd4  TOBAGO-2055: Merging of theme resources may fail in some cases

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/myfaces/tobago/context/ThemeImpl.java   |  76 ++++++----
 .../myfaces/tobago/context/ThemeResources.java     | 163 ++++++++++++++++++---
 .../internal/config/TobagoConfigBuilder.java       |  52 +++----
 .../tobago/internal/config/TobagoConfigImpl.java   |  45 +++---
 .../tobago/internal/config/TobagoConfigMerger.java |   4 +-
 .../tobago/internal/config/TobagoConfigParser.java |  25 +++-
 .../tobago/context/ThemeResourcesUnitTest.java     |  73 +++++++++
 .../internal/config/AbstractTobagoTestBase.java    |  13 +-
 .../config/TobagoConfigMergingUnitTest.java        |  52 +++++--
 .../config/TobagoConfigParserUnitTest.java         |   6 +-
 .../internal/context/ThemeParserUnitTest.java      |  30 ++--
 .../tobago/internal/mock/faces/MockTheme.java      |  79 ----------
 .../resources/tobago-config-for-unit-tests.xml     |  16 +-
 .../src/test/resources/tobago-config-merge-0.xml   |  13 +-
 .../src/test/resources/tobago-config-merge-1.xml   |   9 +-
 ...config2.xml => tobago-config-theme-merge-1.xml} |  25 +++-
 ...config2.xml => tobago-config-theme-merge-2.xml} |  27 +++-
 17 files changed, 452 insertions(+), 256 deletions(-)
 create mode 100644 tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeResourcesUnitTest.java
 delete mode 100644 tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java
 copy tobago-core/src/test/resources/{theme-config2.xml => tobago-config-theme-merge-1.xml} (78%)
 copy tobago-core/src/test/resources/{theme-config2.xml => tobago-config-theme-merge-2.xml} (78%)