Skip to content

Commit 8c7316f

Browse files
committed
Fix warnings in build output
Add @SuppressWarnings annotations for deprecated and removal APIs across multiple modules. Update ExtendedFormEditor to use current JFaceResources API methods (destroy/create instead of destroyImage/createImage). Remove deprecated servicefactory parameter from Component annotation in test. fix gradle-plugin warnings fix JUnit deprecation warning Update ArgumentsProvider to match JUnit 5.10+ API JUnit Jupiter's ArgumentsProvider interface changed to include a ParameterDeclarations parameter in the provideArguments method. Update three test classes that implement custom argument providers to match the new signature. try to fix maven deprecation warnings Replace Maven @component with @Inject in Maven plugins Update all Maven plugin mojos to use standard JSR-330 @Inject annotation instead of Maven-specific @component annotation. This removes the warnings and uses the dependency injection approach to use standard Java conventions supported by Maven 3.9+. See https://maven.apache.org/maven-jsr330.html#how-to-use-jsr-330-in-plugins Clean up resource management and remove unused code Wrap P2Indexer instantiations in try-with-resources for proper cleanup, remove unused imports Changes: - Wrap P2Indexer objects in try-with-resources blocks to ensure cleanup - Move AssertJ SoftAssertions imports to group with test configuration - Remove unused imports (java.util.Map, org.apache.maven.project.MavenProjectHelper) - Remove unused FEATURE_PATTERN constant from R5LabelFormatter - Fix minor whitespace inconsistencies Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
1 parent cdd3fe3 commit 8c7316f

35 files changed

Lines changed: 960 additions & 933 deletions

File tree

