You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2022/12/06 12:45:59 UTC

[commons-jexl] branch master updated: JEXL-389: patch Javacc generated class to use a static member;

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

henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
     new 5ea2b474 JEXL-389: patch Javacc generated class to use a static member;
     new e3cf7b83 Merge remote-tracking branch 'origin/master'
5ea2b474 is described below

commit 5ea2b474c3992dfe32cbc81297e930b70b9406da
Author: henrib <he...@apache.org>
AuthorDate: Tue Dec 6 13:45:52 2022 +0100

    JEXL-389: patch Javacc generated class to use a static member;
---
 pom.xml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5e6de17..b579f473 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,8 @@
         <checkstyle.version>10.5.0</checkstyle.version>
         <japicmp.skip>false</japicmp.skip>
         <commons.japicmp.version>0.17.1</commons.japicmp.version>
-
-        <!-- spotbugs 4.7.2 issue #2174 generates lots of garbage during analysis -->
-
         <commons.pmd.version>3.19.0</commons.pmd.version>
         <commons.pmd-impl.version>6.52.0</commons.pmd-impl.version>
-
         <commons.spotbugs.version>4.7.3.0</commons.spotbugs.version>
         <commons.junit.version>5.9.1</commons.junit.version>
 
@@ -188,6 +184,29 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <!-- change an exception used for signaling to be static -->
+                                <replaceregexp
+                                        file="target/generated-sources/java/org/apache/commons/jexl3/parser/Parser.java"
+                                        byline="true"
+                                        match="private final LookaheadSuccess jj_ls ="
+                                        replace="private static final LookaheadSuccess jj_ls ="/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>