Merge pull request #811 from volosied/MYFACES-4692-5.0

Fix Myfaces 4692: ActionSource / ActionSource2 API [5.0]
apache · Nov 22, 2024 · 535b157 · 535b157
2 parents 8a6d0bb + 851d274
commit 535b157
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -138,6 +138,9 @@
                 <artifactId>myfaces-builder-plugin</artifactId>
                 <executions>
                     <execution>
+                        <configuration>
+                            <excludes>**/src/main/java/jakarta/faces/component/ActionSource.java</excludes>
+                        </configuration>
                         <goals>
                             <goal>build-metadata</goal>
                         </goals>
@@ -147,6 +150,7 @@
                         <configuration>
                             <jsfVersion>20</jsfVersion>
                             <templateComponentName>componentClass20.vm</templateComponentName>
+                            <excludes>**/src/main/java/jakarta/faces/component/ActionSource.java</excludes>
                         </configuration>
                         <goals>
                             <goal>make-components</goal>

diff --git a/api/src/main/java/jakarta/faces/component/ActionSource.java b/api/src/main/java/jakarta/faces/component/ActionSource.java
@@ -35,7 +35,13 @@ public interface ActionSource
 
     public void removeActionListener(jakarta.faces.event.ActionListener listener);
 
-    public MethodExpression getActionExpression();
-
-    public void setActionExpression(MethodExpression action);
+    default MethodExpression getActionExpression()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    default void setActionExpression(MethodExpression action)
+    {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/api/src/main/java/jakarta/faces/component/ActionSource2.java b/api/src/main/java/jakarta/faces/component/ActionSource2.java
@@ -19,11 +19,15 @@
 
 package jakarta.faces.component;
 
+import jakarta.el.MethodExpression;
+
 /**
  * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
  */
 @Deprecated(since = "4.1", forRemoval = true)
 public interface ActionSource2 extends ActionSource
 {
+    MethodExpression getActionExpression();
 
+    void setActionExpression(MethodExpression action);
 }
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -169,6 +169,7 @@
                         <configuration>
                             <jsfVersion>20</jsfVersion>
                             <templateComponentName>componentClass20.vm</templateComponentName>
+                            <excludes>**/package.html</excludes>
                         </configuration>
                         <goals>
                             <goal>make-components</goal>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -187,7 +187,7 @@
                 <plugin>
                     <groupId>org.apache.myfaces.buildtools</groupId>
                     <artifactId>myfaces-builder-plugin</artifactId>
-                    <version>1.0.11</version>
+                    <version>1.0.12</version>
                 </plugin>
 
                 <plugin>