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 2023/01/31 17:26:46 UTC
[maven-doxia-sitetools] branch master updated: [DOXIASITETOOLS-287] Remove Google-related site descriptor properties
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-doxia-sitetools.git
The following commit(s) were added to refs/heads/master by this push:
new 0cac5e7 [DOXIASITETOOLS-287] Remove Google-related site descriptor properties
0cac5e7 is described below
commit 0cac5e758da846fed7ddc6530cd4843a4d27672e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 31 17:42:05 2023 +0100
[DOXIASITETOOLS-287] Remove Google-related site descriptor properties
---
doxia-decoration-model/pom.xml | 2 +-
...DefaultDecorationModelInheritanceAssembler.java | 12 --------
doxia-decoration-model/src/main/mdo/decoration.mdo | 32 +---------------------
3 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/doxia-decoration-model/pom.xml b/doxia-decoration-model/pom.xml
index a256f14..1f28dcb 100644
--- a/doxia-decoration-model/pom.xml
+++ b/doxia-decoration-model/pom.xml
@@ -67,7 +67,7 @@ under the License.
<model>src/main/mdo/decoration.mdo</model>
</models>
<!-- TODO Do not forget to update the version in the decoration description. See DOXIASITETOOLS-98. -->
- <version>1.8.0</version>
+ <version>2.0.0</version>
<firstVersion>1.0.0</firstVersion>
</configuration>
<executions>
diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
index fb4f1b7..860c65d 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
+++ b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
@@ -85,18 +85,6 @@ public class DefaultDecorationModelInheritanceAssembler implements DecorationMod
child.setLastModified(parent.getLastModified());
}
- if (child.getGoogleAdSenseClient() == null && parent.getGoogleAdSenseClient() != null) {
- child.setGoogleAdSenseClient(parent.getGoogleAdSenseClient());
- }
-
- if (child.getGoogleAdSenseSlot() == null && parent.getGoogleAdSenseSlot() != null) {
- child.setGoogleAdSenseSlot(parent.getGoogleAdSenseSlot());
- }
-
- if (child.getGoogleAnalyticsAccountId() == null && parent.getGoogleAnalyticsAccountId() != null) {
- child.setGoogleAnalyticsAccountId(parent.getGoogleAnalyticsAccountId());
- }
-
assembleBodyInheritance(name, child, parent, urlContainer);
assembleCustomInheritance(child, parent);
diff --git a/doxia-decoration-model/src/main/mdo/decoration.mdo b/doxia-decoration-model/src/main/mdo/decoration.mdo
index 883a514..76e8c76 100644
--- a/doxia-decoration-model/src/main/mdo/decoration.mdo
+++ b/doxia-decoration-model/src/main/mdo/decoration.mdo
@@ -30,7 +30,7 @@ under the License.
<p>An XSD is available at:</p>
<ul>
<!-- There is no property filtering in Modello, this has to be updated manually. See DOXIASITETOOLS-98. -->
- <li><a href="https://maven.apache.org/xsd/decoration-1.8.0.xsd">https://maven.apache.org/xsd/decoration-1.8.0.xsd</a></li>
+ <li><a href="https://maven.apache.org/xsd/decoration-2.0.0.xsd">https://maven.apache.org/xsd/decoration-2.0.0.xsd</a></li>
</ul>
]]></description>
@@ -84,36 +84,6 @@ under the License.
</association>
<identifier>true</identifier>
</field>
- <field>
- <name>googleAdSenseClient</name>
- <description>Your Google AdSense client id.

@deprecated This property is deprecated for removal.</description>
- <version>1.3.0+</version>
- <type>String</type>
- <identifier>true</identifier>
- <annotations>
- <annotation>@Deprecated</annotation>
- </annotations>
- </field>
- <field>
- <name>googleAdSenseSlot</name>
- <description>Your Google AdSense slot id.

@deprecated This property is deprecated for removal.</description>
- <version>1.3.0+</version>
- <type>String</type>
- <identifier>true</identifier>
- <annotations>
- <annotation>@Deprecated</annotation>
- </annotations>
- </field>
- <field>
- <name>googleAnalyticsAccountId</name>
- <description>The id for your Google Analytics account.

@deprecated This property is deprecated for removal.</description>
- <version>1.1.0+</version>
- <type>String</type>
- <identifier>true</identifier>
- <annotations>
- <annotation>@Deprecated</annotation>
- </annotations>
- </field>
<field xdoc.separator="blank" java.getter="false">
<name>publishDate</name>
<description>Modify the date published display properties.</description>