[maven-fluido-skin] branch master updated: [MSKINS-163] Upgrade to parent POM 34

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-fluido-skin] branch master updated: [MSKINS-163] Upgrade to parent POM 34

michaelo
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c13ff3  [MSKINS-163] Upgrade to parent POM 34
1c13ff3 is described below

commit 1c13ff357c12f07100b8b29e17fe8ab6dbd6c58e
Author: Michael Osipov <[hidden email]>
AuthorDate: Tue Mar 24 15:27:06 2020 +0100

    [MSKINS-163] Upgrade to parent POM 34
---
 pom.xml                      | 9 +--------
 src/it/sidebar/verify.groovy | 2 +-
 src/it/topbar/verify.groovy  | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2da94e9..69a989f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-skins</artifactId>
-    <version>30</version>
+    <version>34</version>
     <relativePath>../../pom/maven/maven-skins/pom.xml</relativePath>
   </parent>
 
@@ -182,13 +182,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <dependencies><!-- TODO remove when upgrading to version 2.8: see MSHARED-325 / MRESOURCES-192 -->
-          <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-filtering</artifactId>
-              <version>1.3</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <delimiters>
             <delimiter>@</delimiter>
diff --git a/src/it/sidebar/verify.groovy b/src/it/sidebar/verify.groovy
index f341df3..4071b34 100644
--- a/src/it/sidebar/verify.groovy
+++ b/src/it/sidebar/verify.groovy
@@ -25,7 +25,7 @@ String html = index.getText()
 // active menu
 assert html.contains( '<li class="active"><a href="#"><span class="none"></span>About</a>' )
 // inactive menu
-assert html.contains( '<li><a href="project-summary.html" title="Summary"><span class="none"></span>Summary</a>' )
+assert html.contains( '<li><a href="summary.html" title="Summary"><span class="none"></span>Summary</a>' )
 assert html.contains( '<li><a href="https://maven.apache.org/plugins/index.html" class="externalLink" title="Plugins"><span class="none"></span>Plugins</a>' )
 // breadcrumb
 assert html.contains( '<li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )
diff --git a/src/it/topbar/verify.groovy b/src/it/topbar/verify.groovy
index 1152b9d..85f2843 100644
--- a/src/it/topbar/verify.groovy
+++ b/src/it/topbar/verify.groovy
@@ -25,7 +25,7 @@ String html = index.getText()
 // active menu
 assert html.contains( '<li><a href="index.html" title="About">About</a></li>' )
 // inactive menu
-assert html.contains( '<li><a href="project-summary.html" title="Summary">Summary</a></li>' )
+assert html.contains( '<li><a href="summary.html" title="Summary">Summary</a></li>' )
 assert html.contains( '<li><a href="https://maven.apache.org/plugins/index.html" title="Plugins">Plugins</a></li>' )
 // breadcrumb
 assert html.contains( '<li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )