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

github-bot pushed a commit to branch asf-site-staging
in repository https://gitbox.apache.org/repos/asf/grails-static-website.git


The following commit(s) were added to refs/heads/asf-site-staging by this push:
     new ef9ebe1bbe Updating apache/grails-static-website asf-site-staging 
branch for Github Actions run:15499791351
ef9ebe1bbe is described below

commit ef9ebe1bbefeb0962ee194c656ea2f9edf0bc6c7
Author: jamesfredley <[email protected]>
AuthorDate: Fri Jun 6 21:09:45 2025 +0000

    Updating apache/grails-static-website asf-site-staging branch for Github 
Actions run:15499791351
---
 community.html         |  2 +-
 foundation/minutes.xml |  2 +-
 rss.xml                |  2 +-
 sitemap.xml            | 18 -------------
 trademark-policy.html  | 71 ++------------------------------------------------
 5 files changed, 5 insertions(+), 90 deletions(-)

diff --git a/community.html b/community.html
index 5fad6957bc..8681eea32a 100644
--- a/community.html
+++ b/community.html
@@ -73,7 +73,7 @@
         <p>
             <strong>We welcome you to participate in the Apache 
Grails<sup>&reg;</sup> community. Before joining us,
                 please
-                review our <a href="community-code-of-conduct.html">Community 
Code of Conduct</a>.</strong>
+                review the <a 
href="https://www.apache.org/foundation/policies/conduct";>Apache Community Code 
of Conduct</a>.</strong>
         </p>
         <h3 class="columnheader">Grails Mailing Lists</h3>
         <div class="one-column">
diff --git a/foundation/minutes.xml b/foundation/minutes.xml
index 0d809329c2..dec18a4028 100644
--- a/foundation/minutes.xml
+++ b/foundation/minutes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><rss 
xmlns:content="http://purl.org/rss/1.0/modules/content/"; 
version="2.0"><channel><title>Foundation | Grails 
Framework</title><link>https://grails.staged.apache.org</link><description>A 
powerful Groovy-based web application framework for the JVM built on top of 
Spring Boot</description><pubDate>Fri, 06 Jun 2025 19:19:19 
GMT</pubDate><item><title>Technology Advisory Board 
Meeting</title><link>https://grails.staged.apache.org/foundation/minutes/2022 
[...]
+<?xml version="1.0" encoding="UTF-8"?><rss 
xmlns:content="http://purl.org/rss/1.0/modules/content/"; 
version="2.0"><channel><title>Foundation | Grails 
Framework</title><link>https://grails.staged.apache.org</link><description>A 
powerful Groovy-based web application framework for the JVM built on top of 
Spring Boot</description><pubDate>Fri, 06 Jun 2025 21:08:21 
GMT</pubDate><item><title>Technology Advisory Board 
Meeting</title><link>https://grails.staged.apache.org/foundation/minutes/2022 
[...]
 <h3>Meeting Attendance:</h3>
 <ul>
 <li><strong>Puneet Behl</strong> - Grails Product Development Lead at Object 
Computing</li>
diff --git a/rss.xml b/rss.xml
index cd1b2d56a5..10612df976 100644
--- a/rss.xml
+++ b/rss.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><rss 
xmlns:content="http://purl.org/rss/1.0/modules/content/"; 
version="2.0"><channel><title>Blog | Grails 
Framework</title><link>https://grails.staged.apache.org</link><description>A 
powerful Groovy-based web application framework for the JVM built on top of 
Spring Boot</description><pubDate>Fri, 06 Jun 2025 19:19:21 
GMT</pubDate><item><title>Grails 7.0.0-M3 - Release 
Announcement</title><link>https://grails.staged.apache.org/blog/2025-03-05-grails-7
 [...]
+<?xml version="1.0" encoding="UTF-8"?><rss 
xmlns:content="http://purl.org/rss/1.0/modules/content/"; 
version="2.0"><channel><title>Blog | Grails 
Framework</title><link>https://grails.staged.apache.org</link><description>A 
powerful Groovy-based web application framework for the JVM built on top of 
Spring Boot</description><pubDate>Fri, 06 Jun 2025 21:08:23 
GMT</pubDate><item><title>Grails 7.0.0-M3 - Release 
Announcement</title><link>https://grails.staged.apache.org/blog/2025-03-05-grails-7
 [...]
 <p>The Grails Foundation is excited for the release of Grails Framework 
7.0.0-M3. <br />
 We encourage you to try this pre-release and provide your feedback <a 
href="https://github.com/grails/grails-core/issues";>here</a>.</p>
 <p>The next milestone is planned to be released under the Apache Software 
