Merge pull request #2 from xdev-software/develop

1.0.0

.run/Run Demo.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
-    <module name="standard-maven-template-demo" />
+    <module name="dynamicreports-core-for-grid-exporter-demo" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>
@@ -13,4 +13,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>

CHANGELOG.md

@@ -0,0 +1,24 @@
+# 1.0.0
+
+Initial release of the fork
+
+## Differences to [dynamicreports/dynamicreports-core](https://github.com/dynamicreports/dynamicreports/tree/f7d73961462f3f13cbc27c91df90d4cc3ccc669e/dynamicreports-core)
+* Renamed ``net.sf.dynamicreports`` to ``software.xdev.dynamicreports`` to prevent conflicts with existing installations
+* Dependency shedding
+  * Removed [``Defaults``](./src/main/java/software/xdev/dynamicreports/report/defaults/Defaults.java)-XML subsystem; can be supplied manually to the builder or using [Java Service Loading](https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html)
+    * ``jakarta.xml.bind:jakarta.xml.bind-api``
+    * ``org.glassfish.jaxb:jaxb-runtime``
+  * Removed barcode subsystem
+    * ``net.sf.barcode4j:barcode4j``
+    * ``com.google.zxing:core``
+    * ``net.sourceforge.barbecue:barbecue``
+  * Removed charts subsystem
+  * Removed boolean to image subsystem
+    * ``org.apache.xmlgraphics:batik-bridge``
+  * Dropped support for ``XLS`` as the required dependency was never shipped
+    * ``XLSX`` still works as expected
+  * Removed ``org.apache.commons:commons-text`` as it was only used on a single unused line of code
+* Removed XML subsystem as XML exports were never producing valid XML
+* Removed half-way implemented Image subsystem as it is unused
+* Updated dependencies to lastest versions
+* Fixed compile errors

CONTRIBUTING.md

@@ -34,10 +34,10 @@ You should have the following things installed:
   * Ensure that the JDK/Java-Version is correct
 
 
-## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/release.yml?branch=master)](https://github.com/xdev-software/standard-maven-template/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/dynamicreports-core-for-grid-exporter/release.yml?branch=master)](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/standard-maven-template/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Consider doing a [test-deployment](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

README.md

@@ -1,12 +1,14 @@
-[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/standard-maven-template)
-[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/standard-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_standard-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_standard-maven-template)
+[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/dynamicreports-core-for-grid-exporter?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/dynamicreports-core-for-grid-exporter)
+[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/dynamicreports-core-for-grid-exporter/checkBuild.yml?branch=develop)](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_dynamicreports-core-for-grid-exporter&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_dynamicreports-core-for-grid-exporter)
 
-# standard-maven-template
+# dynamicreports-core-for-grid-exporter
+This is a fork of [dynamicreports-core](https://github.com/dynamicreports/dynamicreports) and specially designed for [XDEV's Vaadin Grid Exporer](https://github.com/xdev-software/vaadin-grid-exporter).
 
+Differences from the original project are roughly descibed in the [changelog](./CHANGELOG.md).
 
 ## Installation
-[Installation guide for the latest release](https://github.com/xdev-software/standard-maven-template/releases/latest#Installation)
+[Installation guide for the latest release](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/releases/latest#Installation)
 
 
 ## Support
@@ -16,4 +18,4 @@ If you need support as soon as possible and you can't wait for any pull request,
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/standard-maven-template/dependencies/)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/dynamicreports-core-for-grid-exporter/dependencies/)

SECURITY.md

@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/standard-maven-template/security/advisories/new).
+Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/security/advisories/new).

standard-maven-template-demo/pom.xml → dynamicreports-core-for-grid-exporter-demo/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.xdev-software</groupId>
-	<artifactId>standard-maven-template-demo</artifactId>
+	<artifactId>dynamicreports-core-for-grid-exporter-demo</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -16,16 +16,7 @@
 		<url>https://xdev.software</url>
 	</organization>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-
 	<properties>
-		<license.licenseName>apache_v2</license.licenseName>
-
 		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
@@ -38,7 +29,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.xdev-software</groupId>
-			<artifactId>standard-maven-template</artifactId>
+			<artifactId>dynamicreports-core-for-grid-exporter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -58,6 +49,34 @@
 					</compilerArgs>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.6.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>${mainClass}</mainClass>
+						</manifest>
+						<manifestEntries>
+							<Multi-Release>true</Multi-Release>
+						</manifestEntries>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id> <!-- this is used for inheritance merges -->
+						<phase>package</phase> <!-- bind to the packaging phase -->
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

dynamicreports-core-for-grid-exporter-demo/src/main/java/software/xdev/Application.java

@@ -0,0 +1,32 @@
+package software.xdev;
+
+import java.util.stream.Stream;
+
+import software.xdev.dynamicreports.jasper.builder.export.Exporters;
+import software.xdev.dynamicreports.report.builder.DynamicReports;
+import software.xdev.dynamicreports.report.builder.column.ColumnBuilders;
+import software.xdev.dynamicreports.report.exception.DRException;
+
+
+public class Application
+{
+	@SuppressWarnings("java:S106") // Just a simple demo
+	public static void main(final String[] args) throws DRException
+	{
+		DynamicReports.report()
+			.setDataSource(Stream.of("a", "b", "c")
+				.map(DummyDTO::new)
+				.toList())
+			.columns(new ColumnBuilders()
+				.column("value", String.class))
+			.export(Exporters.csvExporter(System.out));
+	}
+
+	public record DummyDTO(String value)
+	{
+		public String getValue()
+		{
+			return this.value();
+		}
+	}
+}

standard-maven-template/pom.xml → dynamicreports-core-for-grid-exporter/pom.xml

@@ -5,17 +5,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.xdev-software</groupId>
-	<artifactId>standard-maven-template</artifactId>
+	<artifactId>dynamicreports-core-for-grid-exporter</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>standard-maven-template</name>
-	<description>standard-maven-template</description>
-	<url>https://github.com/xdev-software/standard-maven-template</url>
+	<name>dynamicreports-core-for-grid-exporter</name>
+	<description>dynamicreports-core-for-grid-exporter</description>
+	<url>https://github.com/xdev-software/dynamicreports-core-for-grid-exporter</url>
 
 	<scm>
-		<url>https://github.com/xdev-software/standard-maven-template</url>
-		<connection>https://github.com/xdev-software/standard-maven-template.git</connection>
+		<url>https://github.com/xdev-software/dynamicreports-core-for-grid-exporter</url>
+		<connection>https://github.com/xdev-software/dynamicreports-core-for-grid-exporter.git</connection>
 	</scm>
 
 	<inceptionYear>2023</inceptionYear>
@@ -35,8 +35,8 @@
 
 	<licenses>
 		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<name>GNU Lesser General Public License version 3</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.en.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -84,6 +84,28 @@
 		</repository>
 	</distributionManagement>
 
+	<dependencies>
+		<!-- Used for reports -->
+		<dependency>
+			<groupId>net.sf.jasperreports</groupId>
+			<artifactId>jasperreports</artifactId>
+			<version>6.20.5</version>
+		</dependency>
+		<!-- Use for validation and minor shorthand methods -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.12.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.9.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -96,7 +118,7 @@
 					</properties>
 					<licenseSets>
 						<licenseSet>
-							<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+							<header>com/mycila/maven/plugin/license/templates/LGPL-3.txt</header>
 							<includes>
 								<include>src/main/java/**</include>
 								<include>src/test/java/**</include>
@@ -158,6 +180,11 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M9</version>
+			</plugin>
 		</plugins>
 	</build>
 	<profiles>