Skip to content

Commit 78cdabd

Browse files
author
Vincent Potucek
committed
(re)activate maven.compiler.release property thus consolidate spotless-maven-plugin, impsort-maven-plugin, and PMD to fix UnnecessaryImport
1 parent 7e64426 commit 78cdabd

File tree

108 files changed

+180
-895
lines changed

Some content is hidden

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

108 files changed

+180
-895
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ updates:
8787
- dependency-name: org.codehaus.mojo:*
8888
- dependency-name: io.fabric8:docker-maven-plugin
8989
- dependency-name: net.revelc.code.formatter:formatter-maven-plugin
90-
- dependency-name: net.revelc.code:impsort-maven-plugin
90+
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
9191
- dependency-name: eu.maveniverse.maven.njord:*
9292
# Narayana
9393
- dependency-name: org.jboss.narayana.jta:*

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,6 @@ in `quarkus-parent` (root `pom.xml`).
406406

407407
When contributing to Quarkus, it is recommended to respect the following rules.
408408

409-
> **Note:** The `impsort-maven-plugin` uses the `.cache` directory on each module to speed up the build.
410-
> Because we have configured the plugin to store in a versioned directory, you may notice over time that the `.cache` directory grows in size. You can safely delete the `.cache` directory in each module to reclaim the space.
411-
> Running `./mvnw clean -Dclean-cache` automatically deletes that directory for you.
412-
413409
**Contributing to an extension**
414410

415411
When you contribute to an extension, after having applied your changes, run:

‎build-parent/pom.xml‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -673,96 +673,11 @@
673673
<artifactId>smallrye-certificate-generator-maven-plugin</artifactId>
674674
<version>${smallrye-certificate-generator.version}</version>
675675
</plugin>
676-
<plugin>
677-
<groupId>com.diffplug.spotless</groupId>
678-
<artifactId>spotless-maven-plugin</artifactId>
679-
<version>2.44.4</version>
680-
</plugin>
681676
</plugins>
682677
</pluginManagement>
683678
</build>
684679

685680
<profiles>
686-
<profile>
687-
<id>format</id>
688-
<activation>
689-
<activeByDefault>true</activeByDefault>
690-
<property>
691-
<name>!no-format</name>
692-
</property>
693-
</activation>
694-
<build>
695-
<plugins>
696-
<plugin>
697-
<groupId>net.revelc.code.formatter</groupId>
698-
<artifactId>formatter-maven-plugin</artifactId>
699-
<executions>
700-
<execution>
701-
<phase>process-sources</phase>
702-
<goals>
703-
<goal>format</goal>
704-
</goals>
705-
</execution>
706-
</executions>
707-
</plugin>
708-
<plugin>
709-
<groupId>net.revelc.code</groupId>
710-
<artifactId>impsort-maven-plugin</artifactId>
711-
<configuration>
712-
<removeUnused>true</removeUnused>
713-
</configuration>
714-
<executions>
715-
<execution>
716-
<id>sort-imports</id>
717-
<goals>
718-
<goal>sort</goal>
719-
</goals>
720-
</execution>
721-
</executions>
722-
</plugin>
723-
</plugins>
724-
</build>
725-
</profile>
726-
<profile>
727-
<id>validate</id>
728-
<activation>
729-
<activeByDefault>true</activeByDefault>
730-
<property>
731-
<name>no-format</name>
732-
</property>
733-
</activation>
734-
<build>
735-
<plugins>
736-
<plugin>
737-
<groupId>net.revelc.code.formatter</groupId>
738-
<artifactId>formatter-maven-plugin</artifactId>
739-
<executions>
740-
<execution>
741-
<phase>process-sources</phase>
742-
<goals>
743-
<goal>validate</goal>
744-
</goals>
745-
</execution>
746-
</executions>
747-
</plugin>
748-
<plugin>
749-
<groupId>net.revelc.code</groupId>
750-
<artifactId>impsort-maven-plugin</artifactId>
751-
<configuration>
752-
<removeUnused>true</removeUnused>
753-
</configuration>
754-
<executions>
755-
<execution>
756-
<id>check-imports</id>
757-
<goals>
758-
<goal>check</goal>
759-
</goals>
760-
</execution>
761-
</executions>
762-
</plugin>
763-
</plugins>
764-
</build>
765-
</profile>
766681

767682
<profile>
768683
<id>format-kotlin</id>

‎core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DeploymentDependencyConvergenceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.quarkus.bootstrap.model.ApplicationModel;
1010
import io.quarkus.bootstrap.resolver.TsArtifact;
1111
import io.quarkus.bootstrap.resolver.TsQuarkusExt;
12-
import io.quarkus.maven.dependency.*;
12+
1313

1414
public class DeploymentDependencyConvergenceTest extends BootstrapFromOriginalJarTestBase {
1515

‎devtools/maven/src/main/java/io/quarkus/maven/DependencySbomMojo.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.quarkus.maven;
22

33
import java.io.File;
4-
import java.nio.file.*;
54
import java.util.List;
65

76
import org.apache.maven.execution.MavenSession;

‎devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.quarkus.maven;
22

33
import static io.quarkus.analytics.dto.segment.TrackEventType.DEV_MODE;
4-
import static io.quarkus.maven.QuarkusBootstrapMojo.CLOSE_BOOTSTRAPPED_APP_PARAM;
5-
import static io.quarkus.maven.QuarkusBootstrapMojo.MODE_PARAM;
64
import static io.smallrye.common.expression.Expression.Flag.LENIENT_SYNTAX;
75
import static io.smallrye.common.expression.Expression.Flag.NO_TRIM;
86
import static java.util.Collections.emptyMap;

‎devtools/maven/src/main/java/io/quarkus/maven/components/MavenVersionEnforcer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import javax.inject.Named;
99

1010
import org.apache.commons.lang3.StringUtils;
11-
import org.apache.maven.artifact.versioning.*;
1211
import org.apache.maven.execution.MavenSession;
1312
import org.apache.maven.plugin.MojoExecutionException;
1413
import org.apache.maven.plugin.logging.Log;

‎extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/ValidationQueryTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import jakarta.inject.Inject;
1010

11-
import org.junit.jupiter.api.*;
1211
import org.junit.jupiter.api.extension.RegisterExtension;
1312

1413
import io.agroal.api.AgroalDataSource;

‎extensions/cyclonedx/generator/src/main/java/io/quarkus/cyclonedx/generator/CycloneDxSbomGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.net.URISyntaxException;
99
import java.nio.file.Files;
1010
import java.nio.file.Path;
11-
import java.util.*;
1211

1312
import org.apache.commons.lang3.StringUtils;
1413
import org.apache.maven.model.MailingList;

‎extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/FunctionInvoker.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.quarkus.funqy.runtime;
22

33
import java.lang.annotation.Annotation;
4-
import java.lang.reflect.*;
54
import java.util.ArrayList;
65
import java.util.Map;
76
import java.util.concurrent.ConcurrentHashMap;

0 commit comments

Comments
 (0)