Foundation as Apache Grails 7.0.0-M4.</p>
diff --git a/sitemap.xml b/sitemap.xml
index 86162f9dd6..f0cd6aee17 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -471,9 +471,6 @@
   <url>
     <loc>https://grails.staged.apache.org/casestudies/index.html</loc>
   </url>
-  <url>
-    <loc>https://grails.staged.apache.org/community-code-of-conduct.html</loc>
-  </url>
   <url>
     <loc>https://grails.staged.apache.org/community.html</loc>
   </url>
@@ -486,9 +483,6 @@
   <url>
     <loc>https://grails.staged.apache.org/faq.html</loc>
   </url>
-  <url>
-    <loc>https://grails.staged.apache.org/foundation/index.html</loc>
-  </url>
   <url>
     
<loc>https://grails.staged.apache.org/foundation/minutes/20210321-tab.html</loc>
   </url>
@@ -507,15 +501,6 @@
   <url>
     <loc>https://grails.staged.apache.org/foundation/minutes/index.html</loc>
   </url>
-  <url>
-    <loc>https://grails.staged.apache.org/foundation/sponsor-list.html</loc>
-  </url>
-  <url>
-    <loc>https://grails.staged.apache.org/foundation/sponsorship.html</loc>
-  </url>
-  <url>
-    <loc>https://grails.staged.apache.org/foundation/thank-you.html</loc>
-  </url>
   <url>
     <loc>https://grails.staged.apache.org/index.html</loc>
   </url>
@@ -525,9 +510,6 @@
   <url>
     <loc>https://grails.staged.apache.org/legacy-plugins.html</loc>
   </url>
-  <url>
-    <loc>https://grails.staged.apache.org/privacy-policy.html</loc>
-  </url>
   <url>
     <loc>https://grails.staged.apache.org/profiles.html</loc>
   </url>
diff --git a/trademark-policy.html b/trademark-policy.html
index 97a6593e64..360c213560 100644
--- a/trademark-policy.html
+++ b/trademark-policy.html
@@ -75,84 +75,17 @@
     <p>
       The word “Grails®” and all Grails logos, trade dress, images, and designs
       are proprietary assets owned by
-      <a href="https://objectcomputing.com/";>Object Computing, Inc.</a> (Object
-      Computing or OCI) and registered trademarks in various jurisdictions. Use
-      and management of Grails trademarks is overseen by Object Computing and
-      the
-      <a href="https://grails.org/foundation/index.html";>Grails Foundation</a>.
+      <a href="https://apache.org/";>Apache Software Foundation</a>
     </p>
 
     <p>
       While the Grails framework is available under an open source software
       license, that license does not include the right or license to use 
Grails®
       trademarks, except for the limited purposes described in our
-      <a href="https://objectcomputing.com/download_file/5242";
+      <a href="https://www.apache.org/foundation/marks/";
         >Trademark Policy</a
       >.
     </p>
-
-    <p>
-      Community Users, as defined in the Trademark Policy, may use Grails
-      trademarks without prior written consent, as long as they comply with the
-      Trademark Policy and Brand Guidelines.
-    </p>
-
-    <p>
-      Commercial Users, as defined in the Trademark Policy, may not use,
-      reproduce, advertise, display, publish, or transmit any Grails trademark
-      without a written license agreement between the Commercial User and 
Object
-      Computing. Commercial Users may request such a license by submitting
-      <a href="#request-form">the form below</a>.
-    </p>
-
-    <p>
-      <a
-        href="https://objectcomputing.com/download_file/5242";
-        class="download"
-        target="_blank"
-        rel="noreferrer"
-        download
-        >Download the Grails Trademark Policy and Brand Guidelines</a
-      >
-    </p>
-
-    <h2>Brand Guidelines</h2>
-
-    <p>
-      Our Trademark Policy describes trademark uses that are allowed with and
-      without written permission. The accompanying Brand Guidelines provide
-      detailed guidelines regarding how you may use Grails logos and design
-      marks in print and digital assets.
-    </p>
-
-    <p>
-      Grails trademarks may be used only in accordance with these directives.
-      All other use is prohibited.
-    </p>
-
-    <p>
-      <a
-        href="https://objectcomputing.com/download_file/5242";
-        class="download"
-        target="_blank"
-        rel="noreferrer"
-        download
-      >
-        Download the Grails Trademark Policy and Brand Guidelines</a
-      >
-    </p>
-
-    <div id="request-form"></div>
-
-    <script
-      type="text/javascript"
-      src="https://form.jotform.com/jsform/213545629411151";
-    ></script>
-
-    <p class="pre-footer">
-      For additional information about Grails trademarks, please contact
-      <a href="mailto:[email protected]";>[email protected]</a>.
-    </p>
   </article>
 </div>&nbsp;</article>
 <footer>

Reply via email to