biz.aQute.bnd/src/aQute/bnd/main/bnd.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,6 +1470,7 @@ interface releaseOptions extends Options {
14701470
*
14711471
* @throws Exception
14721472
*/
1473+
@SuppressWarnings("removal")
14731474
@Description("Release this project")
14741475
public void _release(releaseOptions options) throws Exception {
14751476
Set<Project> projects = new LinkedHashSet<>();

biz.aQute.bndlib.tests/test/test/AnalysisPluginTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.io.File;
77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

1110
import org.junit.jupiter.api.Test;
1211

biz.aQute.bndlib.tests/test/test/BuilderTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.junit.jupiter.params.provider.Arguments;
5353
import org.junit.jupiter.params.provider.ArgumentsProvider;
5454
import org.junit.jupiter.params.provider.ArgumentsSource;
55+
import org.junit.jupiter.params.support.ParameterDeclarations;
5556

5657
import aQute.bnd.build.model.EE;
5758
import aQute.bnd.header.Attrs;
@@ -1191,7 +1192,8 @@ public void testEEMacro2(String pkg, String bree, String osgiee, String version)
11911192

11921193
static class CompilerVersionsArgumentsProvider implements ArgumentsProvider {
11931194
@Override
1194-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
1195+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context)
1196+
throws Exception {
11951197
FileTree tree = new FileTree();
11961198
Stream<File> files = tree.stream(new File("compilerversions/src"), "*");
11971199
return files.filter(File::isDirectory)

biz.aQute.bndlib.tests/test/test/ClassReferenceTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.junit.jupiter.params.provider.Arguments;
1717
import org.junit.jupiter.params.provider.ArgumentsProvider;
1818
import org.junit.jupiter.params.provider.ArgumentsSource;
19+
import org.junit.jupiter.params.support.ParameterDeclarations;
1920

2021
import aQute.bnd.build.model.EE;
2122
import aQute.bnd.osgi.Builder;
@@ -60,7 +61,8 @@ public void classReferences(String pkg) throws Exception {
6061

6162
static class CompilerVersionsArgumentsProvider implements ArgumentsProvider {
6263
@Override
63-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
64+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context)
65+
throws Exception {
6466
FileTree tree = new FileTree();
6567
Stream<File> files = tree.stream(new File("compilerversions/src"), "*");
6668
return files.filter(File::isDirectory)
@@ -79,7 +81,8 @@ public void checkEEFor(Clazz.JAVA java) throws Exception {
7981

8082
static class JAVAArgumentsProvider implements ArgumentsProvider {
8183
@Override
82-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
84+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context)
85+
throws Exception {
8386
Clazz.JAVA[] values = Clazz.JAVA.values();
8487
return Arrays.stream(values, 0, values.length - 1)
8588
.map(Arguments::of);

biz.aQute.bndlib.tests/test/test/component/DSAnnotationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ public void run() {
676676

677677
@Component(service = Object.class, configurationPolicy = ConfigurationPolicy.IGNORE, enabled = false, factory = "factory", immediate = false, name = "name", property = {
678678
"a=1", "a=2", "b=3"
679-
}, properties = "resource.props", servicefactory = false, configurationPid = "configuration-pid", xmlns = "xmlns")
679+
}, properties = "resource.props", scope = ServiceScope.SINGLETON, configurationPid = "configuration-pid", xmlns = "xmlns")
680680
public static class Explicit_basic implements Serializable, Runnable {
681681
private static final long serialVersionUID = 1L;
682682

biz.aQute.bndlib.tests/test/test/model/EETest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.junit.jupiter.params.provider.Arguments;
1515
import org.junit.jupiter.params.provider.ArgumentsProvider;
1616
import org.junit.jupiter.params.provider.ArgumentsSource;
17+
import org.junit.jupiter.params.support.ParameterDeclarations;
1718

1819
import aQute.bnd.build.model.EE;
1920
import aQute.bnd.osgi.Clazz;
@@ -33,7 +34,8 @@ public void highestFromTargetVersion(String label, EE ee) throws Exception {
3334

3435
static class EEVersionsArgumentsProvider implements ArgumentsProvider {
3536
@Override
36-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
37+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context)
38+
throws Exception {
3739
EE[] values = EE.values();
3840
return Arrays.stream(values, 0, values.length - 1)
3941
.filter(ee -> ee.getCapabilityName()
@@ -161,7 +163,8 @@ public void testEEIsJDKPackage() {
161163

162164
static class EEsArgumentsProvider implements ArgumentsProvider {
163165
@Override
164-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
166+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context)
167+
throws Exception {
165168
EE[] values = EE.values();
166169
return Arrays.stream(values, 0, values.length - 1)
167170
.filter(ee -> ee.getCapabilityName()
@@ -172,7 +175,8 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) th
172175

173176
static class ModularEEsArgumentsProvider implements ArgumentsProvider {
174177
@Override
175-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
178+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context)
179+
throws Exception {
176180
EE[] values = EE.values();
177181
return Arrays.stream(values, 0, values.length - 1)
178182
.filter(ee -> ee.compareTo(EE.JavaSE_1_8) > 0)

biz.aQute.bndlib/src/aQute/bnd/build/ProjectTester.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public abstract class ProjectTester {
2222
private boolean continuous = true;
2323
private boolean terminate = true;
2424

25+
@SuppressWarnings("deprecation")
2526
public ProjectTester(Project project) throws Exception {
2627
this.project = project;
2728
launcher = project.getProjectLauncher();

biz.aQute.repository/src/aQute/bnd/repository/maven/pom/provider/BndPomRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public void prepare() {
106106
prepared.get(); // start preparation
107107
}
108108

109+
@SuppressWarnings("removal")
109110
private Promise<Boolean> preparePromise() {
110111
if (configuration.name() == null) {
111112
status("Must get a name");

biz.aQute.repository/src/aQute/bnd/repository/maven/provider/Configuration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,6 @@ public interface Configuration {
9797
/**
9898
* @return SonatypeMode for this repository none, manual or autopublish
9999
*/
100+
@SuppressWarnings("removal")
100101
SonatypeMode sonatypeMode(String deflt);
101102
}

biz.aQute.repository/src/aQute/bnd/repository/maven/provider/MavenBndRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,7 @@ synchronized boolean init() {
662662
List<MavenBackingRepository> snapshot = new ArrayList<MavenBackingRepository>();
663663

664664
String releaseUrl = configuration.releaseUrl();
665+
@SuppressWarnings("removal")
665666
SonatypeMode sonatypeMode = configuration.sonatypeMode(SonatypeMode.NONE.name());
666667

667668
String stagingUrl = configuration.stagingUrl();

0 commit comments

Comments
 (0)