Skip to content

Commit

Permalink
Merge branch 'master' into fix-11640
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rapster
Rapster authored Sep 8, 2024
2 parents 9e45a82 + a6228f8 commit a447c29
Show file tree
Hide file tree
Showing 21 changed files with 329 additions and 444 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ jobs:
uses: actions/upload-artifact@v4
if: always()
with:
name: failed_tests_screenshots_java${{ matrix.java }}_${{ matrix.facesimpl }}
name: failed_tests_screenshots_java${{ matrix.java }}_${{ matrix.profile }}
if-no-files-found: ignore
path: /tmp/pf_it/
2 changes: 1 addition & 1 deletion docs/14_0_0/components/chart.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public void createLineModel() {
.addDataset(new LineDataset()
.setData(65, 59, 80, 81, 56, 55, 40)
.setLabel("My First Dataset")
.setBorderColor(new Color(75, 192, 192))
.setBorderColor(new RGBAColor(75, 192, 192))
.setLineTension(0.1f)
.setFill(new Fill<Boolean>(false)))
.setLabels("January", "February", "March", "April", "May", "June", "July"))
Expand Down
2 changes: 1 addition & 1 deletion docs/15_0_0/components/chart.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public void createLineModel() {
.addDataset(new LineDataset()
.setData(65, 59, 80, 81, 56, 55, 40)
.setLabel("My First Dataset")
.setBorderColor(new Color(75, 192, 192))
.setBorderColor(new RGBAColor(75, 192, 192))
.setLineTension(0.1f)
.setFill(new Fill<Boolean>(false)))
.setLabels("January", "February", "March", "April", "May", "June", "July"))
Expand Down
2 changes: 1 addition & 1 deletion docs/15_0_0/core/thirdpartylibs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ are many other third party libraries and plugins used to support features.
| [jQuery Rangy](../jsdocs/modules/src_PrimeFaces.JQueryRangy.html) | 1.2.0 | https://github.com/timdown/rangyinputs |
| [jQuery Timepicker Addon](../jsdocs/interfaces/src_PrimeFaces.JQuery-1.html#timepicker) | 1.6.3 | http://trentrichardson.com/examples/timepicker |
| [jQuery UI Touch Punch](../jsdocs/interfaces/src_PrimeFaces.JQuery-1.html#touchpunch) | 1.1.5 | https://github.com/RWAP/jquery-ui-touch-punch |
| [jQuery UI](../jsdocs/modules/node_modules__types_jqueryui.html) | 1.13.3 | https://github.com/jquery/jquery-ui |
| [jQuery UI](../jsdocs/modules/node_modules__types_jqueryui.html) | 1.14.0 | https://github.com/jquery/jquery-ui |
| [jQuery](../jsdocs/interfaces/src_PrimeFaces.JQuery-1.html) | 4.0.0 | https://jquery.com/ |
| [jScrollPane](../jsdocs/interfaces/src_PrimeFaces.JQuery-1.html#jScrollPane) | 2.2.3 | https://github.com/vitch/jScrollPane |
| [JSPlumb Diagram](../jsdocs/modules/node_modules_jsplumb.export_.html) | 2.15.6 | https://github.com/jsplumb/jsplumb |
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<version>3.10.0</version>
<configuration>
<sourcepath>${basedir}/src/main/java;</sourcepath>
<doclint>none</doclint>
Expand Down Expand Up @@ -188,13 +188,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>

<plugin>
Expand Down
6 changes: 3 additions & 3 deletions primefaces-integration-tests-jakarta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- dependency versions -->
<lombok.version>1.18.34</lombok.version>
<tomcat.version>10.1.28</tomcat.version>
<jetty.version>9.4.55.v20240627</jetty.version>
<jetty.version>9.4.56.v20240826</jetty.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-core</artifactId>
<version>5.1.2.Final</version>
<version>5.1.3.Final</version>
<exclusions>
<exclusion>
<groupId>jakarta.el</groupId>
Expand All @@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.16.0</version>
<version>3.17.0</version>
<scope>runtime</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions primefaces-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<tomcat.version>9.0.93</tomcat.version>
<resteasy.version>5.0.9.Final</resteasy.version>
<owb.version>2.0.27</owb.version>
<jetty.version>9.4.55.v20240627</jetty.version>
<jetty.version>9.4.56.v20240826</jetty.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -216,7 +216,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.16.0</version>
<version>3.17.0</version>
<scope>runtime</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions primefaces-selenium/primefaces-selenium-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.23.1</version>
<version>4.24.0</version>
</dependency>

<!-- org.seleniumhq.selenium and com.googlecode.owasp-java-html-sanitizer need guava; resolved version-conflicts -->
Expand All @@ -69,7 +69,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.15.0</version>
<version>1.15.1</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions primefaces-showcase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<mojarra.version>4.0.7</mojarra.version>
<myfaces.version>4.0.2</myfaces.version>
<resteasy.version>6.2.8.Final</resteasy.version>
<jetty.version>12.0.12</jetty.version>
<weld.version>5.1.2.Final</weld.version>
<jetty.version>12.0.13</jetty.version>
<weld.version>5.1.3.Final</weld.version>
<jsf.project.stage>Production</jsf.project.stage>
</properties>

Expand Down Expand Up @@ -143,7 +143,7 @@
<dependency>
<groupId>software.xdev</groupId>
<artifactId>chartjs-java-model</artifactId>
<version>2.0.1</version>
<version>2.2.0</version>
</dependency>

<!-- Conflict with resteasy-jackson2-provider -->
Expand Down
77 changes: 39 additions & 38 deletions primefaces-showcase/src/main/java/org/primefaces/showcase/view/chartjs/ChartView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@
import java.math.BigDecimal;
import java.util.List;

import org.primefaces.event.ItemSelectEvent;

import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
import jakarta.inject.Named;

import org.primefaces.event.ItemSelectEvent;

import software.xdev.chartjs.model.charts.*;
import software.xdev.chartjs.model.color.Color;
import software.xdev.chartjs.model.color.RGBAColor;
import software.xdev.chartjs.model.data.*;
import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
import software.xdev.chartjs.model.datapoint.ScatterDataPoint;
Expand Down Expand Up @@ -93,7 +94,7 @@ private void createPieModel() {
.addDataset(new PieDataset()
.setData(BigDecimal.valueOf(300), BigDecimal.valueOf(50), BigDecimal.valueOf(100))
.setLabel("My First Dataset")
.addBackgroundColors(new Color(255, 99, 132), new Color(54, 162, 235), new Color(255, 205, 86))
.addBackgroundColors(new RGBAColor(255, 99, 132), new RGBAColor(54, 162, 235), new RGBAColor(255, 205, 86))
)
.setLabels("Red", "Blue", "Yellow"))
.toJson();
Expand All @@ -110,11 +111,11 @@ private void createPolarAreaModel() {
BigDecimal.valueOf(14))
.setLabel("My First Dataset")
.addBackgroundColors(
new Color(255, 99, 132),
new Color(75, 192, 192),
new Color(255, 205, 86),
new Color(201, 203, 207),
new Color(54, 162, 235)
new RGBAColor(255, 99, 132),
new RGBAColor(75, 192, 192),
new RGBAColor(255, 205, 86),
new RGBAColor(201, 203, 207),
new RGBAColor(54, 162, 235)
)
)
.setLabels("Red", "Green", "Yellow", "Grey", "Blue" ))
Expand All @@ -127,7 +128,7 @@ public void createLineModel() {
.addDataset(new LineDataset()
.setData(65, 59, 80, 81, 56, 55, 40)
.setLabel("My First Dataset")
.setBorderColor(new Color(75, 192, 192))
.setBorderColor(new RGBAColor(75, 192, 192))
.setLineTension(0.1f)
.setFill(new Fill<Boolean>(false)))
.setLabels("January", "February", "March", "April", "May", "June", "July"))
Expand All @@ -153,7 +154,7 @@ public void createScatterModel() {
.addData(new ScatterDataPoint(13, 7))
.addData(new ScatterDataPoint(6, 9))
.setLabel("Red Dataset")
.setBorderColor(new Color(249, 24, 24))
.setBorderColor(new RGBAColor(249, 24, 24))
.setShowLine(Boolean.FALSE)
.setFill(new Fill<Boolean>(true)))
)
Expand Down Expand Up @@ -206,21 +207,21 @@ public void createBarModel() {
.addDataset(new BarDataset()
.setData(65, 59, 80, 81, 56, 55, 40)
.setLabel("My First Dataset")
.setBackgroundColor(new Color(255, 99, 132, 0.2))
.setBorderColor(new Color(255, 99, 132))
.setBackgroundColor(new RGBAColor(255, 99, 132, 0.2))
.setBorderColor(new RGBAColor(255, 99, 132))
.setBorderWidth(1))
.addDataset(new BarDataset()
.setData(85, 69, 20, 51, 76, 75, 10)
.setLabel("My Second Dataset")
.setBackgroundColor(new Color(255, 159, 64, 0.2))
.setBorderColor(new Color(255, 159, 64))
.setBackgroundColor(new RGBAColor(255, 159, 64, 0.2))
.setBorderColor(new RGBAColor(255, 159, 64))
.setBorderWidth(1)
)
.setLabels("January", "February", "March", "April", "May", "June", "July"))
.setOptions(new BarOptions()
.setResponsive(true)
.setMaintainAspectRatio(false)
.setIndexAxis(BarOptions.IndexAxis.X)
.setIndexAxis(IndexAxis.X)
.setScales(new Scales().addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions()
.setStacked(false)
.setTicks(new CartesianTickOptions()
Expand All @@ -240,15 +241,15 @@ public void createStackedBarModel() {
.addDataset(new BarDataset()
.setData(62, -58, -49, 25, 4, 77, -41)
.setLabel("Dataset 1")
.setBackgroundColor(new Color(255, 99, 132)))
.setBackgroundColor(new RGBAColor(255, 99, 132)))
.addDataset(new BarDataset()
.setData(-1, 32, -52, 11, 97, 76, -78)
.setLabel("Dataset 2")
.setBackgroundColor(new Color(54, 162, 235)))
.setBackgroundColor(new RGBAColor(54, 162, 235)))
.addDataset(new BarDataset()
.setData(-44, 25, 15, 92, 80, -25, -11)
.setLabel("Dataset 3")
.setBackgroundColor(new Color(75, 192, 192)))
.setBackgroundColor(new RGBAColor(75, 192, 192)))
.setLabels("January", "February", "March", "April", "May", "June", "July"))
.setOptions(new BarOptions()
.setResponsive(true)
Expand Down Expand Up @@ -280,13 +281,13 @@ public void createRadarModel() {
BigDecimal.valueOf(3))
.setLabel("P.Practitioner")
.setLineTension(0.1f)
.setBackgroundColor(new Color(102, 153, 204, 0.2))
.setBorderColor(new Color(102, 153, 204, 1))
.setPointBackgroundColor(List.of(new Color(102, 153, 204, 1)))
.setPointBorderColor(List.of(Color.WHITE))
.setBackgroundColor(new RGBAColor(102, 153, 204, 0.2))
.setBorderColor(new RGBAColor(102, 153, 204, 1))
.setPointBackgroundColor(List.of(new RGBAColor(102, 153, 204, 1)))
.setPointBorderColor(List.of(RGBAColor.WHITE))
.setPointHoverRadius(List.of(5))
.setPointHoverBackgroundColor(List.of(Color.WHITE))
.setPointHoverBorderColor(List.of(new Color(102, 153, 204, 1))))
.setPointHoverBackgroundColor(List.of(RGBAColor.WHITE))
.setPointHoverBorderColor(List.of(new RGBAColor(102, 153, 204, 1))))
.addDataset(new RadarDataset()
.setData(BigDecimal.valueOf(2.1),
BigDecimal.valueOf(3),
Expand All @@ -295,13 +296,13 @@ public void createRadarModel() {
BigDecimal.valueOf(3))
.setLabel("P.Manager")
.setLineTension(0.1f)
.setBackgroundColor(new Color(255, 204, 102, 0.2))
.setBorderColor(new Color(255, 204, 102, 1))
.setPointBackgroundColor(List.of(new Color(255, 204, 102, 1)))
.setPointBorderColor(List.of(Color.WHITE))
.setBackgroundColor(new RGBAColor(255, 204, 102, 0.2))
.setBorderColor(new RGBAColor(255, 204, 102, 1))
.setPointBackgroundColor(List.of(new RGBAColor(255, 204, 102, 1)))
.setPointBorderColor(List.of(RGBAColor.WHITE))
.setPointHoverRadius(List.of(5))
.setPointHoverBackgroundColor(List.of(Color.WHITE))
.setPointHoverBorderColor(List.of(new Color(255, 204, 102, 1))))
.setPointHoverBackgroundColor(List.of(RGBAColor.WHITE))
.setPointHoverBorderColor(List.of(new RGBAColor(255, 204, 102, 1))))
.setLabels("Process Excellence", "Problem Solving", "Facilitation", "Project Mgmt", "Change Mgmt"))
.setOptions(new RadarOptions()
.setResponsive(true)
Expand All @@ -310,12 +311,12 @@ public void createRadarModel() {
.setAngleLines(new AngleLines()
.setDisplay(Boolean.TRUE)
.setLineWidth(BigDecimal.valueOf(0.5))
.setColor(new Color(128, 128, 128, 0.2)))
.setColor(new RGBAColor(128, 128, 128, 0.2)))
.setPointLabels(new PointLabels().setFont(new Font()
.setSize(BigDecimal.valueOf(14))
.setStyle(FontStyle.NORMAL)
.setFamily("Lato, sans-serif"))
.setColor(new Color(204, 204, 204, 1)))
.setColor(new RGBAColor(204, 204, 204, 1)))
.setTicks(new RadialTickOptions()
.setDisplay(false)
.setStepSize(BigDecimal.valueOf(0.2))
Expand All @@ -336,8 +337,8 @@ public void createBubbleModel() {
.addData(new BubbleDataPoint(BigDecimal.valueOf(20), BigDecimal.valueOf(30), BigDecimal.valueOf(15)))
.addData(new BubbleDataPoint(BigDecimal.valueOf(40), BigDecimal.valueOf(10), BigDecimal.valueOf(10)))
.setLabel("My First Dataset")
.setBackgroundColor(new Color(255, 99, 132))
.setBorderColor(new Color(255, 99, 132))
.setBackgroundColor(new RGBAColor(255, 99, 132))
.setBorderColor(new RGBAColor(255, 99, 132))
)).toJson();
}

