mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-06-17 21:15:03 +00:00
![dependabot[bot]](/assets/img/avatar_default.png)
[//]: # (dependabot-start) ⚠️ **Dependabot is rebasing this PR** ⚠️ Rebasing might not happen immediately, so don't worry if this takes some time. Note: if you make any changes to this PR yourself, they will take precedence over the rebase. --- [//]: # (dependabot-end) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.6 to 1.15.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/micrometer-metrics/micrometer/releases">io.micrometer:micrometer-core's releases</a>.</em></p> <blockquote> <h2>1.15.1</h2> <h2>🐞 Bug Fixes</h2> <ul> <li>IndexProviderFactory throws ConcurrentModificationException <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6243">#6243</a></li> <li>Make InstrumentationVerificationTests compatible with JUnit 5.13 and earlier versions <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6344">#6344</a></li> <li>gRPC client interceptor incorrectly registers status CANCELLED as error <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6261">#6261</a></li> </ul> <h2>🔨 Dependency Upgrades</h2> <ul> <li>Bump software.amazon.awssdk:cloudwatch from 2.31.41 to 2.31.58 <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6372">#6372</a></li> <li>Bump com.netflix.spectator:spectator-reg-atlas from 1.8.12 to 1.8.14 <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6336">#6336</a></li> <li>Bump dropwizard-metrics from 4.2.30 to 4.2.32 <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6307">#6307</a></li> <li>Bump io.prometheus:prometheus-metrics-bom from 1.3.7 to 1.3.8 <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6306">#6306</a></li> <li>Bump io.prometheus:prometheus-metrics-bom from 1.3.6 to 1.3.7 <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6241">#6241</a></li> </ul> <h2>📝 Tasks</h2> <ul> <li>Remove AtomicReference from StatsdMeterRegistryTest <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6311">#6311</a></li> <li>Remove java11Test setup from micrometer-test <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6293">#6293</a></li> <li>Polish StatsD line builders <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6285">#6285</a></li> <li>Improve StatsD tests <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6284">#6284</a></li> <li>Resolve StringSplitter from Error Prone <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6271">#6271</a></li> <li>Resolve EqualsGetClass from Error Prone <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6263">#6263</a></li> <li>Resolve ClassCanBeStatic from Error Prone <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6253">#6253</a></li> <li>Resolve InlineFormatString from Error Prone <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6232">#6232</a></li> <li>Add more tests for TimedHandler <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6227">#6227</a></li> <li>Replace TimeUtils usage to TimeUnit where applicable <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6224">#6224</a></li> </ul> <h2>❤️ Contributors</h2> <p>Thank you to all the contributors who worked on this release:</p> <p><a href="https://github.com/izeye"><code>@izeye</code></a>, <a href="https://github.com/kwondh5217"><code>@kwondh5217</code></a>, <a href="https://github.com/cfredri4"><code>@cfredri4</code></a>, and <a href="https://github.com/ngocnhan-tran1996"><code>@ngocnhan-tran1996</code></a></p> <h2>1.15.0</h2> <h2>⭐ New Features</h2> <ul> <li>Further enhancement to OtlpMetricsSender <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6025">#6025</a></li> <li>Make Prometheus Metric and Label naming conventions consistent <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5923">#5923</a></li> <li>Metrics for Executors.newVirtualThreadPerTaskExecutor() <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5488">#5488</a></li> <li>Metrics for live virtual threads <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5950">#5950</a></li> <li>More flexible OTLP per meter configuration <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6099">#6099</a></li> <li>Prometheus/OpenMetrics <code>_created</code> timestamp <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/2625">#2625</a></li> <li>Make jvm.classes.unloaded description generic <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/5745">#5745</a></li> <li>Use String.toLowerCase()/toUpperCase() with Locale.ROOT consistently <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/5711">#5711</a></li> <li>Use failWithActualExpectedAndMessage() where possible <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/5696">#5696</a></li> <li>Provide target host/port info in ObservationExecChainHandler when HttpHostConnectException is thrown <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5615">#5615</a></li> <li>Enable Gauge builders to take a subclass of Number <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/5601">#5601</a></li> <li>micrometer-observation-test support for assertions on events <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5576">#5576</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="315a851d7c
"><code>315a851</code></a> Merge branch '1.14.x' into 1.15.x</li> <li><a href="17ff40ba60
"><code>17ff40b</code></a> Merge branch '1.13.x' into 1.14.x</li> <li><a href="606afafe2f
"><code>606afaf</code></a> Resolve StringSplitter from Error Prone (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6271">#6271</a>)</li> <li><a href="0bfe23baef
"><code>0bfe23b</code></a> Merge branch '1.14.x' into 1.15.x</li> <li><a href="aa61a2cafa
"><code>aa61a2c</code></a> Merge branch '1.13.x' into 1.14.x</li> <li><a href="b1c5697c47
"><code>b1c5697</code></a> Migrate to gradle/actions/wrapper-validation@v4</li> <li><a href="f5ad95f06a
"><code>f5ad95f</code></a> Bump software.amazon.awssdk:cloudwatch from 2.31.57 to 2.31.58 (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6372">#6372</a>)</li> <li><a href="ec25823593
"><code>ec25823</code></a> Merge branch '1.14.x' into 1.15.x</li> <li><a href="046236ea92
"><code>046236e</code></a> Fix ConcurrentModificationException in Exponential Histogram (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6363">#6363</a>)</li> <li><a href="0c56034818
"><code>0c56034</code></a> Merge branch '1.14.x' into 1.15.x</li> <li>Additional commits viewable in <a href="https://github.com/micrometer-metrics/micrometer/compare/v1.14.6...v1.15.1">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
137 lines
5.1 KiB
Groovy
137 lines
5.1 KiB
Groovy
apply plugin: 'org.springframework.boot'
|
|
|
|
repositories {
|
|
maven { url = 'https://build.shibboleth.net/maven/releases' }
|
|
maven { url = 'https://maven.pkg.github.com/jcefmaven/jcefmaven' }
|
|
}
|
|
|
|
configurations {
|
|
developmentOnly
|
|
runtimeClasspath {
|
|
extendsFrom developmentOnly
|
|
}
|
|
}
|
|
|
|
dependencies {
|
|
if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
|
|
|| (project.hasProperty('STIRLING_PDF_DESKTOP_UI')
|
|
&& project.getProperty('STIRLING_PDF_DESKTOP_UI') != 'false')) {
|
|
implementation 'me.friwi:jcefmaven:132.3.1'
|
|
implementation 'org.openjfx:javafx-controls:21'
|
|
implementation 'org.openjfx:javafx-swing:21'
|
|
}
|
|
|
|
if (System.getenv('DISABLE_ADDITIONAL_FEATURES') != 'true'
|
|
|| (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
|
|
&& System.getProperty('DISABLE_ADDITIONAL_FEATURES') != 'true')) {
|
|
implementation project(':proprietary')
|
|
}
|
|
|
|
implementation project(':common')
|
|
implementation 'org.springframework.boot:spring-boot-starter-jetty'
|
|
implementation 'com.posthog.java:posthog:1.2.0'
|
|
implementation 'commons-io:commons-io:2.19.0'
|
|
implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
|
|
implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
|
|
implementation 'io.micrometer:micrometer-core:1.15.1'
|
|
implementation 'com.google.zxing:core:3.5.3'
|
|
implementation "org.commonmark:commonmark:$commonmarkVersion" // https://mvnrepository.com/artifact/org.commonmark/commonmark
|
|
implementation "org.commonmark:commonmark-ext-gfm-tables:$commonmarkVersion"
|
|
|
|
// General PDF dependencies
|
|
implementation "org.apache.pdfbox:preflight:$pdfboxVersion"
|
|
implementation "org.apache.pdfbox:xmpbox:$pdfboxVersion"
|
|
|
|
// https://mvnrepository.com/artifact/technology.tabula/tabula
|
|
implementation ('technology.tabula:tabula:1.0.5') {
|
|
exclude group: 'org.slf4j', module: 'slf4j-simple'
|
|
exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
|
|
exclude group: 'com.google.code.gson', module: 'gson'
|
|
}
|
|
implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
|
|
implementation 'com.opencsv:opencsv:5.11' // https://mvnrepository.com/artifact/com.opencsv/opencsv
|
|
|
|
// Batik
|
|
implementation 'org.apache.xmlgraphics:batik-all:1.19'
|
|
|
|
// TwelveMonkeys
|
|
runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
|
|
runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
|
|
runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
|
|
runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
|
|
runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
|
|
// runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
|
|
|
|
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
|
}
|
|
|
|
sourceSets {
|
|
main {
|
|
resources {
|
|
srcDirs += ['../configs']
|
|
}
|
|
java {
|
|
if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
|
|
exclude 'stirling/software/SPDF/UI/impl/**'
|
|
}
|
|
|
|
}
|
|
}
|
|
test {
|
|
java {
|
|
if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true'
|
|
|| (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
|
|
&& System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) {
|
|
exclude 'stirling/software/proprietary/security/**'
|
|
}
|
|
if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
|
|
exclude 'stirling/software/SPDF/UI/impl/**'
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
|
|
// Disable regular jar
|
|
jar {
|
|
enabled = false
|
|
}
|
|
|
|
// Configure and enable bootJar for this project
|
|
bootJar {
|
|
enabled = true
|
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
|
zip64 = true
|
|
|
|
// Don't include all dependencies directly like the old jar task did
|
|
// from {
|
|
// configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
|
|
// }
|
|
|
|
// Exclude signature files to prevent "Invalid signature file digest" errors
|
|
exclude 'META-INF/*.SF'
|
|
exclude 'META-INF/*.DSA'
|
|
exclude 'META-INF/*.RSA'
|
|
exclude 'META-INF/*.EC'
|
|
|
|
manifest {
|
|
attributes(
|
|
'Implementation-Title': 'Stirling-PDF',
|
|
'Implementation-Version': project.version
|
|
)
|
|
}
|
|
}
|
|
|
|
bootJar.dependsOn ':common:jar'
|
|
bootJar.dependsOn ':proprietary:jar' |