From f2404f2275290e462f78685837b84d09d566b1e9 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Wed, 2 Mar 2022 10:36:47 +0800 Subject: [PATCH] disable testcase due to assertXpathEvaluateTo became a restricted API (cherry picked from commit b1f3b1d3ae69e57b635d94fdd58b9f436f24fb8b) --- takari-lifecycle.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/takari-lifecycle.spec b/takari-lifecycle.spec index 25dca6a..bd539f8 100644 --- a/takari-lifecycle.spec +++ b/takari-lifecycle.spec @@ -2,7 +2,7 @@ Name: takari-lifecycle Version: 1.13.6 -Release: 1 +Release: 2 Summary: Optimized replacement for the Maven default lifecycle License: EPL and ASL 2.0 URL: http://takari.io @@ -13,7 +13,7 @@ Patch0: 0001-Port-to-mustache-java-0.9.1.patch Patch1: 0002-Use-commons-codec-instead-of-takari-hash-in-tests.patch Patch2: 0003-Adapt-to-ProjectDependencyGraph-API-change.patch -BuildRequires: maven-local mvn(com.github.spullara.mustache.java:compiler) +BuildRequires: maven maven-local mvn(com.github.spullara.mustache.java:compiler) BuildRequires: mvn(com.google.code.gson:gson) mvn(com.google.guava:guava) BuildRequires: mvn(com.squareup:javapoet) mvn(commons-codec:commons-codec) BuildRequires: mvn(io.takari.builder:takari-builder) @@ -77,6 +77,7 @@ ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/common %pom_change_dep -r org.eclipse.platform:org.eclipse.osgi org.eclipse.osgi: %pom_add_dep org.eclipse:java9api:9 takari-lifecycle-plugin rm takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/compile/CompileIncrementalTest.java +rm takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/configurator/MojoConfigurationMergerTest.java %if %{with bootstrap} %pom_remove_parent %pom_xpath_set pom:project/pom:packaging maven-plugin takari-lifecycle-plugin @@ -112,6 +113,7 @@ rm takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/compile/Compile ' %endif + %build %mvn_build %{?with_bootstrap:-f} -- -Dproject.build.sourceEncoding=UTF-8 -e @@ -126,5 +128,8 @@ rm takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/compile/Compile %license LICENSE.txt LICENSE-2.0.txt %changelog +* Feb Mar 01 2022 Ge Wang - 1.13.6-2 +- disable testcase due to assertXpathEvaluatesTo became a restricted API + * Fri Aug 14 2020 maminjie - 1.13.6-1 - package init