Skip to content

Commit ccfcbc7

Browse files
[MRESOLVER-715] Bump org.apache.maven:maven-parent from 42 to 44 (#711)
* Bump org.apache.maven:maven-parent from 42 to 44 Bumps [org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 42 to 44. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits/v44) --- updated-dependencies: - dependency-name: org.apache.maven:maven-parent dependency-version: '44' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Fix checkstyle --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Slawomir Jaranowski <[email protected]>
1 parent 2e21caa commit ccfcbc7

File tree

124 files changed

+677
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+677
-473
lines changed

maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import org.junit.Test;
2424

25-
import static org.junit.Assert.*;
25+
import static org.junit.Assert.assertNotNull;
2626

2727
public class AbstractForwardingRepositorySystemSessionTest {
2828

maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import org.junit.Test;
2424

25-
import static org.junit.Assert.*;
25+
import static org.junit.Assert.assertNotNull;
2626

2727
/**
2828
*/

maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323

2424
import org.junit.Test;
2525

26-
import static org.junit.Assert.*;
26+
import static org.junit.Assert.assertEquals;
27+
import static org.junit.Assert.assertNull;
2728

2829
public class DefaultRepositoryCacheTest {
2930

@@ -40,12 +41,12 @@ private void put(Object key, Object value) {
4041
}
4142

4243
@Test(expected = RuntimeException.class)
43-
public void testGet_NullKey() {
44+
public void testGetNullKey() {
4445
get(null);
4546
}
4647

4748
@Test(expected = RuntimeException.class)
48-
public void testPut_NullKey() {
49+
public void testPutNullKey() {
4950
put(null, "data");
5051
}
5152

maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424

2525
import org.junit.Test;
2626

27-
import static org.junit.Assert.*;
27+
import static org.junit.Assert.assertEquals;
28+
import static org.junit.Assert.assertFalse;
29+
import static org.junit.Assert.assertNull;
30+
import static org.junit.Assert.assertTrue;
2831

2932
public class DefaultSessionDataTest {
3033

@@ -47,12 +50,12 @@ private Object computeIfAbsent(Object key, Supplier<Object> supplier) {
4750
}
4851

4952
@Test(expected = RuntimeException.class)
50-
public void testGet_NullKey() {
53+
public void testGetNullKey() {
5154
get(null);
5255
}
5356

5457
@Test(expected = RuntimeException.class)
55-
public void testSet_NullKey() {
58+
public void testSetNullKey() {
5659
set(null, "data");
5760
}
5861

maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -96,33 +96,33 @@ private RemoteRepository newRepo() {
9696
}
9797

9898
@Test
99-
public void testArtifactDescriptorException_Serializable() {
99+
public void testArtifactDescriptorExceptionSerializable() {
100100
ArtifactDescriptorRequest request = new ArtifactDescriptorRequest();
101101
request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace());
102102
ArtifactDescriptorResult result = new ArtifactDescriptorResult(request);
103103
assertSerializable(new ArtifactDescriptorException(result));
104104
}
105105

106106
@Test
107-
public void testArtifactResolutionException_Serializable() {
107+
public void testArtifactResolutionExceptionSerializable() {
108108
ArtifactRequest request = new ArtifactRequest();
109109
request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace());
110110
ArtifactResult result = new ArtifactResult(request);
111111
assertSerializable(new ArtifactResolutionException(Arrays.asList(result)));
112112
}
113113

114114
@Test
115-
public void testArtifactTransferException_Serializable() {
115+
public void testArtifactTransferExceptionSerializable() {
116116
assertSerializable(new ArtifactTransferException(newArtifact(), newRepo(), "error"));
117117
}
118118

119119
@Test
120-
public void testArtifactNotFoundException_Serializable() {
120+
public void testArtifactNotFoundExceptionSerializable() {
121121
assertSerializable(new ArtifactNotFoundException(newArtifact(), newRepo(), "error"));
122122
}
123123

124124
@Test
125-
public void testDependencyCollectionException_Serializable() {
125+
public void testDependencyCollectionExceptionSerializable() {
126126
CollectRequest request = new CollectRequest();
127127
request.addDependency(new Dependency(newArtifact(), "compile"));
128128
request.addRepository(newRepo());
@@ -132,7 +132,7 @@ public void testDependencyCollectionException_Serializable() {
132132
}
133133

134134
@Test
135-
public void testDependencyResolutionException_Serializable() {
135+
public void testDependencyResolutionExceptionSerializable() {
136136
CollectRequest request = new CollectRequest();
137137
request.addDependency(new Dependency(newArtifact(), "compile"));
138138
request.addRepository(newRepo());
@@ -145,56 +145,56 @@ public void testDependencyResolutionException_Serializable() {
145145
}
146146

147147
@Test
148-
public void testMetadataTransferException_Serializable() {
148+
public void testMetadataTransferExceptionSerializable() {
149149
assertSerializable(new MetadataTransferException(newMetadata(), newRepo(), "error"));
150150
}
151151

152152
@Test
153-
public void testMetadataNotFoundException_Serializable() {
153+
public void testMetadataNotFoundExceptionSerializable() {
154154
assertSerializable(new MetadataNotFoundException(newMetadata(), newRepo(), "error"));
155155
}
156156

157157
@Test
158-
public void testNoLocalRepositoryManagerException_Serializable() {
158+
public void testNoLocalRepositoryManagerExceptionSerializable() {
159159
assertSerializable(new NoLocalRepositoryManagerException(new LocalRepository("/tmp")));
160160
}
161161

162162
@Test
163-
public void testNoRepositoryConnectorException_Serializable() {
163+
public void testNoRepositoryConnectorExceptionSerializable() {
164164
assertSerializable(new NoRepositoryConnectorException(newRepo()));
165165
}
166166

167167
@Test
168-
public void testNoRepositoryLayoutException_Serializable() {
168+
public void testNoRepositoryLayoutExceptionSerializable() {
169169
assertSerializable(new NoRepositoryLayoutException(newRepo()));
170170
}
171171

172172
@Test
173-
public void testNoTransporterException_Serializable() {
173+
public void testNoTransporterExceptionSerializable() {
174174
assertSerializable(new NoTransporterException(newRepo()));
175175
}
176176

177177
@Test
178-
public void testRepositoryOfflineException_Serializable() {
178+
public void testRepositoryOfflineExceptionSerializable() {
179179
assertSerializable(new RepositoryOfflineException(newRepo()));
180180
}
181181

182182
@Test
183-
public void testUnsolvableVersionConflictException_Serializable() {
183+
public void testUnsolvableVersionConflictExceptionSerializable() {
184184
DependencyNode node = new DefaultDependencyNode(new Dependency(newArtifact(), "test"));
185185
assertSerializable(new UnsolvableVersionConflictException(Collections.singleton(Arrays.asList(node))));
186186
}
187187

188188
@Test
189-
public void testVersionResolutionException_Serializable() {
189+
public void testVersionResolutionExceptionSerializable() {
190190
VersionRequest request = new VersionRequest();
191191
request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace());
192192
VersionResult result = new VersionResult(request);
193193
assertSerializable(new VersionResolutionException(result));
194194
}
195195

196196
@Test
197-
public void testVersionRangeResolutionException_Serializable() {
197+
public void testVersionRangeResolutionExceptionSerializable() {
198198
VersionRangeRequest request = new VersionRangeRequest();
199199
request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace());
200200
VersionRangeResult result = new VersionRangeResult(request);

maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
import org.junit.Test;
2222

23-
import static org.junit.Assert.*;
23+
import static org.junit.Assert.assertNotNull;
24+
import static org.junit.Assert.assertSame;
2425

2526
/**
2627
*/

maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525

2626
import org.junit.Test;
2727

28-
import static org.junit.Assert.*;
28+
import static org.junit.Assert.assertEquals;
29+
import static org.junit.Assert.assertFalse;
30+
import static org.junit.Assert.assertNotSame;
31+
import static org.junit.Assert.assertTrue;
2932

3033
/**
3134
*/

maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.eclipse.aether.artifact.DefaultArtifact;
2525
import org.junit.Test;
2626

27-
import static org.junit.Assert.*;
27+
import static org.junit.Assert.assertEquals;
28+
import static org.junit.Assert.assertNotSame;
29+
import static org.junit.Assert.assertSame;
2830

2931
/**
3032
*/

maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
import org.eclipse.aether.RepositorySystemSession;
2626
import org.junit.Test;
2727

28-
import static org.junit.Assert.*;
28+
import static org.junit.Assert.assertArrayEquals;
29+
import static org.junit.Assert.assertEquals;
30+
import static org.junit.Assert.assertNotNull;
31+
import static org.junit.Assert.assertNull;
32+
import static org.junit.Assert.assertSame;
33+
import static org.junit.Assert.fail;
2934

3035
public class AuthenticationContextTest {
3136

@@ -74,7 +79,7 @@ public void testForRepository() {
7479
}
7580

7681
@Test
77-
public void testForRepository_NoAuth() {
82+
public void testForRepositoryNoAuth() {
7883
RepositorySystemSession session = newSession();
7984
RemoteRepository repo = newRepo(null, newProxy(newAuth()));
8085
AuthenticationContext context = AuthenticationContext.forRepository(session, repo);
@@ -96,7 +101,7 @@ public void testForProxy() {
96101
}
97102

98103
@Test
99-
public void testForProxy_NoProxy() {
104+
public void testForProxyNoProxy() {
100105
RepositorySystemSession session = newSession();
101106
Proxy proxy = null;
102107
RemoteRepository repo = newRepo(newAuth(), proxy);
@@ -105,7 +110,7 @@ public void testForProxy_NoProxy() {
105110
}
106111

107112
@Test
108-
public void testForProxy_NoProxyAuth() {
113+
public void testForProxyNoProxyAuth() {
109114
RepositorySystemSession session = newSession();
110115
Proxy proxy = newProxy(null);
111116
RemoteRepository repo = newRepo(newAuth(), proxy);
@@ -114,7 +119,7 @@ public void testForProxy_NoProxyAuth() {
114119
}
115120

116121
@Test
117-
public void testGet_StringVsChars() {
122+
public void testGetStringVsChars() {
118123
AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null));
119124
context.put("key", new char[] {'v', 'a', 'l', '1'});
120125
assertEquals("val1", context.get("key"));
@@ -123,7 +128,7 @@ public void testGet_StringVsChars() {
123128
}
124129

125130
@Test
126-
public void testGet_StringVsFile() {
131+
public void testGetStringVsFile() {
127132
AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null));
128133
context.put("key", "val1");
129134
assertEquals(new File("val1"), context.get("key", File.class));
@@ -132,7 +137,7 @@ public void testGet_StringVsFile() {
132137
}
133138

134139
@Test
135-
public void testPut_EraseCharArrays() {
140+
public void testPutEraseCharArrays() {
136141
AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null));
137142
char[] secret = {'v', 'a', 'l', 'u', 'e'};
138143
context.put("key", secret);
@@ -141,7 +146,7 @@ public void testPut_EraseCharArrays() {
141146
}
142147

143148
@Test
144-
public void testClose_EraseCharArrays() {
149+
public void testCloseEraseCharArrays() {
145150
AuthenticationContext.close(null);
146151

147152
AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null));

maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@
2424
import org.eclipse.aether.RepositorySystemSession;
2525
import org.junit.Test;
2626

27-
import static org.junit.Assert.*;
27+
import static org.junit.Assert.assertEquals;
28+
import static org.junit.Assert.assertNotNull;
29+
import static org.junit.Assert.assertNull;
30+
import static org.junit.Assert.assertSame;
31+
import static org.junit.Assert.assertTrue;
32+
import static org.junit.Assert.fail;
2833

2934
public class AuthenticationDigestTest {
3035

@@ -77,7 +82,7 @@ public void digest(AuthenticationDigest digest) {
7782
}
7883

7984
@Test
80-
public void testForRepository_NoAuth() {
85+
public void testForRepositoryNoAuth() {
8186
RemoteRepository repo = newRepo(null, null);
8287

8388
String digest = AuthenticationDigest.forRepository(newSession(), repo);
@@ -118,15 +123,15 @@ public void digest(AuthenticationDigest digest) {
118123
}
119124

120125
@Test
121-
public void testForProxy_NoProxy() {
126+
public void testForProxyNoProxy() {
122127
RemoteRepository repo = newRepo(null, null);
123128

124129
String digest = AuthenticationDigest.forProxy(newSession(), repo);
125130
assertEquals("", digest);
126131
}
127132

128133
@Test
129-
public void testForProxy_NoProxyAuth() {
134+
public void testForProxyNoProxyAuth() {
130135
RemoteRepository repo = newRepo(null, newProxy(null));
131136

132137
String digest = AuthenticationDigest.forProxy(newSession(), repo);

maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
import org.junit.Before;
2828
import org.junit.Test;
2929

30-
import static org.junit.Assert.*;
30+
import static org.junit.Assert.assertEquals;
31+
import static org.junit.Assert.assertSame;
3132

3233
public class RemoteRepositoryBuilderTest {
3334

maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.junit.Test;
2222

23-
import static org.junit.Assert.*;
23+
import static org.junit.Assert.assertEquals;
2424

2525
/**
2626
*/

maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import org.junit.Test;
2424

25-
import static org.junit.Assert.*;
25+
import static org.junit.Assert.assertNotNull;
2626

2727
/**
2828
*/

maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.eclipse.aether.RepositorySystemSession;
2525
import org.junit.Test;
2626

27-
import static org.junit.Assert.*;
27+
import static org.junit.Assert.assertArrayEquals;
28+
import static org.junit.Assert.assertEquals;
29+
import static org.junit.Assert.assertNotNull;
2830

2931
/**
3032
*/

maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA1;
3636
import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA256;
3737
import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA512;
38-
import static org.junit.Assert.*;
38+
import static org.junit.Assert.assertEquals;
39+
import static org.junit.Assert.assertNotNull;
40+
import static org.junit.Assert.assertTrue;
3941

4042
public class ChecksumCalculatorTest {
4143

0 commit comments

Comments
 (0)