Skip to content

Bump com.github.jk1.dependency-license-report from 3.1.2 to 3.1.4 #4746

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.

Sign up for GitHub

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

Merged
rajkumar-rangaraj merged 9 commits into from
Aug 1, 2026
+138 −129
Merged

Bump com.github.jk1.dependency-license-report from 3.1.2 to 3.1.4 #4746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc96298
Bump com.github.jk1.dependency-license-report from 3.1.2 to 3.1.4
dependabot[bot] Jul 29, 2026
76667b0
./gradlew generateLicenseReport
github-actions[bot] Jul 29, 2026
6f0c7f9
Merge branch 'main' into dependabot/gradle/com.github.jk1.dependency-…
Copilot Jul 30, 2026
c540bc8
Merge branch 'main' to resolve conflicts
Copilot Jul 30, 2026
2c2db23
Restore gradlew.bat to match main (avoid line-ending churn)
Copilot Jul 30, 2026
0eee9ae
Fix flaky MicrometerTest.shouldCaptureTimer() on Windows CI
Copilot Jul 30, 2026
766a056
Fix flaky MicrometerTest.shouldCaptureTimer() on Windows CI by increa…
Copilot Jul 30, 2026
a03c4d6
Merge branch 'main' into dependabot/gradle/com.github.jk1.dependency-…
xiang17 Jul 31, 2026
f29785f
./gradlew generateLicenseReport
xiang17 Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions agent/instrumentation/micrometer-1.0/src/test/java/MicrometerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

Expand All @@ -35,6 +37,13 @@ class MicrometerTest {
MicrometerUtil.setDelegate(delegate);
}

@BeforeAll
static void setUp() {
// Increase default timeout to be resilient on slow CI runners (e.g. Windows).
// The step interval is 1000ms (set via JVM arg), so 30s gives ample margin.
Awaitility.setDefaultTimeout(Duration.ofSeconds(30));
}

@Test
void shouldRegisterAzureMonitorMeterRegistry() {
assertThat(Metrics.globalRegistry.getRegistries()).hasSize(1);
Expand Down
164 changes: 82 additions & 82 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading