This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 86fcc2694 Make Axiom conform to the new privacy policy
86fcc2694 is described below
commit 86fcc269421cb66310ba8a2113cacc375bc206aa
Author: Andreas Veithen <[email protected]>
AuthorDate: Thu Apr 21 23:02:54 2022 +0100
Make Axiom conform to the new privacy policy
- Remove our own privacy policy and link to
https://privacy.apache.org/policies/privacy-policy-public.html.
- Remove Google Analytics.
---
apidocs/pom.xml | 16 ---
axiom-compat/pom.xml | 16 ---
buildutils/buildutils-maven-plugin/pom.xml | 9 --
.../axiom/buildutils/javadoc/PostProcessMojo.java | 110 ---------------------
src/site/apt/privacy-policy.apt | 47 ---------
src/site/site.xml | 12 +--
testing/xml-truth/pom.xml | 16 ---
7 files changed, 1 insertion(+), 225 deletions(-)
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index bfac66490..0df64e085 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -107,22 +107,6 @@
<doctitle>Apache Axiom ${project.version}</doctitle>
</configuration>
</plugin>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>buildutils-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>site</phase>
- <goals>
- <goal>post-process-javadoc</goal>
- </goals>
- <configuration>
-
<javadocDirectory>${project.reporting.outputDirectory}</javadocDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/axiom-compat/pom.xml b/axiom-compat/pom.xml
index 5aebc58a5..1f21dfaa4 100644
--- a/axiom-compat/pom.xml
+++ b/axiom-compat/pom.xml
@@ -99,22 +99,6 @@
<build>
<plugins>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>buildutils-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>site</phase>
- <goals>
- <goal>post-process-javadoc</goal>
- </goals>
- <configuration>
-
<javadocDirectory>${project.reporting.outputDirectory}/apidocs</javadocDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.veithen.maven</groupId>
<artifactId>jacoco-report-maven-plugin</artifactId>
diff --git a/buildutils/buildutils-maven-plugin/pom.xml
b/buildutils/buildutils-maven-plugin/pom.xml
index 5e17bd816..e87b21103 100644
--- a/buildutils/buildutils-maven-plugin/pom.xml
+++ b/buildutils/buildutils-maven-plugin/pom.xml
@@ -31,10 +31,6 @@
<url>http://ws.apache.org/axiom/</url>
- <properties>
- <doxia.version>1.11.1</doxia.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -63,11 +59,6 @@
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-integration-tools</artifactId>
- <version>${doxia.version}</version>
- </dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
diff --git
a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
b/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
deleted file mode 100644
index 9d97d33d4..000000000
---
a/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.buildutils.javadoc;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.List;
-
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.tools.SiteTool;
-import org.apache.maven.doxia.tools.SiteToolException;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.DirectoryScanner;
-
-@Mojo(name="post-process-javadoc")
-public class PostProcessMojo extends AbstractMojo {
- @Component
- private SiteTool siteTool;
-
- @Parameter(property="locales")
- private String locales;
-
- @Parameter(property="project", required=true, readonly=true)
- private MavenProject project;
-
- @Parameter(property="reactorProjects", required=true, readonly=true)
- private List<MavenProject> reactorProjects;
-
- @Parameter(property="localRepository", required=true, readonly=true)
- private ArtifactRepository localRepository;
-
- @Parameter(defaultValue="${basedir}/src/site")
- private File siteDirectory;
-
- @Parameter(required=true)
- private File javadocDirectory;
-
- @Override
- public void execute() throws MojoExecutionException, MojoFailureException {
- DecorationModel decorationModel;
- try {
- decorationModel = siteTool.getDecorationModel(siteDirectory,
- siteTool.getSiteLocales(locales).get(0),
- project, reactorProjects, localRepository,
project.getRemoteArtifactRepositories());
- } catch (SiteToolException ex) {
- throw new MojoExecutionException("SiteToolException: " +
ex.getMessage(), ex);
- }
- String head = decorationModel.getBody().getHead();
- DirectoryScanner ds = new DirectoryScanner();
- ds.setIncludes(new String[] { "**/*.html" });
- ds.setBasedir(javadocDirectory);
- ds.scan();
- for (String relativePath : ds.getIncludedFiles()) {
- File file = new File(javadocDirectory, relativePath);
- File tmpFile = new File(javadocDirectory, relativePath + ".tmp");
- file.renameTo(tmpFile);
- try {
- BufferedReader in = new BufferedReader(new
InputStreamReader(new FileInputStream(tmpFile), "UTF-8"));
- try {
- PrintWriter out = new PrintWriter(new
OutputStreamWriter(new FileOutputStream(file), "UTF-8"));
- try {
- String line;
- while ((line = in.readLine()) != null) {
- if (line.equals("</head>")) {
- out.println(head);
- }
- out.println(line);
- }
- } finally {
- out.close();
- }
- } finally {
- in.close();
- }
- } catch (IOException ex) {
- throw new MojoExecutionException("Failed to process " +
relativePath + ": " + ex.getMessage(), ex);
- }
- tmpFile.delete();
- }
- }
-}
diff --git a/src/site/apt/privacy-policy.apt b/src/site/apt/privacy-policy.apt
deleted file mode 100644
index 3e666dde5..000000000
--- a/src/site/apt/privacy-policy.apt
+++ /dev/null
@@ -1,47 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
- --------------
- Privacy Policy
- --------------
-
-Apache Axiom Privacy Policy
-
- Information about your use of this website is collected using server access
logs and a tracking
- cookie. The collected information consists of the following:
-
- [[1]] The IP address from which you access the website;
-
- [[2]] The type of browser and operating system you use to access our site;
-
- [[3]] The date and time you access our site;
-
- [[4]] The pages you visit; and
-
- [[5]] The addresses of pages from where you followed a link to our site.
-
- Part of this information is gathered using a tracking cookie set by the
Google Analytics service
- and handled by Google as described in their
{{{http://www.google.com/policies/privacy/partners/}privacy policy}}.
- See your browser documentation for instructions on how to disable the cookie
if you prefer not to
- share this data with Google.
-
- We use the gathered information to help us make our site more useful to
visitors and to better
- understand how and when our site is used. We do not track or collect
personally identifiable
- information or associate gathered data with any personally identifying
information from other sources.
-
- By using this website, you consent to the collection of this data in the
manner and for the purpose
- described above.
diff --git a/src/site/site.xml b/src/site/site.xml
index f0693be9d..a74012016 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -24,16 +24,6 @@
<href>http://ws.apache.org/axiom/index.html</href>
</bannerLeft>
<body>
- <head>
- <![CDATA[
- <script async='' src='//www.google-analytics.com/analytics.js'>
</script>
- <script>
-
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
- ga('create', 'UA-56790914-3', {'cookieDomain': 'ws.apache.org',
'cookiePath': '/axiom' });
- ga('send', 'pageview');
- </script>
- ]]>
- </head>
<menu name="About">
<item name="Introduction" href="index.html"/>
<item name="Mailing Lists" href="/mail-lists.html"/>
@@ -76,7 +66,7 @@
<item name="FAQ" href="faq.html"/>
<item name="View Source"
href="https://github.com/apache/ws-axiom"/>
<item name="Code Coverage"
href="https://codecov.io/gh/apache/webservices-axiom"/>
- <item name="Privacy Policy" href="privacy-policy.html"/>
+ <item name="Privacy Policy"
href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
</menu>
<menu name="Modules">
<item name="Implementations" href="implementations/index.html"/>
diff --git a/testing/xml-truth/pom.xml b/testing/xml-truth/pom.xml
index 048754d3a..0161f0678 100644
--- a/testing/xml-truth/pom.xml
+++ b/testing/xml-truth/pom.xml
@@ -55,22 +55,6 @@
<build>
<plugins>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>buildutils-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>site</phase>
- <goals>
- <goal>post-process-javadoc</goal>
- </goals>
- <configuration>
-
<javadocDirectory>${project.reporting.outputDirectory}/apidocs</javadocDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.veithen.maven</groupId>
<artifactId>jacoco-report-maven-plugin</artifactId>
