Skip to content

Commit ae5f02f

Browse files
authored
Merge pull request #18477 from Bipinkumar27/JAVA-42035
JAVA-42035: Enable core-java-conditionals module
2 parents cdce205 + 0c3c1e3 commit ae5f02f

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
lines changed

core-java-modules/core-java-conditionals/pom.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<name>core-java-conditionals</name>
1010

1111
<parent>
12-
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-modules</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
12+
<groupId>com.baeldung.core-java-modules</groupId>
13+
<artifactId>core-java-modules</artifactId>
14+
<version>0.0.1-SNAPSHOT</version>
1515
</parent>
1616

1717
<dependencies>
@@ -30,27 +30,11 @@
3030
<artifactId>maven-compiler-plugin</artifactId>
3131
<version>${maven-compiler-plugin.version}</version>
3232
<configuration>
33-
<compilerArgs>--enable-preview</compilerArgs>
34-
<source>${maven.compiler.source.version}</source>
35-
<target>${maven.compiler.target.version}</target>
36-
<release>14</release>
37-
<compilerArgs>--enable-preview</compilerArgs>
38-
</configuration>
39-
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-surefire-plugin</artifactId>
43-
<version>${maven-surefire-plugin.version}</version>
44-
<configuration>
45-
<argLine>--enable-preview</argLine>
33+
<source>${maven.compiler.source}</source>
34+
<target>${maven.compiler.source}</target>
4635
</configuration>
4736
</plugin>
4837
</plugins>
4938
</build>
5039

51-
<properties>
52-
<maven.compiler.source.version>14</maven.compiler.source.version>
53-
<maven.compiler.target.version>14</maven.compiler.target.version>
54-
</properties>
55-
5640
</project>

core-java-modules/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<module>core-java-9-jigsaw</module>
258258
<!--<module>core-java-20</module>--> <!--JAVA-29040-->
259259
<module>core-java-21</module>
260-
<!--<module>core-java-conditionals</module>--> <!-- JAVA-42035 -->
260+
<module>core-java-conditionals</module>
261261
<module>core-java-collections-set</module>
262262
<module>core-java-datetime-conversion</module>
263263
<module>core-java-datetime-conversion-2</module>

pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,6 @@
14281428
<module>spring-cloud-modules/spring-cloud-task/springcloudtaskbatch</module> <!-- JAVA-34716 -->
14291429
<module>aspectj</module> <!-- JAVA-42031 -->
14301430
<module>core-java-modules/core-java-classloader</module> <!-- JAVA-42033 -->
1431-
<module>core-java-modules/core-java-conditionals</module> <!-- JAVA-42035 -->
14321431
<module>persistence-modules/hibernate-queries-2</module> <!-- JAVA-42042 -->
14331432
<module>spring-boot-modules/spring-boot-3</module> <!-- JAVA-42049 -->
14341433
</modules>
@@ -1497,7 +1496,6 @@
14971496
<module>spring-cloud-modules/spring-cloud-task/springcloudtaskbatch</module> <!-- JAVA-34716 -->
14981497
<module>aspectj</module> <!-- JAVA-42031 -->
14991498
<module>core-java-modules/core-java-classloader</module> <!-- JAVA-42033 -->
1500-
<module>core-java-modules/core-java-conditionals</module> <!-- JAVA-42035 -->
15011499
<module>persistence-modules/hibernate-queries-2</module> <!-- JAVA-42042 -->
15021500
<module>spring-boot-modules/spring-boot-3</module> <!-- JAVA-42049 -->
15031501
</modules>

0 commit comments

Comments
 (0)