Skip to content

Commit

Permalink
Clean up micrometer-jakarta build.gradle
Browse files Browse the repository at this point in the history
Remove unused dependencies, plugins, tasks, bundle imports.
  • Loading branch information
shakuzen committed Oct 4, 2023
1 parent 914c744 commit bf939ed
Showing 1 changed file with 2 additions and 76 deletions.
78 changes: 2 additions & 76 deletions micrometer-jakarta/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
plugins {
id 'me.champeau.mrjar' version "0.1.1"
}

description 'Module for Jakarta based instrumentations'

jar {
bundle {

bnd '''\
Import-Package: \
org.eclipse.jetty.*;resolution:=dynamic;version="${@}",\
org.glassfish.jersey.*;resolution:=dynamic;version="${@}",\
ch.qos.logback.*;resolution:=dynamic;version="${@}",\
org.apache.logging.log4j.*;resolution:=dynamic;version="${@}",\
jakarta.jms.*;resolution:=dynamic;version="${@}",\
jakarta.servlet.*;resolution:=dynamic;version="${@}",\
io.micrometer.context.*;resolution:=dynamic,\
io.micrometer.observation.*;resolution:=dynamic;version="${@}",\
*
'''.stripIndent()
Expand All @@ -26,91 +18,25 @@ dependencies {
api project(":micrometer-core")
api project(":micrometer-commons")
api project(":micrometer-observation")
optionalApi 'jakarta.ws.rs:jakarta.ws.rs-api' // jakarta
optionalApi 'jakarta.ws.rs:jakarta.ws.rs-api' // jax-rs

// Aspects
optionalApi 'org.aspectj:aspectjweaver'

optionalApi 'org.eclipse.jetty:jetty-server'
// jakarta servlet
optionalApi 'jakarta.servlet:jakarta.servlet-api'
optionalApi 'org.eclipse.jetty:jetty-client:12.0.+' // can't move to dependencies.gradle, we have 2 versions of this lib (check micrometer-core)
optionalApi 'org.apache.tomcat.embed:tomcat-embed-core:10.1.+' // can't move to dependencies.gradle, we have 2 versions of this lib (check micrometer-core)
optionalApi 'org.glassfish.jersey.core:jersey-server:3.1.+' // can't move to dependencies.gradle, we have 2 versions of this lib (check micrometer-core)
// jakarta JMS
optionalApi 'jakarta.jms:jakarta.jms-api'

// log monitoring
optionalApi 'ch.qos.logback:logback-classic'
optionalApi 'org.apache.logging.log4j:log4j-core'

optionalApi project(':micrometer-observation')
optionalApi 'io.micrometer:context-propagation'

testImplementation project(":micrometer-observation-test")

// JUnit 5
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'com.tngtech.archunit:archunit-junit5'

testImplementation 'org.mockito:mockito-inline'

testImplementation 'org.mockito:mockito-core'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'

testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory'
testRuntimeOnly 'org.glassfish.jersey.inject:jersey-hk2'

testImplementation 'ru.lanwen.wiremock:wiremock-junit5'
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'

// Dependencies for @ClassPathExclusions
testImplementation("org.junit.platform:junit-platform-engine")
testImplementation("org.junit.platform:junit-platform-launcher")
testImplementation("javax.validation:validation-api")
testImplementation("org.jboss.resteasy:resteasy-netty4")
}

task shenandoahTest(type: Test) {
// set heap size for the test JVM(s)
maxHeapSize = "1500m"

useJUnitPlatform {
includeTags 'gc'
}

jvmArgs '-XX:+UseShenandoahGC'
}

task zgcTest(type: Test) {
// set heap size for the test JVM(s)
maxHeapSize = "1500m"

useJUnitPlatform {
includeTags 'gc'
}

jvmArgs '-XX:+UseZGC'
}

task openj9BalancedTest(type: Test) {
// set heap size for the test JVM(s)
maxHeapSize = "1500m"

useJUnitPlatform {
includeTags 'gc'
}

jvmArgs '-Xgcpolicy:balanced'
}

task openj9ConcurrentScavengeTest(type: Test) {
// set heap size for the test JVM(s)
maxHeapSize = "1500m"

useJUnitPlatform {
includeTags 'gc'
}

jvmArgs '-Xgc:concurrentScavenge'
}

0 comments on commit bf939ed

Please sign in to comment.