Merge pull request #42017 from gsmet/mailer-java-17

Simplify mailer test setup now that we are Java 17+
quarkusio · Jul 20, 2024 · 92d9a4e · 92d9a4e
2 parents 6ece690 + b5e5cd4
commit 92d9a4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/extensions/mailer/deployment/pom.xml b/extensions/mailer/deployment/pom.xml
@@ -60,42 +60,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>java-17</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-
-            <properties>
-                <maven.compiler.target>17</maven.compiler.target>
-                <maven.compiler.source>17</maven.compiler.source>
-                <maven.compiler.release>17</maven.compiler.release>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-java17-directory</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/java17</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/...uarkus/mailer/MailTemplateRecordTest.java → ...uarkus/mailer/MailTemplateRecordTest.java b/...uarkus/mailer/MailTemplateRecordTest.java → ...uarkus/mailer/MailTemplateRecordTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.inject.Inject;
+
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -10,7 +12,6 @@
 import io.quarkus.qute.CheckedTemplate;
 import io.quarkus.test.QuarkusUnitTest;
 import io.vertx.ext.mail.MailMessage;
-import jakarta.inject.Inject;
 
 public class MailTemplateRecordTest {