Skip to content

Commit 0ef78fd

Browse files
Bump parent from 42 to 45
- bump parent - fix checkstyle issues - fix ITs - disable ci-friendly-multi-module IT for Maven 4
1 parent dfe917c commit 0ef78fd

File tree

16 files changed

+105
-104
lines changed

16 files changed

+105
-104
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ updates:
2121
directory: "/"
2222
schedule:
2323
interval: "daily"
24-
ignore:
25-
# Ignore Maven Core updates
26-
- dependency-name: "org.apache.maven:*"
2724
- package-ecosystem: "github-actions"
2825
directory: "/"
2926
schedule:

maven-release-manager/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030

3131
<name>Maven Release Manager</name>
3232

33+
<properties>
34+
<checkstyle.violation.ignore>FileLength</checkstyle.violation.ignore>
35+
</properties>
36+
3337
<dependencies>
3438
<dependency>
3539
<groupId>org.apache.maven.release</groupId>

maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ public void delete(ReleaseDescriptor config) {
137137
* @param file a {@link java.io.File} object
138138
* @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
139139
*/
140+
@SuppressWarnings("checkstyle:MethodLength")
140141
public void write(BuilderReleaseDescriptor config, File file) throws ReleaseDescriptorStoreException {
141142
Properties properties = new Properties();
142143
properties.setProperty("completedPhase", config.getCompletedPhase());

maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,7 @@ private void rewriteArtifactVersion(
608608
* @param releaseDescriptor
609609
* @return {@code true} if the property was rewritten, otherwise {@code false}
610610
*/
611+
@SuppressWarnings("checkstyle:ParameterNumber")
611612
boolean rewritePropertyUsedInVersionExpression(
612613
String projectKey,
613614
String artifactKey,

maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ public void testRewriteBasicPomWithNoSuchProviderException() throws Exception {
519519
ScmManager scmManager = (ScmManager) lookup(ScmManager.class);
520520
if (scmManager instanceof ScmManagerStub) {
521521
((ScmManagerStub) scmManager).setException(new NoSuchScmProviderException("..."));
522-
;
523522
}
524523

525524
// execute

maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void setUp() throws Exception {
6868
@Test
6969
public void testNoSnapshotDependencies() throws Exception {
7070
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
71-
;
71+
7272
List<MavenProject> reactorProjects = createDescriptorFromProjects("no-snapshot-dependencies");
7373

7474
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
@@ -609,7 +609,7 @@ public void testSnapshotDependenciesInsideAndOutsideProject() throws Exception {
609609
@Test
610610
public void testNoSnapshotReportPlugins() throws Exception {
611611
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
612-
;
612+
613613
List<MavenProject> reactorProjects = createDescriptorFromProjects("no-snapshot-report-plugins");
614614

615615
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
@@ -699,7 +699,7 @@ public void testSnapshotReportPluginsInsideAndOutsideProject() throws Exception
699699
@Test
700700
public void testNoSnapshotPlugins() throws Exception {
701701
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
702-
;
702+
703703
List<MavenProject> reactorProjects = createDescriptorFromProjects("no-snapshot-plugins");
704704

705705
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
@@ -910,7 +910,7 @@ public void testSnapshotExternalParentAdjusted() throws Exception {
910910
@Test
911911
public void testReleaseExternalParent() throws Exception {
912912
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
913-
;
913+
914914
List<MavenProject> reactorProjects = createDescriptorFromProjects("external-parent/child");
915915

916916
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
@@ -968,7 +968,7 @@ public void testSnapshotInternalExtension() throws Exception {
968968
@Test
969969
public void testReleaseExternalExtension() throws Exception {
970970
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
971-
;
971+
972972
List<MavenProject> reactorProjects = createDescriptorFromProjects("external-extension");
973973

974974
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
@@ -1088,7 +1088,7 @@ private static class VersionPair {
10881088

10891089
String developmentVersion;
10901090

1091-
public VersionPair(String releaseVersion, String developmentVersion) {
1091+
VersionPair(String releaseVersion, String developmentVersion) {
10921092
this.releaseVersion = releaseVersion;
10931093
this.developmentVersion = developmentVersion;
10941094
}

maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java

Lines changed: 68 additions & 73 deletions
Large diffs are not rendered by default.

maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomBuildTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public void testFlushPluginMap() {
8484
@Test(expected = UnsupportedOperationException.class)
8585
public void testAddExtension() {
8686
new JDomBuild(null).addExtension(null);
87-
;
8887
}
8988

9089
@Test(expected = UnsupportedOperationException.class)
@@ -120,7 +119,6 @@ public void testRemoveExtension() {
120119
@Test(expected = UnsupportedOperationException.class)
121120
public void testSetExtensions() {
122121
new JDomBuild(null).setExtensions(null);
123-
;
124122
}
125123

126124
@Test(expected = UnsupportedOperationException.class)

maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomDependencyTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,25 +106,21 @@ public void testGetVersion() throws Exception {
106106
@Test(expected = UnsupportedOperationException.class)
107107
public void testRemoveExclusion() {
108108
new JDomDependency(null).removeExclusion(null);
109-
;
110109
}
111110

112111
@Test(expected = UnsupportedOperationException.class)
113112
public void testSetArtifactIdString() {
114113
new JDomDependency(null).setArtifactId(null);
115-
;
116114
}
117115

118116
@Test(expected = UnsupportedOperationException.class)
119117
public void testSetClassifierString() {
120118
new JDomDependency(null).setClassifier(null);
121-
;
122119
}
123120

124121
@Test(expected = UnsupportedOperationException.class)
125122
public void testSetExclusions() {
126123
new JDomDependency(null).setExclusions(null);
127-
;
128124
}
129125

130126
@Test(expected = UnsupportedOperationException.class)

maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomParentTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import org.jdom2.input.SAXBuilder;
2727
import org.junit.Test;
2828

29-
import static org.junit.Assert.*;
29+
import static org.junit.Assert.assertEquals;
30+
import static org.junit.Assert.assertNull;
3031

3132
public class JDomParentTest {
3233
private SAXBuilder builder = new SAXBuilder();

0 commit comments

Comments
 (0)