Skip to content

Commit

Permalink
Merge branch 'develop' into update-from-template-merged
Browse files Browse the repository at this point in the history
  • Loading branch information
xdev-gh-bot committed Feb 10, 2025
2 parents 37e12e8 + bd5bebe commit 580214f
Show file tree
Hide file tree
Showing 912 changed files with 93,217 additions and 238 deletions.
3 changes: 3 additions & 0 deletions .config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress checks="FileLength"
files="TemplateTransform.java"
lines="1"/>
</suppressions>
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ body:
attributes:
label: "Checklist"
options:
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/releases/latest)"
required: true
- 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."
- 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."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
attributes:
label: "Checklist"
options:
- 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."
- 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."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: "Checklist"
options:
- 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."
- 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."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
required: true
Expand Down
4 changes: 2 additions & 2 deletions .run/Run Demo.run.xml
Original file line number Diff line number Diff line change
@@ -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="template-placeholder-demo" />
<module name="dynamicreports-core-for-grid-exporter-demo" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<extension name="coverage">
<pattern>
Expand All @@ -13,4 +13,4 @@
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
</component>
58 changes: 58 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# 2.0.2
* Updated dependencies (JasperReports 7.0.1)

# 2.0.1
* Fix textfields cutting away text

# 2.0.0
* Updated to JasperReports 7
* Removed support for Maps
* Removed unused dependencies
* Removed all auto-generated JavaDoc comments
* Deleted deprecated code
* Changed source to use XDEV CodeStyle

# 1.1.2
* Updated dependencies
* Now using ``jasperreports`` 6.21+

# 1.1.1
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
* Updated dependencies

# 1.1.0
* Updated to Jasperreports ``6.20.6``
* API changes: Html - ``borderCollapse`` is now an enum

# 1.0.3
* Re-Added ``ecj`` dependency #12

# 1.0.2
* Removed unused Jasperreports dependencies

# 1.0.1
* Removed unused resources

# 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``](./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)
* ``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
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/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/template-placeholder/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
Expand Down
Loading

0 comments on commit 580214f

Please sign in to comment.