Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependencies #1683

Merged
merged 14 commits into from
Feb 4, 2025
2 changes: 1 addition & 1 deletion .github/workflows/agent_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: systemTest
run: ./gradlew -P${{ steps.determine-jdk.outputs.gradle_property }} :inspectit-ocelot-agent:systemTest
- name: upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: 'test-results'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/configdocsgenerator_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
runs-on: ubuntu-latest
env:
working-directory: ./components/inspectit-ocelot-configdocsgenerator
container: openjdk:8-jdk
container: eclipse-temurin:17
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: test
Expand All @@ -28,7 +28,7 @@ jobs:
dependency-scan:
name: Dependency Scan
runs-on: ubuntu-latest
container: openjdk:8-jdk
container: eclipse-temurin:17
steps:
- uses: actions/checkout@v3
- name: Grant execute permission for gradlew
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/configurationserver_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
working-directory: ./components/inspectit-ocelot-configurationserver
container: eclipse-temurin:17
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: assemble
Expand Down
46 changes: 15 additions & 31 deletions components/inspectit-ocelot-configdocsgenerator/build.gradle
Original file line number Diff line number Diff line change
@@ -1,58 +1,42 @@
plugins {
// Apply the application plugin to add support for building a CLI application in Java.
id 'application'
// spring dependency manager
alias(libs.plugins.orgSpringframeworkBoot)
alias(configServerLibs.plugins.orgSpringframeworkBoot)
alias(configServerLibs.plugins.ioSpringDependencyManagement)
}
apply plugin: 'io.spring.dependency-management'

dependencies {
// Use JUnit Jupiter for testing.
testImplementation(
libs.orgJunitJupiterJunitJupiter,
libs.ioOpencensusOpencensusApi,
libs.ioOpentelemetryOpentelemetryApi,
configServerLibs.orgJunitJupiterJunitJupiter,

libs.orgMockitoMockitoJunitJupiter,
configServerLibs.orgMockitoMockitoJunitJupiter,
configServerLibs.comGoogleGuava,
libs.ioOpentelemetryOpentelemetryApi,
libs.orgAssertjAssertjCore,
libs.comGoogleGuava
)

// This dependency is used by the application.
implementation(
project(':inspectit-ocelot-config'),
libs.chQosLogbackLogbackClassic,
configServerLibs.chQosLogbackLogbackClassic,
libs.orgApacheCommonsCommonsLang3,
libs.commonsBeanutils,
// Update dependency, due to Out-of-Support
libs.orgApacheCommonsCommonsCollections4,

libs.orgSpringframeworkBootSpringBootStarterWeb,
libs.orgYamlSnakeyaml
configServerLibs.orgSpringframeworkBootSpringBootStarterWeb,
configServerLibs.orgYamlSnakeyaml
)

constraints {
implementation(libs.orgYamlSnakeyaml) {
because 'vulnerabilities in v1.29 used by the SpringBoot version used in this module'
}
testImplementation(libs.comGoogleGuava) {
because 'security issues'
}
}
compileOnly libs.orgProjectlombokLombok
annotationProcessor libs.orgProjectlombokLombok
}

application {
// Define the main class for the application.
mainClass = 'inspectit.ocelot.configuration.docs.App'
}
// there is no main class here
bootJar.enabled = false

test {
// Use JUnit Platform for unit tests.
useJUnitPlatform()
}

//to guarantee that the Configuration Server is compatible with Java 8 runtime environments
sourceCompatibility = 1.8 // Java version compatibility to use when compiling Java source.
targetCompatibility = 1.8 // Java version to generate classes for.
java {
sourceCompatibility = 17
targetCompatibility = 17
}
10 changes: 5 additions & 5 deletions components/inspectit-ocelot-configurationserver-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"jszip": "^3.10.0",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.21",
"next": "^14.2.15",
"next": "^14.2.23",
"primeflex": "^3.2.1",
"primeicons": "^5.0.0",
"primereact": "^8.5.0",
Expand Down Expand Up @@ -71,10 +71,10 @@
"@babel/helper-string-parser": "^7.18.10",
"@babel/preset-react": "^7.18.6",
"@next/eslint-plugin-next": "^14.0.4",
"@storybook/addon-actions": "^7.6.4",
"@storybook/addon-essentials": "^7.6.4",
"@storybook/addon-links": "^7.6.4",
"@storybook/react": "^7.6.4",
"@storybook/addon-actions": "^7.6.19",
"@storybook/addon-essentials": "^7.6.19",
"@storybook/addon-links": "^7.6.19",
"@storybook/react": "^7.6.19",
"babel-loader": "^9.1.3",
"eslint": "8.55.0",
"eslint-config-prettier": "^9.1.0",
Expand Down
Loading
Loading