diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index eb4864a4a2..3660c8c871 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -125,6 +125,14 @@ Import-Package: com.google.zxing,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.osgi.framework.console;version="1.1.0",
  org.eclipse.osgi.service.datalocation,
+ org.jfree.chart;version="[1.0.19,1.0.19]",
+ org.jfree.chart.axis;version="[1.0.19,1.0.19]",
+ org.jfree.chart.plot;version="[1.0.19,1.0.19]",
+ org.jfree.chart.renderer.category;version="[1.0.19,1.0.19]",
+ org.jfree.data.category;version="[1.0.19,1.0.19]",
+ org.jfree.data.general;version="[1.0.19,1.0.19]",
+ org.jfree.data.time;version="[1.0.19,1.0.19]",
+ org.jfree.data.xy;version="[1.0.19,1.0.19]",
  org.krysalis.barcode4j;version="2.1.0",
  org.krysalis.barcode4j.impl;version="2.1.0",
  org.krysalis.barcode4j.impl.upcean;version="2.1.0",
@@ -166,7 +174,7 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  wrapped.org.apache.poi.poi-ooxml;bundle-version="4.1.2",
  wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0",
  wrapped.org.jfree.jcommon;bundle-version="1.0.24",
- wrapped.org.jfree.jfreechart;bundle-version="1.5.3",
+ wrapped.org.jfree.jfreechart;bundle-version="[1.0.19,1.0.19]",
  wrapped.com.google.http-client.google-http-client-gson;bundle-version="1.39.2",
  wrapped.com.google.zxing.javase;bundle-version="3.4.1",
  wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1",
diff --git a/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java b/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java
index 03899472d0..b7bbd9eac8 100644
--- a/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java
+++ b/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java
@@ -153,7 +153,6 @@ public class ChartBuilder {
 		}
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void addData(MChartDatasource ds) {
 		
 		String value = ds.getValueColumn();
@@ -370,7 +369,6 @@ public class ChartBuilder {
 		return (IntervalXYDataset) dataset;
 	}
 
-	@SuppressWarnings("rawtypes")
 	public PieDataset getPieDataset() {
 		dataset = new DefaultPieDataset();
 		loadData();
diff --git a/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java b/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java
index 2a10b2bb30..2f8263974b 100644
--- a/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java
+++ b/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java
@@ -45,7 +45,6 @@ public class GraphBuilder {
 	protected String		m_Y_AxisLabel = "Y Axis";
 	protected DefaultCategoryDataset dataset = new DefaultCategoryDataset();
 	protected DefaultCategoryDataset linearDataset = new DefaultCategoryDataset();
-	@SuppressWarnings("rawtypes")
 	protected DefaultPieDataset pieDataset = new DefaultPieDataset();
 
 	private static final CLogger log = CLogger.getCLogger(GraphBuilder.class);
@@ -251,7 +250,6 @@ public class GraphBuilder {
 		return list;
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void loadDataSet(List<GraphColumn> list) {
 		pieDataset = new DefaultPieDataset();
 		dataset = new DefaultCategoryDataset();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
index b26b0deb76..52d45efb33 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
@@ -329,7 +329,6 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
 		}
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private void syncModel() {
 		Hashtable<String,BigDecimal> ht = new Hashtable<String,BigDecimal>();
 		
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index df6a40fdb4..70ead9efd4 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1139,7 +1139,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
-      <version>1.5.3</version>
+      <version>1.0.19</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index b1ed58ee9e..e36b471496 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="idempiere-220525" sequenceNumber="1653486593">
+<target name="idempiere-220825" sequenceNumber="1661415971">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="zcommon" version="9.6.2"/>
@@ -1279,7 +1279,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
-      <version>1.5.3</version>
+      <version>1.0.19</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index 6ebc348271..364fb4501e 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -1,5 +1,5 @@
 
-target "idempiere-220525"
+target "idempiere-220825"
 
 with source configurePhase allEnvironments