Skip to content

Commit 09f08b6

Browse files
author
Vincent Potucek
committed
(re)activate maven.compiler.release thus consolidate spotless-maven-plugin, impsort-maven-plugin, and PMD to fix UnnecessaryImport
1 parent a2e30b6 commit 09f08b6

File tree

54 files changed

+183
-839
lines changed

Some content is hidden

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

54 files changed

+183
-839
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>

‎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;

‎extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientBuildItem.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import org.jboss.jandex.DotName;
88

99
import io.quarkus.builder.item.MultiBuildItem;
10-
import io.quarkus.grpc.deployment.GrpcClientBuildItem.ClientInfo;
11-
import io.quarkus.grpc.deployment.GrpcClientBuildItem.ClientType;
1210

1311
public final class GrpcClientBuildItem extends MultiBuildItem {
1412

‎extensions/kubernetes/spi/src/test/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItemTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
*/
1414
package io.quarkus.kubernetes.spi;
1515

16-
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.create;
1716
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.configmap;
1817
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.secret;
1918
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.EnvType.var;
19+
import static io.quarkus.kubernetes.spi.KubernetesEnvBuildItem.create;
2020
import static org.junit.jupiter.api.Assertions.assertEquals;
2121
import static org.junit.jupiter.api.Assertions.assertNull;
2222

‎extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingTransactionManager.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import org.jboss.logging.Logger;
2020

21-
import io.quarkus.narayana.jta.runtime.TransactionScopedNotifier.TransactionId;
22-
2321
/**
2422
* A delegating transaction manager which receives an instance of Narayana transaction manager
2523
* and delegates all calls to it.

‎extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/metrics/BaseJvmMetricsTest.java‎

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

3-
import static io.opentelemetry.sdk.metrics.data.MetricDataType.*;
43
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
54

65
import java.util.List;

‎extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OTelExporterRecorder.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@
4343
import io.quarkus.opentelemetry.runtime.config.build.OTelBuildConfig;
4444
import io.quarkus.opentelemetry.runtime.config.runtime.BatchSpanProcessorConfig;
4545
import io.quarkus.opentelemetry.runtime.config.runtime.OTelRuntimeConfig;
46-
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.*;
46+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.CompressionType;
47+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterConfig;
48+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterLogsConfig;
49+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterMetricsConfig;
50+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterRuntimeConfig;
51+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterTracesConfig;
4752
import io.quarkus.opentelemetry.runtime.exporter.otlp.logs.NoopLogRecordExporter;
4853
import io.quarkus.opentelemetry.runtime.exporter.otlp.logs.VertxGrpcLogRecordExporter;
4954
import io.quarkus.opentelemetry.runtime.exporter.otlp.logs.VertxHttpLogRecordExporter;

‎extensions/opentelemetry/runtime/src/test/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProviderTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010

1111
import org.junit.jupiter.api.Test;
1212

13-
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.*;
13+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.CompressionType;
14+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterLogsConfig;
15+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterMetricsConfig;
16+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterRuntimeConfig;
17+
import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterTracesConfig;
1418

1519
class OtlpExporterProviderTest {
1620

0 commit comments

Comments
 (0)