JasperReports automatic module names updated, hopefully the ones they…

… end up using
codion-is · Jul 31, 2024 · 911044f · 911044f
1 parent f91dc0a
commit 911044f
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 14 deletions.
diff --git a/changelog.md b/changelog.md
@@ -30,6 +30,8 @@ Codion Change Log
 - SwingForeignKeyConditionModel now defaults to Operator.IN when available.
 ### is.codion.tools.generator.domain
 - DomainSource no longer adds KeyGenerator.identity() import unless it is actually used.
+### is.codion.plugin.jasperreports
+- JasperReports automatic module names updated, hopefully the ones they end up using.
 
 ## 0.18.6
 ### is.codion

diff --git a/demos/chinook/src/main/java/module-info.java b/demos/chinook/src/main/java/module-info.java
@@ -28,7 +28,7 @@
 	requires is.codion.swing.framework.ui;
 	requires is.codion.plugin.jasperreports;
 	requires is.codion.plugin.imagepanel;
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires com.formdev.flatlaf.intellijthemes;
 	requires org.kordamp.ikonli.foundation;
 

diff --git a/demos/employees/build.gradle b/demos/employees/build.gradle
@@ -33,7 +33,6 @@ dependencies {
     runtimeOnly(libs.h2)
 }
 
-apply from: "../../framework/servlet/extra-module-info-javalin.gradle"
 apply from: "../../plugins/jasperreports/extra-module-info-jasperreports.gradle"
 
 jasperreports {

diff --git a/demos/employees/src/main/java/module-info.java b/demos/employees/src/main/java/module-info.java
@@ -20,7 +20,7 @@
  * Employees demo.
  */
 module is.codion.framework.demos.employees {
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires is.codion.framework.db.http;
 	requires is.codion.framework.db.local;
 	requires is.codion.framework.db.rmi;

diff --git a/demos/manual/build.gradle b/demos/manual/build.gradle
@@ -30,7 +30,6 @@ dependencies {
 }
 
 apply from: "../../plugins/jasperreports/extra-module-info-jasperreports.gradle"
-apply from: "../../framework/servlet/extra-module-info-javalin.gradle"
 
 tasks.register("runNotesDemo", JavaExec) {
     group "application"

diff --git a/demos/manual/src/main/java/module-info.java b/demos/manual/src/main/java/module-info.java
@@ -21,7 +21,7 @@
  */
 module is.codion.framework.demos.manual {
 	requires java.desktop;
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires is.codion.common.core;
 	requires is.codion.dbms.h2;
 	requires is.codion.framework.db.local;

diff --git a/demos/world/src/main/java/module-info.java b/demos/world/src/main/java/module-info.java
@@ -25,7 +25,7 @@
 	requires is.codion.framework.json.domain;
 	requires com.formdev.flatlaf.intellijthemes;
 	requires org.kordamp.ikonli.foundation;
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires org.jfree.jfreechart;
 	requires org.jxmapviewer.jxmapviewer2;
 	requires org.json;

diff --git a/framework/servlet/build.gradle b/framework/servlet/build.gradle
@@ -24,5 +24,4 @@ dependencies {
     testRuntimeOnly(libs.h2)
 }
 
-apply from: "extra-module-info-javalin.gradle"
 apply from: "../../plugins/jasperreports/extra-module-info-jasperreports.gradle"
diff --git a/framework/servlet/extra-module-info-javalin.gradle b/framework/servlet/extra-module-info-javalin.gradle
diff --git a/plugins/jasperreports/build.gradle b/plugins/jasperreports/build.gradle
@@ -24,7 +24,6 @@ dependencies {
 }
 
 apply from: "extra-module-info-jasperreports.gradle"
-apply from: "../../framework/servlet/extra-module-info-javalin.gradle"
 
 jasperreports {
     srcDir = file("src/test/reports")

diff --git a/plugins/jasperreports/extra-module-info-jasperreports.gradle b/plugins/jasperreports/extra-module-info-jasperreports.gradle
@@ -1,6 +1,6 @@
 extraJavaModuleInfo {
-    automaticModule("net.sf.jasperreports:jasperreports", "jasperreports")
-    automaticModule("net.sf.jasperreports:jasperreports-jdt", "jasperreports.jdt")
+    automaticModule("net.sf.jasperreports:jasperreports", "net.sf.jasperreports.core")
+    automaticModule("net.sf.jasperreports:jasperreports-jdt", "net.sf.jasperreports.jdt")
     automaticModule("org.eclipse.jdt:ecj", "org.eclipse.jdt.ecj")
     automaticModule("commons-collections:commons-collections", "commons.collections")
     automaticModule("commons-digester:commons-digester", "commons.digester")

diff --git a/plugins/jasperreports/src/main/java/module-info.java b/plugins/jasperreports/src/main/java/module-info.java
@@ -24,7 +24,7 @@
  * {@link is.codion.plugin.jasperreports.JRReportType}<br>
  */
 module is.codion.plugin.jasperreports {
-	requires jasperreports;
+	requires net.sf.jasperreports.core;
 	requires is.codion.common.db;
 
 	exports is.codion.plugin.jasperreports;