From a178667038e8136c6bed50419cbc3aa2a1b862c9 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Wed, 24 Jan 2024 08:41:24 -0300
Subject: [PATCH 1/3] FISH-8216 : codehaus.mojo replaced by omnifaces as in
 Glassfish

---
 appserver/persistence/cmp/support-ejb/pom.xml      | 2 +-
 appserver/persistence/cmp/support-sqlstore/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appserver/persistence/cmp/support-ejb/pom.xml b/appserver/persistence/cmp/support-ejb/pom.xml
index bedf9682e05..c7b5043042f 100644
--- a/appserver/persistence/cmp/support-ejb/pom.xml
+++ b/appserver/persistence/cmp/support-ejb/pom.xml
@@ -81,7 +81,7 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.omnifaces</groupId>
                 <artifactId>antlr-maven-plugin</artifactId>
                 <configuration>
                     <grammars>EJBQL.g, JDOQLCodeGeneration.g, Semantic.g</grammars>
diff --git a/appserver/persistence/cmp/support-sqlstore/pom.xml b/appserver/persistence/cmp/support-sqlstore/pom.xml
index d1909ea7da1..4b04d36c29b 100644
--- a/appserver/persistence/cmp/support-sqlstore/pom.xml
+++ b/appserver/persistence/cmp/support-sqlstore/pom.xml
@@ -82,7 +82,7 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.omnifaces</groupId>
                 <artifactId>antlr-maven-plugin</artifactId>
                 <configuration>
                     <grammars>JQL.g, Semantic.g, Optimizer.g, CodeGeneration.g</grammars>

From 8e34e2ce8dd7ae53e2260fdc61541cc25051a3e4 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Tue, 30 Jan 2024 15:14:05 -0300
Subject: [PATCH 2/3] FISH-8216 : copyright years updated

---
 appserver/persistence/cmp/support-ejb/pom.xml      | 2 +-
 appserver/persistence/cmp/support-sqlstore/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appserver/persistence/cmp/support-ejb/pom.xml b/appserver/persistence/cmp/support-ejb/pom.xml
index c7b5043042f..2eed5d681f0 100644
--- a/appserver/persistence/cmp/support-ejb/pom.xml
+++ b/appserver/persistence/cmp/support-ejb/pom.xml
@@ -39,7 +39,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portion Copyright 2022 Payara Foundation and/or affiliates
+    Portion Copyright [2022-2024] Payara Foundation and/or affiliates
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/appserver/persistence/cmp/support-sqlstore/pom.xml b/appserver/persistence/cmp/support-sqlstore/pom.xml
index 4b04d36c29b..b83b9159aea 100644
--- a/appserver/persistence/cmp/support-sqlstore/pom.xml
+++ b/appserver/persistence/cmp/support-sqlstore/pom.xml
@@ -39,7 +39,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portion Copyright [2018-2022] Payara Foundation and/or affiliates
+    Portion Copyright [2018-2024] Payara Foundation and/or affiliates
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

From 1c976b125f337c626bff2ae23c2331c68873e891 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Tue, 30 Jan 2024 15:47:13 -0300
Subject: [PATCH 3/3] FISH-8216 : codehaus replaced by omnifaces on parent and
 nucleus

---
 core/core-parent/pom.xml | 4 ++--
 nucleus/pom.xml          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/core-parent/pom.xml b/core/core-parent/pom.xml
index a6e105b00bc..8a3a460aa1a 100644
--- a/core/core-parent/pom.xml
+++ b/core/core-parent/pom.xml
@@ -3,7 +3,7 @@
   ~
   ~  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   ~
-  ~  Copyright (c) 2011-2023 Payara Foundation and/or its affiliates. All rights reserved.
+  ~  Copyright (c) 2011-2024 Payara Foundation and/or its affiliates. All rights reserved.
   ~
   ~  The contents of this file are subject to the terms of either the GNU
   ~  General Public License Version 2 only ("GPL") or the Common Development
@@ -575,7 +575,7 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
+                    <groupId>org.omnifaces</groupId>
                     <artifactId>antlr-maven-plugin</artifactId>
                     <version>${maven.antlr.plugin.version}</version>
                 </plugin>
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index 5e5ee03d770..4f3fd3da1cf 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright 2016-2023 Payara Foundation and/or its affiliates -->
+<!-- Portions Copyright 2016-2024 Payara Foundation and/or its affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,7 @@
         <maven.war.plugin.version>3.3.2</maven.war.plugin.version>
         <maven.makepkgs.plugin.version>0.6.2</maven.makepkgs.plugin.version>
         <maven.jaxb2.plugin.version>0.15.1</maven.jaxb2.plugin.version>
-        <maven.antlr.plugin.version>2.2</maven.antlr.plugin.version>
+        <maven.antlr.plugin.version>2.4</maven.antlr.plugin.version>
 
         <maven.jaxws.plugin.version>2.6</maven.jaxws.plugin.version>
         <maven.apt.plugin.version>1.0-alpha-5</maven.apt.plugin.version>
@@ -344,7 +344,7 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
+                    <groupId>org.omnifaces</groupId>
                     <artifactId>antlr-maven-plugin</artifactId>
                     <version>${maven.antlr.plugin.version}</version>
                 </plugin>