Skip to content

Commit 0fb3667

Browse files
dizzzzdizzzz
authored
Merge pull request #4938 from eXist-db/dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.6.0
build(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0
2 parents 761efbd + 69681c5 commit 0fb3667

File tree

7 files changed

+70
-13
lines changed

7 files changed

+70
-13
lines changed

‎exist-parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
<plugin>
647647
<groupId>org.apache.maven.plugins</groupId>
648648
<artifactId>maven-dependency-plugin</artifactId>
649-
<version>3.5.0</version>
649+
<version>3.6.0</version>
650650
</plugin>
651651
<plugin>
652652
<groupId>org.codehaus.mojo</groupId>

‎exist-xqts/src/main/xslt/compare-results.xslt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@
105105
<xsl:param name="current-results" as="element(cr:results)" required="yes"/>
106106
<xsl:param name="attr-name" as="xs:string" required="yes"/>
107107
<xsl:variable name="elem-name" as="xs:QName" select="xs:QName(concat('cr:', $attr-name))"/>
108+
<xsl:variable name="previous-results-names" as="xs:string*" select="$previous-results/element()[node-name(.) eq $elem-name]/testcase/@name/string(.)"/>
108109
<xsl:element name="cr:{$attr-name}">
109-
<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]"/>
110+
<xsl:apply-templates mode="simple" select="$current-results/element()[node-name(.) eq $elem-name]/testcase[not(@name = $previous-results-names)]"/>
110111
</xsl:element>
111112
</xsl:function>
112113

‎extensions/indexes/indexes-integration-tests/pom.xml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,17 @@
2323
2424
-->
2525

26-
<project xmlns="http://maven.apache.org/POM/4.0.0"
27-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
28-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
26+
<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">
27+
<modelVersion>4.0.0</modelVersion>
28+
2929
<parent>
30-
<artifactId>exist</artifactId>
3130
<groupId>org.exist-db</groupId>
31+
<artifactId>exist-parent</artifactId>
3232
<version>7.0.0-SNAPSHOT</version>
33-
<relativePath>../../../pom.xml</relativePath>
33+
<relativePath>../../../exist-parent</relativePath>
3434
</parent>
35-
<modelVersion>4.0.0</modelVersion>
3635

3736
<artifactId>indexes-integration-tests</artifactId>
38-
3937
<packaging>jar</packaging>
4038

4139
<name>eXist-db Index Integration Tests</name>
@@ -103,10 +101,16 @@
103101
<goal>analyze-only</goal>
104102
</goals>
105103
<configuration>
106-
<failOnWarning>false</failOnWarning>
104+
<failOnWarning>true</failOnWarning>
105+
106+
<ignoredUsedUndeclaredDependencies>
107+
<ignoredUsedUndeclaredDependency>xml-apis:xml-apis:jar</ignoredUsedUndeclaredDependency>
108+
</ignoredUsedUndeclaredDependencies>
109+
107110
<ignoredUnusedDeclaredDependencies>
108-
<ignoredUnusedDeclaredDependency>exist-index-lucene:jar:${project.version}</ignoredUnusedDeclaredDependency>
109-
<ignoredUnusedDeclaredDependency>exist-index-ngram:${project.version}</ignoredUnusedDeclaredDependency>
111+
<!-- needed for running XQSuite tests that depend on lucene and ngarm modules -->
112+
<ignoredUnusedDeclaredDependency>org.exist-db:exist-index-lucene:jar:${project.version}</ignoredUnusedDeclaredDependency>
113+
<ignoredUnusedDeclaredDependency>org.exist-db:exist-index-ngram:jar:${project.version}</ignoredUnusedDeclaredDependency>
110114
</ignoredUnusedDeclaredDependencies>
111115
</configuration>
112116
</execution>

‎extensions/indexes/lucene/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@
191191
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine:jar:${junit.vintage.version}</ignoredUnusedDeclaredDependency>
192192
</ignoredUnusedDeclaredDependencies>
193193

194+
<ignoredUsedUndeclaredDependencies>
195+
<ignoredUsedUndeclaredDependency>com.ibm.icu:icu4j:jar</ignoredUsedUndeclaredDependency>
196+
</ignoredUsedUndeclaredDependencies>
197+
194198
<ignoredNonTestScopedDependencies>
195199
<ignoredNonTestScopedDependency>net.sf.xmldb-org:xmldb-api:jar</ignoredNonTestScopedDependency>
196200
</ignoredNonTestScopedDependencies>

‎extensions/indexes/range/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,28 @@
121121
<filtering>true</filtering>
122122
</testResource>
123123
</testResources>
124+
125+
<plugins>
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-dependency-plugin</artifactId>
129+
<executions>
130+
<execution>
131+
<id>analyze</id>
132+
<goals>
133+
<goal>analyze-only</goal>
134+
</goals>
135+
<configuration>
136+
<failOnWarning>true</failOnWarning>
137+
<ignoredUsedUndeclaredDependencies>
138+
<ignoredUsedUndeclaredDependency>com.evolvedbinary.j8fu:j8fu:jar</ignoredUsedUndeclaredDependency>
139+
</ignoredUsedUndeclaredDependencies>
140+
</configuration>
141+
</execution>
142+
</executions>
143+
</plugin>
144+
</plugins>
145+
124146
</build>
125147

126148
</project>

‎extensions/modules/image/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,13 @@
106106
</goals>
107107
<configuration>
108108
<failOnWarning>true</failOnWarning>
109+
110+
<ignoredUsedUndeclaredDependencies>
111+
<ignoredUsedUndeclaredDependency>xml-apis:xml-apis:jar</ignoredUsedUndeclaredDependency>
112+
</ignoredUsedUndeclaredDependencies>
113+
109114
<ignoredUnusedDeclaredDependencies>
110-
<!-- needed for running tests that depend on file module -->
115+
<!-- needed for running XQSuite tests that depend on file module -->
111116
<ignoredUnusedDeclaredDependency>org.exist-db:exist-file:jar:${project.version}</ignoredUnusedDeclaredDependency>
112117
</ignoredUnusedDeclaredDependencies>
113118
</configuration>

‎extensions/modules/xmldiff/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,27 @@
131131
</licenseSets>
132132
</configuration>
133133
</plugin>
134+
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-dependency-plugin</artifactId>
138+
<executions>
139+
<execution>
140+
<id>analyze</id>
141+
<goals>
142+
<goal>analyze-only</goal>
143+
</goals>
144+
<configuration>
145+
<failOnWarning>true</failOnWarning>
146+
147+
<ignoredUsedUndeclaredDependencies>
148+
<ignoredUsedUndeclaredDependency>com.ibm.icu:icu4j:jar</ignoredUsedUndeclaredDependency>
149+
</ignoredUsedUndeclaredDependencies>
150+
151+
</configuration>
152+
</execution>
153+
</executions>
154+
</plugin>
134155
</plugins>
135156
</build>
136157

0 commit comments

Comments
 (0)