More PF14 fixes

quarkiverse · Apr 19, 2024 · 9a2a96b · 9a2a96b
1 parent 880ae4c
commit 9a2a96b
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 33 deletions.
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,3 +1,3 @@
-:project-version: 3.13.11
+:project-version: 3.14.0-RC3
 
 :examples-dir: ./../examples/
diff --git a/pom.xml b/pom.xml
@@ -24,16 +24,13 @@
     <tag>HEAD</tag>
   </scm>
   <properties>
-    <quarkus.version>3.8.3</quarkus.version>
+    <quarkus.version>3.8.4</quarkus.version>
     <quarkus-poi.version>2.0.5</quarkus-poi.version>
     <quarkus-itext.version>3.0.4</quarkus-itext.version>
     <primefaces.version>14.0.0-RC3</primefaces.version>
     <primefaces-extensions.version>14.0.0-RC3</primefaces-extensions.version>
     <myfaces.version>4.0.2</myfaces.version>
-    <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <maven.compiler.release>17</maven.compiler.release>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -117,8 +114,8 @@
           <version>${quarkus.version}</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${compiler-plugin.version}</version>
           <configuration>
             <compilerArgs>
               <arg>-parameters</arg>
@@ -128,4 +125,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>
diff --git a/quarkus-primefaces-extensions/deployment/pom.xml b/quarkus-primefaces-extensions/deployment/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkiverse.primefaces</groupId>
@@ -39,8 +40,8 @@
     </dependencies>
     <build>
         <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <annotationProcessorPaths>
@@ -54,4 +55,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/quarkus-primefaces-extensions/integration-tests/pom.xml b/quarkus-primefaces-extensions/integration-tests/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkiverse.primefaces</groupId>
@@ -55,8 +56,8 @@
                     </execution>
                 </executions>
             </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
                     <execution>
@@ -66,7 +67,8 @@
                         </goals>
                         <configuration>
                             <systemPropertyVariables>
-                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner
+                                </native.image.path>
                                 <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                                 <maven.home>${maven.home}</maven.home>
                                 <quarkus.http.host>localhost</quarkus.http.host>
@@ -88,8 +90,8 @@
             </activation>
             <build>
                 <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <skipTests>${native.surefire.skip}</skipTests>

diff --git a/quarkus-primefaces-extensions/runtime/pom.xml b/quarkus-primefaces-extensions/runtime/pom.xml
@@ -86,8 +86,8 @@
                     </execution>
                 </executions>
             </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <annotationProcessorPaths>

diff --git a/quarkus-primefaces/deployment/pom.xml b/quarkus-primefaces/deployment/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkiverse.primefaces</groupId>
@@ -44,8 +45,8 @@
     </dependencies>
     <build>
         <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <annotationProcessorPaths>
@@ -59,4 +60,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/...es/deployment/src/main/java/io/quarkiverse/primefaces/deployment/PrimefacesProcessor.java b/...es/deployment/src/main/java/io/quarkiverse/primefaces/deployment/PrimefacesProcessor.java
@@ -155,8 +155,11 @@ void registerForReflection(PrimeFacesRecorder recorder, BuildProducer<Reflective
         // Exporters
         classNames.addAll(collectImplementors(combinedIndex, org.primefaces.component.export.Exporter.class.getName()));
         classNames.addAll(collectImplementors(combinedIndex, org.primefaces.component.export.ExporterOptions.class.getName()));
-        classNames.remove("org.primefaces.component.datatable.export.DataTablePDFExporter");
-        classNames.remove("org.primefaces.component.treetable.export.TreeTablePDFExporter");
+        //classNames.remove(org.primefaces.component.datatable.export.DataTablePDFExporter.class.getName());
+        //classNames.remove(org.primefaces.component.treetable.export.TreeTablePDFExporter.class.getName());
+
+        // remove in MyFaces 4.0.3
+        classNames.add("org.apache.myfaces.view.facelets.component.RepeatStatus");
 
         // method reflection
         reflectiveClass.produce(

diff --git a/quarkus-primefaces/runtime/pom.xml b/quarkus-primefaces/runtime/pom.xml
@@ -74,8 +74,8 @@
                     </execution>
                 </executions>
             </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <annotationProcessorPaths>

diff --git a/...kus-primefaces/runtime/src/main/java/io/quarkus/primefaces/runtime/PrimeFacesFeature.java b/...kus-primefaces/runtime/src/main/java/io/quarkus/primefaces/runtime/PrimeFacesFeature.java
@@ -3,8 +3,6 @@
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.krysalis.barcode4j.output.bitmap.BitmapEncoderRegistry;
-import org.primefaces.component.datatable.export.DataTablePDFExporter;
-import org.primefaces.component.treetable.export.TreeTablePDFExporter;
 
 public class PrimeFacesFeature implements Feature {
     private final static String REASON = "PrimeFaces runtime initialization";
@@ -13,13 +11,12 @@ public class PrimeFacesFeature implements Feature {
     public void afterRegistration(AfterRegistrationAccess access) {
         // Barcode component is optional but must register this for native mode since it uses AWT
         RuntimeClassInitialization.initializeAtRunTime(BitmapEncoderRegistry.class.getName());
-        //Exporters
-        RuntimeClassInitialization.initializeAtRunTime(DataTablePDFExporter.class.getName());
-        RuntimeClassInitialization.initializeAtRunTime(TreeTablePDFExporter.class.getName());
+        // Charts.js uses SecureRandom
+        RuntimeClassInitialization.initializeAtRunTime("software.xdev.chartjs.model.color.Color");
     }
 
     @Override
     public String getDescription() {
         return REASON;
     }
-}
+}