From 8207b8f8e059d766bfde19894d6c3cd3a6430da1 Mon Sep 17 00:00:00 2001 From: zkirksey Date: Thu, 9 Jan 2025 17:50:28 -0500 Subject: [PATCH 1/4] Upgraded project to Java 21 --- Jenkinsfile | 4 +- dominion-pax-exam-driver/pom.xml | 3 +- dominion-pax-exam-invokers/pom.xml | 5 +- dominion-pax-exam-options/pom.xml | 3 +- dominion-pax-exam/pom.xml | 3 +- dominion/pom.xml | 3 +- failsafe-controller/pom.xml | 4 +- .../failsafe/internal/actions/Action.java | 2 +- internal/pom.xml | 55 ++++++---------- junit-extensions/pom.xml | 29 ++++++--- .../java/org/codice/junit/DeFinalizer.java | 4 +- maven-extensions/pom.xml | 3 +- pax-exam-extensions/pom.xml | 5 +- .../pax/exam/junit/rules/ServiceAdmin.java | 18 ++++++ pom.xml | 64 ++++++++----------- spock-all/pom.xml | 2 +- spock-extensions/pom.xml | 3 +- thirdparty/rest-assured/pom.xml | 32 +--------- 18 files changed, 113 insertions(+), 129 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 537be14..a42ad8a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -177,7 +177,7 @@ pipeline { sh "git checkout ${env.RELEASE_TAG}" } } - withMaven(maven: 'maven-latest', jdk: 'jdk11', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') { + withMaven(maven: 'maven-latest', jdk: 'jdk21', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') { withCredentials([string(credentialsId: 'sonarqube-token', variable: 'SONAR_TOKEN')]) { script { // If this build is not a pull request, run sonar scan @@ -247,7 +247,7 @@ pipeline { } } - withMaven(maven: 'maven-latest', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') { + withMaven(maven: 'maven-latest', jdk: 'jdk21-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') { sh 'mvn deploy -B -DskipStatic=true -DskipTests=true -DretryFailedDeploymentCount=10 -nsu $DISABLE_DOWNLOAD_PROGRESS_OPTS' } } diff --git a/dominion-pax-exam-driver/pom.xml b/dominion-pax-exam-driver/pom.xml index da64c3f..a3dba60 100644 --- a/dominion-pax-exam-driver/pom.xml +++ b/dominion-pax-exam-driver/pom.xml @@ -138,8 +138,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/dominion-pax-exam-invokers/pom.xml b/dominion-pax-exam-invokers/pom.xml index 315b3aa..907a901 100644 --- a/dominion-pax-exam-invokers/pom.xml +++ b/dominion-pax-exam-invokers/pom.xml @@ -63,7 +63,7 @@ org.osgi - org.osgi.core + osgi.core org.ops4j.pax.exam @@ -91,8 +91,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/dominion-pax-exam-options/pom.xml b/dominion-pax-exam-options/pom.xml index bcb2fbf..592c477 100644 --- a/dominion-pax-exam-options/pom.xml +++ b/dominion-pax-exam-options/pom.xml @@ -72,8 +72,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/dominion-pax-exam/pom.xml b/dominion-pax-exam/pom.xml index eeb9e96..d3c799d 100644 --- a/dominion-pax-exam/pom.xml +++ b/dominion-pax-exam/pom.xml @@ -73,8 +73,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/dominion/pom.xml b/dominion/pom.xml index 97ce187..09ecfdf 100644 --- a/dominion/pom.xml +++ b/dominion/pom.xml @@ -77,8 +77,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/failsafe-controller/pom.xml b/failsafe-controller/pom.xml index 1c14a78..c4fc997 100644 --- a/failsafe-controller/pom.xml +++ b/failsafe-controller/pom.xml @@ -46,8 +46,10 @@ failsafe - org.codehaus.groovy + org.apache.groovy groovy-all + compile + pom diff --git a/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java b/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java index b3b4e36..2a33c50 100644 --- a/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java +++ b/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java @@ -38,7 +38,7 @@ public abstract class Action { private static final Set PACKAGE_PREFIXES = ImmutableSet.of( FailsafeController.class.getPackage().getName() + ".", - "org.codehaus.groovy.", + "org.apache.groovy.", "sun.", "com.sun.", "java.", diff --git a/internal/pom.xml b/internal/pom.xml index 6b42b4c..71e9ee3 100644 --- a/internal/pom.xml +++ b/internal/pom.xml @@ -40,8 +40,20 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api + 5.5.2 + test + + + org.junit.platform + junit-platform-runner + 1.7.0 + + + org.junit.platform + junit-platform-commons + 1.7.0 @@ -52,8 +64,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test @@ -63,39 +76,9 @@ org.jacoco jacoco-maven-plugin - - - default-check - - check - - - true - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - 0.43 - - - BRANCH - COVEREDRATIO - 0.24 - - - COMPLEXITY - COVEREDRATIO - 0.39 - - - - - - - + + true + diff --git a/junit-extensions/pom.xml b/junit-extensions/pom.xml index 360d472..7988785 100644 --- a/junit-extensions/pom.xml +++ b/junit-extensions/pom.xml @@ -41,12 +41,18 @@ org.javassist javassist + + + + - junit - junit + org.junit.jupiter + junit-jupiter + 5.5.2 + test - org.codehaus.groovy + org.apache.groovy groovy-all pom @@ -54,6 +60,16 @@ org.spockframework spock-core + + org.junit.platform + junit-platform-runner + 1.7.0 + + + org.junit.platform + junit-platform-commons + 1.7.0 + org.codice.test @@ -62,11 +78,6 @@ pom test - - org.codehaus.groovy - groovy-all - test - @@ -122,7 +133,7 @@ BRANCH COVEREDRATIO - 0.40 + 0.38 COMPLEXITY diff --git a/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java b/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java index 5b5df75..9934aec 100644 --- a/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java +++ b/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.List; import org.codice.junit.impl.DeFinalizeClassLoader; +import org.junit.platform.runner.JUnitPlatform; import org.junit.runner.Describable; import org.junit.runner.Description; import org.junit.runner.Runner; @@ -28,7 +29,6 @@ import org.junit.runner.notification.RunNotifier; import org.junit.runners.JUnit4; import org.junit.runners.model.InitializationError; -import org.spockframework.runtime.Sputnik; import spock.lang.Specification; /** @@ -141,7 +141,7 @@ private Runner newTestRunner() throws InitializationError { if (a != null) { runnerClass = a.value(); } else if (Specification.class.isAssignableFrom(testClass)) { - runnerClass = Sputnik.class; + runnerClass = JUnitPlatform.class; } else { runnerClass = JUnit4.class; } diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml index 129256f..eece89a 100644 --- a/maven-extensions/pom.xml +++ b/maven-extensions/pom.xml @@ -62,8 +62,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/pax-exam-extensions/pom.xml b/pax-exam-extensions/pom.xml index 3301601..d33f202 100644 --- a/pax-exam-extensions/pom.xml +++ b/pax-exam-extensions/pom.xml @@ -62,7 +62,7 @@ org.osgi - org.osgi.core + osgi.core org.ops4j.pax.exam @@ -94,8 +94,9 @@ test - org.codehaus.groovy + org.apache.groovy groovy-all + pom test diff --git a/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java b/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java index 33d971b..b6fe28b 100644 --- a/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java +++ b/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java @@ -70,7 +70,9 @@ import org.osgi.framework.Filter; import org.osgi.framework.FrameworkListener; import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceObjects; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.framework.wiring.BundleRequirement; @@ -224,6 +226,11 @@ public boolean isRepositoryUriBlacklisted(URI uri) { return service(FeaturesService.class).isRepositoryUriBlacklisted(uri); } + @Override + public Feature[] repositoryProvidedFeatures(URI uri) throws Exception { + return new Feature[0]; + } + /** * {@inheritDoc} * @@ -976,6 +983,12 @@ public ServiceRegistration registerService( return service(BundleContext.class).registerService(clazz, service, properties); } + @Override + public ServiceRegistration registerService( + Class aClass, ServiceFactory serviceFactory, Dictionary dictionary) { + return null; + } + @Override public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { @@ -1014,6 +1027,11 @@ public boolean ungetService(ServiceReference reference) { return service(BundleContext.class).ungetService(reference); } + @Override + public ServiceObjects getServiceObjects(ServiceReference serviceReference) { + return service(BundleContext.class).getServiceObjects(serviceReference); + } + @Override public File getDataFile(String filename) { return service(BundleContext.class).getDataFile(filename); diff --git a/pom.xml b/pom.xml index 4f47afc..757012e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,14 +41,14 @@ - 1.8 - 1.8 + 21 + 21 - 0.1 + 0.4-SNAPSHOT 2.6 3.8 - 2.6 + 2.14.0 1.6 1.18 1.7.0 @@ -62,22 +62,22 @@ 4.5.6 4.4.10 - 5.0.0 - 4.2.1 - 1.9.4 + 7.0.0 + 4.4.6 + 1.9.26 4.12.0 1.8.2 2.5.4 4.12 - 1.1-groovy-2.4 - 2.4.7 + 2.3-groovy-4.0 + 4.0.24 2.8.47 1.3 1.3_1 - 2.9.0 + 5.5.0 - 3.22.0-GA + 3.30.2-GA refs/remotes/origin/master @@ -86,8 +86,8 @@ false - 0.8.1 - 1.4.0 + 0.8.12 + 1.5.0 @@ -221,13 +221,13 @@ org.osgi - org.osgi.compendium + osgi.compendium ${osgi.version} provided org.osgi - org.osgi.core + osgi.core ${osgi.version} provided @@ -319,26 +319,16 @@ ${mockito-core.version} - org.codehaus.groovy + org.apache.groovy groovy-all ${groovy.version} pom - - - org.codehaus.groovy - groovy-all - ${groovy.version} + test org.spockframework spock-core ${spock.version} - - - org.codehaus.groovy - groovy-all - - @@ -357,12 +347,12 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.2.0 org.apache.maven.plugins maven-assembly-plugin - 2.2.2 + 3.2.0 org.jacoco @@ -387,9 +377,9 @@ org.apache.maven.plugins maven-surefire-plugin - 2.20.1 + 3.5.2 - ${argLine} -Djava.awt.headless=true -noverify + ${argLine} -Djava.awt.headless=true -noverify --add-opens java.base/java.lang=ALL-UNNAMED **/*Test.java **/*Spec.class @@ -416,17 +406,17 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.2 + 3.1.0 org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.2.0 org.apache.felix maven-bundle-plugin - 3.3.0 + 5.1.4 true @@ -439,7 +429,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.6.0 com.coveo @@ -457,12 +447,12 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.5 + 4.0.1 compile - testCompile + compileTests diff --git a/spock-all/pom.xml b/spock-all/pom.xml index 6d0ea98..1dc343a 100644 --- a/spock-all/pom.xml +++ b/spock-all/pom.xml @@ -46,7 +46,7 @@ 2.6 - org.codehaus.groovy + org.apache.groovy groovy-all pom diff --git a/spock-extensions/pom.xml b/spock-extensions/pom.xml index 8ff5213..efffaac 100644 --- a/spock-extensions/pom.xml +++ b/spock-extensions/pom.xml @@ -27,8 +27,9 @@ - org.codehaus.groovy + org.apache.groovy groovy-all + pom org.spockframework diff --git a/thirdparty/rest-assured/pom.xml b/thirdparty/rest-assured/pom.xml index f30f678..60a0b78 100644 --- a/thirdparty/rest-assured/pom.xml +++ b/thirdparty/rest-assured/pom.xml @@ -28,7 +28,7 @@ - com.jayway.restassured + io.rest-assured rest-assured ${restassured.version} @@ -130,35 +130,7 @@ *;artifactId=!dominion|junit-extensions|maven-extensions|groovy-all|hamcrest-core|hamcrest-library|hamcrest-all|junit|mockito-core;scope=!test - com.jayway.restassured;version="${restassured.version}", - com.jayway.restassured.assertion;version="${restassured.version}", - com.jayway.restassured.authentication;version="${restassured.version}", - com.jayway.restassured.builder;version="${restassured.version}", - com.jayway.restassured.config;version="${restassured.version}", - com.jayway.restassured.exception;version="${restassured.version}", - com.jayway.restassured.filter;version="${restassured.version}", - com.jayway.restassured.filter.log;version="${restassured.version}", - com.jayway.restassured.http;version="${restassured.version}", - com.jayway.restassured.internal;version="${restassured.version}", - com.jayway.restassured.internal.filter;version="${restassured.version}", - com.jayway.restassured.internal.http;version="${restassured.version}", - com.jayway.restassured.internal.mapping;version="${restassured.version}", - com.jayway.restassured.internal.matcher.xml;version="${restassured.version}", - com.jayway.restassured.internal.path;version="${restassured.version}", - com.jayway.restassured.internal.path.xml;version="${restassured.version}", - com.jayway.restassured.internal.support;version="${restassured.version}", - com.jayway.restassured.mapper;version="${restassured.version}", - com.jayway.restassured.mapper.factory;version="${restassured.version}", - com.jayway.restassured.mapper.resolver;version="${restassured.version}", - com.jayway.restassured.matcher;version="${restassured.version}", - com.jayway.restassured.parsing;version="${restassured.version}", - com.jayway.restassured.path.json;version="${restassured.version}", - com.jayway.restassured.path.xml;version="${restassured.version}", - com.jayway.restassured.path.xml.element;version="${restassured.version}", - com.jayway.restassured.path.xml.config;version="${restassured.version}", - com.jayway.restassured.response;version="${restassured.version}", - com.jayway.restassured.specification;version="${restassured.version}", - com.jayway.restassured.spi;version="${restassured.version}" + io.rest-assured;version="${restassured.version}" org.hamcrest, From 79490758d0ff7b4a666b54f9722927111d1c1567 Mon Sep 17 00:00:00 2001 From: zkirksey Date: Mon, 27 Jan 2025 18:01:19 -0500 Subject: [PATCH 2/4] Fixed groovy tests --- internal/pom.xml | 61 ++++++++++++++----- .../test/commons/ReflectionUtilsSpec.groovy | 3 + junit-extensions/pom.xml | 26 ++++---- maven-extensions/pom.xml | 8 +-- pom.xml | 25 +++++++- 5 files changed, 90 insertions(+), 33 deletions(-) diff --git a/internal/pom.xml b/internal/pom.xml index 71e9ee3..84dd583 100644 --- a/internal/pom.xml +++ b/internal/pom.xml @@ -42,20 +42,27 @@ org.junit.jupiter junit-jupiter-api - 5.5.2 + ${junit-jupiter.version} test - org.junit.platform - junit-platform-runner - 1.7.0 + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + test + + + org.apache.groovy + groovy-all + pom + test org.junit.platform - junit-platform-commons + junit-platform-runner 1.7.0 + test - org.codice.test spock-all @@ -63,12 +70,6 @@ pom test - - org.apache.groovy - groovy-all - pom - test - @@ -76,9 +77,39 @@ org.jacoco jacoco-maven-plugin - - true - + + + default-check + + check + + + true + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + 0.43 + + + BRANCH + COVEREDRATIO + 0.24 + + + COMPLEXITY + COVEREDRATIO + 0.39 + + + + + + + diff --git a/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy b/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy index 96da82a..0718ae9 100644 --- a/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy +++ b/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy @@ -13,6 +13,8 @@ */ package org.codice.test.commons +import org.junit.platform.runner.JUnitPlatform +import org.junit.runner.RunWith import spock.lang.Specification import spock.lang.Unroll @@ -22,6 +24,7 @@ import java.lang.annotation.Retention import java.lang.annotation.Target import java.util.stream.Collectors +@RunWith(JUnitPlatform.class) class ReflectionUtilsSpec extends Specification { @Unroll def "test annotationsByType() finds recursively from #from_what with no filters"() { diff --git a/junit-extensions/pom.xml b/junit-extensions/pom.xml index 7988785..0b73790 100644 --- a/junit-extensions/pom.xml +++ b/junit-extensions/pom.xml @@ -41,24 +41,24 @@ org.javassist javassist - - - - org.junit.jupiter - junit-jupiter - 5.5.2 + junit-jupiter-api + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} test org.apache.groovy groovy-all + ${groovy.version} pom - - - org.spockframework - spock-core + test org.junit.platform @@ -69,8 +69,12 @@ org.junit.platform junit-platform-commons 1.7.0 + test + + + org.spockframework + spock-core - org.codice.test spock-all diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml index eece89a..324948b 100644 --- a/maven-extensions/pom.xml +++ b/maven-extensions/pom.xml @@ -49,10 +49,10 @@ pax-url-aether - - junit - junit - + + + + org.codice.test diff --git a/pom.xml b/pom.xml index 757012e..4f22fa5 100644 --- a/pom.xml +++ b/pom.xml @@ -69,13 +69,15 @@ 1.8.2 2.5.4 - 4.12 + 4.13.1 + 5.8.2 2.3-groovy-4.0 - 4.0.24 + 4.0.23 2.8.47 1.3 1.3_1 5.5.0 + 2.22.2 3.30.2-GA @@ -377,7 +379,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + ${maven.surefire.version} ${argLine} -Djava.awt.headless=true -noverify --add-opens java.base/java.lang=ALL-UNNAMED @@ -385,6 +387,13 @@ **/*Spec.class + + + org.apache.maven.surefire + surefire-junit47 + ${maven.surefire.version} + + org.apache.servicemix.tooling @@ -456,6 +465,16 @@ + + + + ${project.basedir}/src/test/groovy + + **/*.groovy + + + + org.jacoco From bbda316f93b00bb02bf64ecf7e002cb874a09580 Mon Sep 17 00:00:00 2001 From: zkirksey Date: Mon, 27 Jan 2025 18:09:05 -0500 Subject: [PATCH 3/4] Removed junit dependency --- dominion-pax-exam-driver/pom.xml | 6 ------ dominion-pax-exam-invokers/pom.xml | 6 ------ dominion-pax-exam-options/pom.xml | 6 ------ dominion-pax-exam/pom.xml | 6 ------ dominion/pom.xml | 6 ------ maven-extensions/pom.xml | 6 ------ pax-exam-extensions/pom.xml | 6 ------ pom.xml | 5 ----- 8 files changed, 47 deletions(-) diff --git a/dominion-pax-exam-driver/pom.xml b/dominion-pax-exam-driver/pom.xml index a3dba60..472b59a 100644 --- a/dominion-pax-exam-driver/pom.xml +++ b/dominion-pax-exam-driver/pom.xml @@ -124,12 +124,6 @@ javax.inject javax.inject - - - junit - junit - - org.codice.test spock-all diff --git a/dominion-pax-exam-invokers/pom.xml b/dominion-pax-exam-invokers/pom.xml index 907a901..d9a1c27 100644 --- a/dominion-pax-exam-invokers/pom.xml +++ b/dominion-pax-exam-invokers/pom.xml @@ -77,12 +77,6 @@ org.ops4j.pax.swissbox pax-swissbox-tracker - - - junit - junit - - org.codice.test spock-all diff --git a/dominion-pax-exam-options/pom.xml b/dominion-pax-exam-options/pom.xml index 592c477..95a6872 100644 --- a/dominion-pax-exam-options/pom.xml +++ b/dominion-pax-exam-options/pom.xml @@ -58,12 +58,6 @@ org.ops4j.pax.exam pax-exam-container-karaf - - - junit - junit - - org.codice.test spock-all diff --git a/dominion-pax-exam/pom.xml b/dominion-pax-exam/pom.xml index d3c799d..1336e4f 100644 --- a/dominion-pax-exam/pom.xml +++ b/dominion-pax-exam/pom.xml @@ -59,12 +59,6 @@ org.ops4j.pax.exam pax-exam-container-karaf - - - junit - junit - - org.codice.test spock-all diff --git a/dominion/pom.xml b/dominion/pom.xml index 09ecfdf..000411e 100644 --- a/dominion/pom.xml +++ b/dominion/pom.xml @@ -63,12 +63,6 @@ com.google.code.gson gson - - - junit - junit - - org.codice.test spock-all diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml index 324948b..3873e53 100644 --- a/maven-extensions/pom.xml +++ b/maven-extensions/pom.xml @@ -48,12 +48,6 @@ org.ops4j.pax.url pax-url-aether - - - - - - org.codice.test spock-all diff --git a/pax-exam-extensions/pom.xml b/pax-exam-extensions/pom.xml index d33f202..7c5c42c 100644 --- a/pax-exam-extensions/pom.xml +++ b/pax-exam-extensions/pom.xml @@ -80,12 +80,6 @@ org.apache.karaf.features org.apache.karaf.features.core - - - junit - junit - - org.codice.test spock-all diff --git a/pom.xml b/pom.xml index 4f22fa5..38b291c 100644 --- a/pom.xml +++ b/pom.xml @@ -310,11 +310,6 @@ hamcrest-core ${hamcrest-all.version} - - junit - junit - ${junit.version} - org.mockito mockito-core From 086064559265c6105a4ee4e3325891ebc151e22a Mon Sep 17 00:00:00 2001 From: zkirksey Date: Mon, 27 Jan 2025 18:27:50 -0500 Subject: [PATCH 4/4] Additional clean-up --- .../codice/pax/exam/junit/rules/ServiceAdmin.java | 6 +++--- pom.xml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java b/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java index b6fe28b..97b9366 100644 --- a/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java +++ b/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java @@ -228,7 +228,7 @@ public boolean isRepositoryUriBlacklisted(URI uri) { @Override public Feature[] repositoryProvidedFeatures(URI uri) throws Exception { - return new Feature[0]; + return service(FeaturesService.class).repositoryProvidedFeatures(uri); } /** @@ -985,8 +985,8 @@ public ServiceRegistration registerService( @Override public ServiceRegistration registerService( - Class aClass, ServiceFactory serviceFactory, Dictionary dictionary) { - return null; + Class clazz, ServiceFactory serviceFactory, Dictionary properties) { + return service(BundleContext.class).registerService(clazz, serviceFactory, properties); } @Override diff --git a/pom.xml b/pom.xml index 38b291c..77952ee 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,11 @@ 21 21 - 0.4-SNAPSHOT + 0.3 2.6 3.8 - 2.14.0 + 2.15.0 1.6 1.18 1.7.0 @@ -62,8 +62,8 @@ 4.5.6 4.4.10 - 7.0.0 - 4.4.6 + 8.0.0 + 4.4.5 1.9.26 4.12.0 1.8.2 @@ -79,7 +79,7 @@ 5.5.0 2.22.2 - 3.30.2-GA + 3.27.0-GA refs/remotes/origin/master @@ -89,7 +89,7 @@ 0.8.12 - 1.5.0 + 1.4.0 @@ -433,7 +433,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.6.0 + 3.0.0 com.coveo