Skip to content

Commit c6539d2

Browse files
lukasjm0mus
authored andcommitted
#465: fix min required execution environment
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent fdad7f1 commit c6539d2

File tree

5 files changed

+29
-57
lines changed

5 files changed

+29
-57
lines changed

gimap/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
com.sun.mail.gimap.GmailProvider, com.sun.mail.gimap.GmailSSLProvider;
2222

2323
requires jakarta.mail;
24+
requires jakarta.activation;
2425
requires java.logging;
2526
requires java.security.sasl;
2627
requires com.sun.mail.imap;

imap/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,20 @@
4141
com.sun.mail.iap; version=${mail.osgiversion}
4242
</mail.packages.export>
4343
</properties>
44+
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<artifactId>maven-compiler-plugin</artifactId>
49+
<executions>
50+
<execution>
51+
<id>default-compile</id>
52+
<configuration>
53+
<skipMain>false</skipMain>
54+
</configuration>
55+
</execution>
56+
</executions>
57+
</plugin>
58+
</plugins>
59+
</build>
4460
</project>

imap/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
com.sun.mail.imap.IMAPProvider, com.sun.mail.imap.IMAPSSLProvider;
2323

2424
requires jakarta.mail;
25+
requires jakarta.activation;
2526
requires java.logging;
2627
requires java.security.sasl;
2728
}

mail/pom.xml

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -105,36 +105,6 @@
105105
</build>
106106
</profile>
107107

108-
<!--
109-
A special profile used when compiling with the real JDK 11 compiler.
110-
Override the release setting from the parent's "11" profile so
111-
that we produce JDK 1.8 compatible class files.
112-
-->
113-
<profile>
114-
<id>11</id>
115-
<activation>
116-
<jdk>11</jdk>
117-
</activation>
118-
<build>
119-
<plugins>
120-
<plugin>
121-
<artifactId>maven-compiler-plugin</artifactId>
122-
<configuration>
123-
<release combine.self="override"></release>
124-
<compilerArgs>
125-
<arg>-Xlint</arg>
126-
<arg>-Xlint:-options</arg>
127-
<arg>-Xlint:-path</arg>
128-
<!--
129-
Too many finalize warnings.
130-
<arg>-Werror</arg>
131-
-->
132-
</compilerArgs>
133-
</configuration>
134-
</plugin>
135-
</plugins>
136-
</build>
137-
</profile>
138108
</profiles>
139109

140110
<build>
@@ -155,21 +125,14 @@
155125
<plugin>
156126
<artifactId>maven-compiler-plugin</artifactId>
157127
<configuration>
158-
<source>1.8</source>
159-
<target>1.8</target>
160128
<compilerArgs>
161129
<arg>-Xlint</arg>
162130
<arg>-Xlint:-options</arg>
163131
<arg>-Xlint:-path</arg>
164-
<arg>-Werror</arg>
132+
<!--<arg>-Werror</arg>-->
165133
</compilerArgs>
166134
<showDeprecation>true</showDeprecation>
167135
<showWarnings>true</showWarnings>
168-
<excludes>
169-
<exclude>
170-
module-info.java
171-
</exclude>
172-
</excludes>
173136
</configuration>
174137
</plugin>
175138

pom.xml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,16 @@
264264
<execution>
265265
<id>default-compile</id>
266266
<configuration>
267-
<source>1.8</source>
268-
<target>1.8</target>
267+
<release>9</release>
268+
</configuration>
269+
</execution>
270+
<execution>
271+
<id>base-compile</id>
272+
<goals>
273+
<goal>compile</goal>
274+
</goals>
275+
<configuration>
276+
<release>8</release>
269277
<excludes>
270278
<exclude>module-info.java</exclude>
271279
</excludes>
@@ -280,18 +288,6 @@
280288
</compilerArgs>
281289
</configuration>
282290
</execution>
283-
<execution>
284-
<id>module-info-compile</id>
285-
<goals>
286-
<goal>compile</goal>
287-
</goals>
288-
<configuration>
289-
<release>9</release>
290-
<includes>
291-
<include>module-info.java</include>
292-
</includes>
293-
</configuration>
294-
</execution>
295291
<execution>
296292
<id>default-testCompile</id>
297293
<configuration>
@@ -450,11 +446,6 @@
450446
https://issues.apache.org/jira/browse/MCOMPILER-209
451447
-->
452448
<useIncrementalCompilation>false</useIncrementalCompilation>
453-
<excludes>
454-
<exclude>
455-
module-info.java
456-
</exclude>
457-
</excludes>
458449
</configuration>
459450
</execution>
460451
<execution>

0 commit comments

Comments
 (0)