fix filtering Signed-off-by: Olivier Lamy <olamy@apache.org>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index 6e2f82f..6572bbe 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
@@ -182,6 +182,7 @@ <configuration> <settingsFile>${basedir}/src/test/test-settings.xml</settingsFile> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <skip>${skipTests}</skip> </configuration> <dependencies> <dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index 69a759c..a614193 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -327,6 +327,7 @@ </includes> <excludes> <exclude>**/index/**</exclude> + <exclude>**/*.jar</exclude> </excludes> </testResource> <testResource> @@ -334,6 +335,7 @@ <filtering>false</filtering> <includes> <include>**/index/**</include> + <include>**/*.jar</include> </includes> <excludes> <exclude>**/**</exclude>
diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml index 0bd3656..6b7863c 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -340,7 +340,7 @@ <activation> <jdk>[1.9,)</jdk> </activation> - <properties > + <properties> <cassandra.addJdk11Options>true</cassandra.addJdk11Options> </properties> </profile>
diff --git a/pom.xml b/pom.xml index e3cbef7..070dfac 100644 --- a/pom.xml +++ b/pom.xml
@@ -52,17 +52,12 @@ <!-- Java Enterprise APIs --> - - <maven3x.version>3.8.1</maven3x.version> <maven.resolver.version>1.4.1</maven.resolver.version> <maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version> <maven-model-converter.version>2.3</maven-model-converter.version> <wagon.version>3.3.3</wagon.version> - - - <!-- dependencies of maven modules --> <jsoup.version>1.14.2</jsoup.version> <rome.version>1.16.0</rome.version> @@ -113,8 +108,7 @@ <openjpa.Log>DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR</openjpa.Log> <jacocoproperty/> - - + <skipTests></skipTests> </properties> <dependencyManagement>