From 0570ae4ba0350de7db5a8b3d541d70494d30a835 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 10:25:30 +0000
Subject: [PATCH 1/2] Bump wro4j-maven-plugin from 1.7.0 to 1.10.1

Bumps [wro4j-maven-plugin](https://github.com/wro4j/wro4j) from 1.7.0 to 1.10.1.
- [Release notes](https://github.com/wro4j/wro4j/releases)
- [Changelog](https://github.com/wro4j/wro4j/blob/master/docs/ReleaseNotes.wiki)
- [Commits](https://github.com/wro4j/wro4j/compare/v1.7.0...v1.10.1)

---
updated-dependencies:
- dependency-name: ro.isdc.wro4j:wro4j-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7a67919..920476e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
       <plugin>
         <groupId>ro.isdc.wro4j</groupId>
         <artifactId>wro4j-maven-plugin</artifactId>
-        <version>1.7.0</version>
+        <version>1.10.1</version>
         <configuration>
           <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
           <wroFile>${basedir}/src/main/config/wro.xml</wroFile>

From d92ae7a653e9fa99201d88d058d7725d3f306654 Mon Sep 17 00:00:00 2001
From: Tim <timb@graphcore.ai>
Date: Mon, 12 Sep 2022 10:11:06 +0100
Subject: [PATCH 2/2] Resolve dependency resolution issue

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 920476e..832fb48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,16 @@
           <contextFolder>${basedir}/src/main/webapp/</contextFolder>
           <ignoreMissingResources>true</ignoreMissingResources>
         </configuration>
+        <dependencies>
+          <!-- Hardcode to 7.1.7 to avoid thia issue
+          [ERROR] Failed to execute goal ro.isdc.wro4j:wro4j-maven-plugin:1.10.1:run (default) on project material-theme: Execution default of goal ro.isdc.wro4j:wro4j-maven-plugin:1.10.1:run failed: Plugin ro.isdc.wro4j:wro4j-maven-plugin:1.10.1 or one of its dependencies could not be resolved: Failed to collect dependencies for ro.isdc.wro4j:wro4j-maven-plugin:jar:1.10.1 (): Could not resolve version conflict among [ro.isdc.wro4j:wro4j-maven-plugin:jar:1.10.1 -> ro.isdc.wro4j:wro4j-extensions:jar:1.10.1 -> org.webjars.npm:jshint:jar:2.11.0 -> org.webjars.npm:minimatch:jar:[3.0.2,3.1), ro.isdc.wro4j:wro4j-maven-plugin:jar:1.10.1 -> ro.isdc.wro4j:wro4j-extensions:jar:1.10.1 -> org.webjars.npm:jshint:jar:2.11.0 -> org.webjars.npm:cli:jar:[1.0.0,1.1) -> org.webjars.npm:glob:jar:[7.1.1,8) -> org.webjars.npm:minimatch:jar:[3.1.1,4)] -> [Help 1]
+          -->
+          <dependency>
+              <groupId>org.webjars.npm</groupId>
+              <artifactId>glob</artifactId>
+              <version>7.1.7</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <goals>