mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2026-03-19 02:22:11 +01:00
Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.15.5 to 1.16.0. <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.16.0</h2> <p>We upgraded the Prometheus Java Client to <code>1.4.x</code> (<a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6830">#6830</a>) which brings support for Unicode which includes some behavioral change in naming conventions, see the <a href="https://github.com/micrometer-metrics/micrometer/wiki/1.16-Migration-Guide">1.16 Migration-Guide</a>.</p> <h2>⚠️ Noteworthy</h2> <ul> <li>Deprecate the Wavefront module <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6328">#6328</a></li> <li>Remove deprecated io.micrometer.core.lang annotations <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6407">#6407</a></li> <li>Register JCache <code>cache.removals</code> as a FunctionCounter by default <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/2754">#2754</a></li> <li>Improve no-op behavior of the Observation API <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6700">#6700</a></li> </ul> <h2>⭐ New Features</h2> <ul> <li>Support KeyValues with annotations when using <code>ObservedAspect</code>/<code>@Observed</code> <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/4030">#4030</a></li> <li>Validate low cardinality keys <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6713">#6713</a></li> <li>Add counter for total loaded classes <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/3561">#3561</a></li> <li>Add eventexecutor.workers metrics for Netty <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6375">#6375</a></li> <li>Avoid DistributionStatisticsConfig creation when retrieving timers <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6661">#6661</a></li> <li>Avoid capturing lambda allocation when retrieving existing meters <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6670">#6670</a></li> <li>Introduce MeterConvention <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6710">#6710</a></li> <li>OpenTelemetry Semantic Conventions for JVM metrics <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5286">#5286</a></li> <li>Add MeterFilter.forMeters utility method <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6594">#6594</a></li> <li>Apache HC 5 OTel semantic convention <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6591">#6591</a></li> <li>Improve nullability for gauges <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6546">#6546</a></li> <li>Metrics for Generational Shenandoah GC <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/4259">#4259</a></li> <li>Support custom tags in NettyEventExecutorMetrics <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6592">#6592</a></li> <li>Support newsgroups KeyValue for Jakarta Mail instrumentation <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6558">#6558</a></li> <li>Add KeyName.withNoneValue() <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6125">#6125</a></li> <li>Add getAll to Getter for repeated metadata <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6312">#6312</a></li> <li>Enhance logging of negative amount in AbstractTimer.record() by printing stack trace <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6530">#6530</a></li> <li>Flag to register JCache cache.removals as FunctionCounter <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6471">#6471</a></li> <li>Improved Meter.Id#getTags() performance <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6182">#6182</a></li> <li>Jakarta Mail instrumentation <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5985">#5985</a></li> <li>Log requests as trace level for OtlpMeterRegistry <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6514">#6514</a></li> <li>Make KafkaMetrics refresh interval configurable <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6319">#6319</a></li> <li>Migrate to JSpecify annotations for nullability constraints <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/5547">#5547</a></li> <li>Provide meter count in HighCardinalityTagsDetector <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6510">#6510</a></li> <li>StackdriverConfig option to not create metric descriptors <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6281">#6281</a></li> <li>Use String.replace() where possible <a href="https://redirect.github.com/micrometer-metrics/micrometer/pull/6449">#6449</a></li> </ul> <h2>🐞 Bug Fixes</h2> <ul> <li>Exclude java.* from OSGI Import-Package <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6810">#6810</a></li> <li>Distribution without percentiles always has value 0 in Stackdriver <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6401">#6401</a></li> <li>Incompatible with slf4j 2 in OSGi <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6406">#6406</a></li> <li>LongTaskTimer#measure does not return max duration <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6421">#6421</a></li> <li>Return NaN for null KafkaMetrics values <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6324">#6324</a></li> <li>Scrape failure when conflicting meter types are registered <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6434">#6434</a></li> <li>ValueResolver and ValueExpressionResolver nullability is inconsistent <a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6280">#6280</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="3360d05dc5"><code>3360d05</code></a> Upgrade Micrometer Context Propagation to 1.2.0</li> <li><a href="8ae2387048"><code>8ae2387</code></a> Merge branch '1.15.x'</li> <li><a href="521f15109c"><code>521f151</code></a> Merge branch '1.14.x' into 1.15.x</li> <li><a href="162876235a"><code>1628762</code></a> Setup continuous builds for Antora (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6858">#6858</a>)</li> <li><a href="65031eafe0"><code>65031ea</code></a> Bump software.amazon.awssdk:cloudwatch from 2.37.4 to 2.37.5 (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6859">#6859</a>)</li> <li><a href="df18b91459"><code>df18b91</code></a> Bump software.amazon.awssdk:cloudwatch from 2.37.3 to 2.37.4 (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6856">#6856</a>)</li> <li><a href="4cb7563085"><code>4cb7563</code></a> Bump com.uber.nullaway:nullaway from 0.12.11 to 0.12.12 (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6854">#6854</a>)</li> <li><a href="064d159b4b"><code>064d159</code></a> Bump activemq-artemis from 2.42.0 to 2.44.0 (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6850">#6850</a>)</li> <li><a href="4d9ec6eea6"><code>4d9ec6e</code></a> Bump software.amazon.awssdk:cloudwatch from 2.37.2 to 2.37.3 (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6849">#6849</a>)</li> <li><a href="698d39406f"><code>698d394</code></a> Bump spring-io/spring-github-workflows (<a href="https://redirect.github.com/micrometer-metrics/micrometer/issues/6848">#6848</a>)</li> <li>Additional commits viewable in <a href="https://github.com/micrometer-metrics/micrometer/compare/v1.15.5...v1.16.0">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>
163 lines
5.5 KiB
Groovy
163 lines
5.5 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
|
|
}
|
|
}
|
|
|
|
spotless {
|
|
java {
|
|
target 'src/**/java/**/*.java'
|
|
googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
|
|
|
|
importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
|
|
toggleOffOn()
|
|
trimTrailingWhitespace()
|
|
leadingTabsToSpaces()
|
|
endWithNewline()
|
|
}
|
|
yaml {
|
|
target '**/*.yml', '**/*.yaml'
|
|
trimTrailingWhitespace()
|
|
leadingTabsToSpaces()
|
|
endWithNewline()
|
|
}
|
|
format 'gradle', {
|
|
target '**/gradle/*.gradle', '**/*.gradle'
|
|
trimTrailingWhitespace()
|
|
leadingTabsToSpaces()
|
|
endWithNewline()
|
|
}
|
|
}
|
|
|
|
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.21.0'
|
|
implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
|
|
implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
|
|
implementation 'io.micrometer:micrometer-core:1.16.0'
|
|
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.12.0' // 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('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
|
|
)
|
|
}
|
|
}
|
|
|
|
// Configure main class for Spring Boot
|
|
springBoot {
|
|
mainClass = 'stirling.software.SPDF.SPDFApplication'
|
|
}
|
|
|
|
bootJar.dependsOn ':common:jar'
|
|
bootJar.dependsOn ':proprietary:jar'
|