You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/30 21:47:44 UTC
[maven-fluido-skin] 01/07: [MSKINS-178] Upgrade Parent to 36
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
commit 2d0db13be254cd0b9007baab4c5294fde6eed0c1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 30 21:19:30 2022 +0200
[MSKINS-178] Upgrade Parent to 36
---
pom.xml | 28 ++++++++--------------
.../mskins-177-apache-analytics/src/site/site.xml | 4 +++-
.../mskins-177-matomo-no-options/src/site/site.xml | 4 +++-
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6ac9f2d..796c122 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>34</version>
+ <version>36</version>
<relativePath>../../pom/maven/maven-skins/pom.xml</relativePath>
</parent>
@@ -105,17 +105,6 @@ under the License.
<anchorjs.version>4.2.2</anchorjs.version>
</properties>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<build>
<resources>
<resource>
@@ -127,13 +116,21 @@ under the License.
</includes>
</resource>
- <!-- exclude css and js since will include the minified version -->
+ <!-- exclude css and js since will include the minified version, META-INF is filtered separately -->
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>css/**</exclude>
<exclude>js/**</exclude>
+ <exclude>META-INF/**</exclude>
</excludes>
+ </resource>
+
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>META-INF/**</include>
+ </includes>
<filtering>true</filtering> <!-- add skin-info -->
</resource>
@@ -169,11 +166,6 @@ under the License.
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.2</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
diff --git a/src/it/mskins-177-apache-analytics/src/site/site.xml b/src/it/mskins-177-apache-analytics/src/site/site.xml
index 33d48b8..411be99 100644
--- a/src/it/mskins-177-apache-analytics/src/site/site.xml
+++ b/src/it/mskins-177-apache-analytics/src/site/site.xml
@@ -46,7 +46,9 @@
</custom>
<!-- END SNIPPET: skin-apache-analytics -->
- <body/>
+ <body>
+ <head/>
+ </body>
<!-- empty one to disable inherited from parent -->
<googleAnalyticsAccountId></googleAnalyticsAccountId>
diff --git a/src/it/mskins-177-matomo-no-options/src/site/site.xml b/src/it/mskins-177-matomo-no-options/src/site/site.xml
index 13c979a..3733d37 100644
--- a/src/it/mskins-177-matomo-no-options/src/site/site.xml
+++ b/src/it/mskins-177-matomo-no-options/src/site/site.xml
@@ -40,7 +40,9 @@
</custom>
<!-- END SNIPPET: skin-apache-analytics -->
- <body/>
+ <body>
+ <head/>
+ </body>
<!-- empty one to disable inherited from parent -->
<googleAnalyticsAccountId></googleAnalyticsAccountId>