Skip to content

Commit a0c8848

Browse files
committed
Merge branch 'develop' into update-from-template-merged
2 parents 4d22d20 + d6bcacd commit a0c8848

File tree

912 files changed

+93199
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

912 files changed

+93199
-238
lines changed

.config/checkstyle/suppressions.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
44
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
55
<suppressions>
6+
<suppress checks="FileLength"
7+
files="TemplateTransform.java"
8+
lines="1"/>
69
</suppressions>

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ body:
1414
attributes:
1515
label: "Checklist"
1616
options:
17-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
17+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/releases/latest)"
1818
required: true
19-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
19+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/issues) or [closed](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2020
required: true
2121
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2222
required: true

.github/ISSUE_TEMPLATE/enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/issues) or [closed](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1818
required: true

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/issues) or [closed](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

.run/Run Demo.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
33
<option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
4-
<module name="template-placeholder-demo" />
4+
<module name="dynamicreports-core-for-grid-exporter-demo" />
55
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
66
<extension name="coverage">
77
<pattern>
@@ -13,4 +13,4 @@
1313
<option name="Make" enabled="true" />
1414
</method>
1515
</configuration>
16-
</component>
16+
</component>

CHANGELOG.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# 2.0.0
2+
* Updated to JasperReports 7
3+
* Removed support for Maps
4+
* Removed unused dependencies
5+
* Removed all auto-generated JavaDoc comments
6+
* Deleted deprecated code
7+
* Changed source to use XDEV CodeStyle
8+
9+
# 1.1.2
10+
* Updated dependencies
11+
* Now using ``jasperreports`` 6.21+
12+
13+
# 1.1.1
14+
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
15+
* Updated dependencies
16+
17+
# 1.1.0
18+
* Updated to Jasperreports ``6.20.6``
19+
* API changes: Html - ``borderCollapse`` is now an enum
20+
21+
# 1.0.3
22+
* Re-Added ``ecj`` dependency #12
23+
24+
# 1.0.2
25+
* Removed unused Jasperreports dependencies
26+
27+
# 1.0.1
28+
* Removed unused resources
29+
30+
# 1.0.0
31+
_Initial release of the fork_
32+
33+
## Differences to [dynamicreports/dynamicreports-core](https://github.com/dynamicreports/dynamicreports/tree/f7d73961462f3f13cbc27c91df90d4cc3ccc669e/dynamicreports-core)
34+
* Renamed ``net.sf.dynamicreports`` to ``software.xdev.dynamicreports`` to prevent conflicts with existing installations
35+
* Dependency shedding
36+
* Removed [``Defaults``](./dynamicreports-core-for-grid-exporter/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)
37+
* ``jakarta.xml.bind:jakarta.xml.bind-api``
38+
* ``org.glassfish.jaxb:jaxb-runtime``
39+
* Removed barcode subsystem
40+
* ``net.sf.barcode4j:barcode4j``
41+
* ``com.google.zxing:core``
42+
* ``net.sourceforge.barbecue:barbecue``
43+
* Removed charts subsystem
44+
* Removed boolean to image subsystem
45+
* ``org.apache.xmlgraphics:batik-bridge``
46+
* Dropped support for ``XLS`` as the required dependency was never shipped
47+
* ``XLSX`` still works as expected
48+
* Removed ``org.apache.commons:commons-text`` as it was only used on a single unused line of code
49+
* Removed XML subsystem as XML exports were never producing valid XML
50+
* Removed half-way implemented Image subsystem as it is unused
51+
* Updated dependencies to lastest versions
52+
* Fixed compile errors

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ You should have the following things installed:
3434
* Ensure that the JDK/Java-Version is correct
3535

3636

37-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
37+
## 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)
3838

3939
Before releasing:
40-
* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
40+
* 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.
4141
* Check the [changelog](CHANGELOG.md)
4242

4343
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

0 commit comments

Comments
 (0)