Expand All @@ -349,9 +350,9 @@ public void createDonutModel() {
BigDecimal.valueOf(50),
BigDecimal.valueOf(100))
.addBackgroundColors(
new Color(255, 99, 132),
new Color(54, 162, 235),
new Color(255, 205, 86))
new RGBAColor(255, 99, 132),
new RGBAColor(54, 162, 235),
new RGBAColor(255, 205, 86))
)
.setLabels("Red", "Blue", "Yellow"))
.setOptions(new DoughnutOptions().setMaintainAspectRatio(Boolean.FALSE))
Expand Down
4 changes: 2 additions & 2 deletions primefaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<minify.disabled>true</minify.disabled>
<jakarta.jar.skip>false</jakarta.jar.skip>
<resources.dir.compressed>${project.build.directory}/classes/META-INF/resources/primefaces</resources.dir.compressed>
<mockito.version>5.12.0</mockito.version>
<mockito.version>5.13.0</mockito.version>
<sonar.sources>src/main/java,src/main/resources</sonar.sources>
</properties>

Expand Down Expand Up @@ -1277,7 +1277,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 2 additions & 0 deletions primefaces/src/main/java/org/primefaces/component/autoupdate/AutoUpdateListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
*/
public class AutoUpdateListener implements ComponentSystemEventListener, Serializable {

private static final long serialVersionUID = 1L;

private static final String COMPONENT_CLIENT_IDS = AutoUpdateListener.class.getName() + ".COMPONENT_CLIENT_IDS";

private static final AutoUpdateListener INSTANCE = new AutoUpdateListener();
Expand Down
Loading

0 comments on commit a447c29

Please sign in to comment.