From 1393ba54dccfdd99383cfff5fbfcd3ea371448ce Mon Sep 17 00:00:00 2001
From: Ivan <iponomarev@mail.ru>
Date: Sat, 5 Apr 2025 15:39:52 +0100
Subject: [PATCH 1/6] add diagnostics

---
 .github/workflows/javac.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/javac.yml

diff --git a/.github/workflows/javac.yml b/.github/workflows/javac.yml
new file mode 100644
index 0000000000..0a74c56dcc
--- /dev/null
+++ b/.github/workflows/javac.yml
@@ -0,0 +1,34 @@
+name: Build and Upload Generated Sources
+
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v2
+
+      - name: Set up Java 11 (Temurin)
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Run Maven javac goal
+        run: mvn javac:javac
+
+      - name: Zip generated sources
+        run: |
+          zip -r generated-sources.zip elesta-core/target/generated-sources
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: generated-sources
+          path: generated-sources.zip

From f436cf61189182172b888756dd2798f17668892b Mon Sep 17 00:00:00 2001
From: Ivan <iponomarev@mail.ru>
Date: Sat, 5 Apr 2025 15:41:25 +0100
Subject: [PATCH 2/6] update

---
 .github/workflows/javac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javac.yml b/.github/workflows/javac.yml
index 0a74c56dcc..64c0ff8eba 100644
--- a/.github/workflows/javac.yml
+++ b/.github/workflows/javac.yml
@@ -28,7 +28,7 @@ jobs:
           zip -r generated-sources.zip elesta-core/target/generated-sources
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: generated-sources
           path: generated-sources.zip

From 11274d667dfa0d90a01f117213084cdb639afef0 Mon Sep 17 00:00:00 2001
From: Ivan <iponomarev@mail.ru>
Date: Sat, 5 Apr 2025 21:28:22 +0100
Subject: [PATCH 3/6] javacc

---
 .github/workflows/javac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javac.yml b/.github/workflows/javac.yml
index 64c0ff8eba..b44226530f 100644
--- a/.github/workflows/javac.yml
+++ b/.github/workflows/javac.yml
@@ -21,7 +21,7 @@ jobs:
           java-version: 11
 
       - name: Run Maven javac goal
-        run: mvn javac:javac
+        run: mvn javacc:javacc
 
       - name: Zip generated sources
         run: |

From b474d4e09ed7fd105d4131d976dcd41defc23c48 Mon Sep 17 00:00:00 2001
From: Ivan <iponomarev@mail.ru>
Date: Sat, 5 Apr 2025 21:31:46 +0100
Subject: [PATCH 4/6] fix typo

---
 .github/workflows/javac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javac.yml b/.github/workflows/javac.yml
index b44226530f..40344ad6f4 100644
--- a/.github/workflows/javac.yml
+++ b/.github/workflows/javac.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Zip generated sources
         run: |
-          zip -r generated-sources.zip elesta-core/target/generated-sources
+          zip -r generated-sources.zip celesta-core/target/generated-sources
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

From 8755586c8dcd5903c08b8b19ace1e92a46a8c56a Mon Sep 17 00:00:00 2001
From: Ivan <iponomarev@mail.ru>
Date: Sat, 5 Apr 2025 22:06:05 +0100
Subject: [PATCH 5/6] separate executions

---
 celesta-core/pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/celesta-core/pom.xml b/celesta-core/pom.xml
index 94c8a702cf..02abac1f7f 100644
--- a/celesta-core/pom.xml
+++ b/celesta-core/pom.xml
@@ -59,16 +59,27 @@
                 <artifactId>javacc-maven-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>Build CelestaSQL parser</id>
                         <goals>
                             <goal>javacc</goal>
                         </goals>
                         <configuration>
                             <includes>
-                                <include>FilterParser.jj</include>
                                 <include>CelestaParser.jj</include>
                             </includes>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>Build Filter parser</id>
+                        <goals>
+                            <goal>javacc</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>FilterParser.jj</include>
+                            </includes>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

From 72e3b5e3b233adaf6e6b419b5ce90b1d9149dbad Mon Sep 17 00:00:00 2001
From: Ivan <iponomarev@mail.ru>
Date: Sat, 5 Apr 2025 22:14:06 +0100
Subject: [PATCH 6/6] remove diagnostics & update javacc plugin

---
 .github/workflows/javac.yml | 34 ----------------------------------
 pom.xml                     |  2 +-
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 .github/workflows/javac.yml

diff --git a/.github/workflows/javac.yml b/.github/workflows/javac.yml
deleted file mode 100644
index 40344ad6f4..0000000000
--- a/.github/workflows/javac.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Build and Upload Generated Sources
-
-on:
-  push:
-    branches: [ "dev" ]
-  pull_request:
-    branches: [ "dev" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      - name: Set up Java 11 (Temurin)
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-
-      - name: Run Maven javac goal
-        run: mvn javacc:javacc
-
-      - name: Zip generated sources
-        run: |
-          zip -r generated-sources.zip celesta-core/target/generated-sources
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: generated-sources
-          path: generated-sources.zip
diff --git a/pom.xml b/pom.xml
index 7fa663d6e0..442a423f9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
         <!--plugin versions -->
         <spotbugs.maven.plugin.version>4.8.6.6</spotbugs.maven.plugin.version>
         <jacoco.version>0.8.12</jacoco.version>
-        <javacc.maven.plugin.version>3.1.0</javacc.maven.plugin.version>
+        <javacc.maven.plugin.version>3.1.1</javacc.maven.plugin.version>
         <maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
         <maven.checkstyle.plugin.version>3.6.0</maven.checkstyle.plugin.version>
         <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>