Merge pull request #4938 from eXist-db/dependabot/maven/org.apache.ma…

…ven.plugins-maven-dependency-plugin-3.6.0 build(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0
eXist-db · May 26, 2023 · 0fb3667 · 0fb3667
2 parents 761efbd + 69681c5
commit 0fb3667
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 13 deletions.
diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
@@ -646,7 +646,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-dependency-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
  </plugin>
  <plugin>
  <groupId>org.codehaus.mojo</groupId>

diff --git a/exist-xqts/src/main/xslt/compare-results.xslt b/exist-xqts/src/main/xslt/compare-results.xslt
@@ -105,8 +105,9 @@
  <xsl:param name="current-results" as="element(cr:results)" required="yes"/>
  <xsl:param name="attr-name" as="xs:string" required="yes"/>
  <xsl:variable name="elem-name" as="xs:QName" select="xs:QName(concat('cr:', $attr-name))"/>
+ <xsl:variable name="previous-results-names" as="xs:string*" select="$previous-results/element()[node-name(.) eq $elem-name]/testcase/@name/string(.)"/>
  <xsl:element name="cr:{$attr-name}">
- <xsl:apply-templates mode="simple" select="$current-results/element()[node-name(.) eq $elem-name]/testcase[@name except $previous-results/element()[node-name(.) eq $elem-name]/testcase/@name]"/>
+ <xsl:apply-templates mode="simple" select="$current-results/element()[node-name(.) eq $elem-name]/testcase[not(@name = $previous-results-names)]"/>
  </xsl:element>
  </xsl:function>
 

diff --git a/extensions/indexes/indexes-integration-tests/pom.xml b/extensions/indexes/indexes-integration-tests/pom.xml
@@ -23,19 +23,17 @@
 
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
  <parent>
- <artifactId>exist</artifactId>
  <groupId>org.exist-db</groupId>
+ <artifactId>exist-parent</artifactId>
  <version>7.0.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../../exist-parent</relativePath>
  </parent>
- <modelVersion>4.0.0</modelVersion>
 
  <artifactId>indexes-integration-tests</artifactId>
-
  <packaging>jar</packaging>
 
  <name>eXist-db Index Integration Tests</name>
@@ -103,10 +101,16 @@
  <goal>analyze-only</goal>
  </goals>
  <configuration>
- <failOnWarning>false</failOnWarning>
+ <failOnWarning>true</failOnWarning>
+
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>xml-apis:xml-apis:jar</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+
  <ignoredUnusedDeclaredDependencies>
- <ignoredUnusedDeclaredDependency>exist-index-lucene:jar:${project.version}</ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>exist-index-ngram:${project.version}</ignoredUnusedDeclaredDependency>
+ <!-- needed for running XQSuite tests that depend on lucene and ngarm modules -->
+ <ignoredUnusedDeclaredDependency>org.exist-db:exist-index-lucene:jar:${project.version}</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>org.exist-db:exist-index-ngram:jar:${project.version}</ignoredUnusedDeclaredDependency>
  </ignoredUnusedDeclaredDependencies>
  </configuration>
  </execution>

diff --git a/extensions/indexes/lucene/pom.xml b/extensions/indexes/lucene/pom.xml
@@ -191,6 +191,10 @@
  <ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
  </ignoredUnusedDeclaredDependencies>
 
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>com.ibm.icu:icu4j:jar</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+
  <ignoredNonTestScopedDependencies>
  <ignoredNonTestScopedDependency>net.sf.xmldb-org:xmldb-api:jar</ignoredNonTestScopedDependency>
  </ignoredNonTestScopedDependencies>

diff --git a/extensions/indexes/range/pom.xml b/extensions/indexes/range/pom.xml
@@ -121,6 +121,28 @@
  <filtering>true</filtering>
  </testResource>
  </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>com.evolvedbinary.j8fu:j8fu:jar</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
  </build>
 
 </project>
diff --git a/extensions/modules/image/pom.xml b/extensions/modules/image/pom.xml
@@ -106,8 +106,13 @@
  </goals>
  <configuration>
  <failOnWarning>true</failOnWarning>
+
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>xml-apis:xml-apis:jar</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+
  <ignoredUnusedDeclaredDependencies>
- <!-- needed for running tests that depend on file module -->
+ <!-- needed for running XQSuite tests that depend on file module -->
  <ignoredUnusedDeclaredDependency>org.exist-db:exist-file:jar:${project.version}</ignoredUnusedDeclaredDependency>
  </ignoredUnusedDeclaredDependencies>
  </configuration>

diff --git a/extensions/modules/xmldiff/pom.xml b/extensions/modules/xmldiff/pom.xml
@@ -131,6 +131,27 @@
  </licenseSets>
  </configuration>
  </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>com.ibm.icu:icu4j:jar</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
  </plugins>
  </build>