Skip to content

Commit aa03f32

Browse files
authored
[JAVA-38958] Renamed profiles and updated README.md (#17536)
1 parent d3ec9a8 commit aa03f32

File tree

9 files changed

+22
-27
lines changed

9 files changed

+22
-27
lines changed

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ Profile based segregation
3636

3737
We are using maven build profiles to segregate the huge list of individual projects we have in our repository.
3838

39-
The projects are broadly divided into 3 lists: default, default-jdk8 and default-heavy.
39+
The projects are broadly divided into 4 lists: default, default-jdk17, default-jdk8 and default-heavy.
4040

4141
Next, they are segregated further on the basis of the tests that we want to execute.
4242

43-
Additionally, there are 2 profiles dedicated for JDK17 and above builds - **which require JDK 17**.
44-
4543
We also have a parents profile to build only parent modules.
4644

47-
Therefore, we have a total of 7 profiles:
45+
Therefore, we have a total of 9 profiles:
4846

4947
| Profile | Includes | Type of test enabled |
5048
|-------------------|-----------------------------| -------------------- |
51-
| default | JDK17 and above projects | *UnitTest |
52-
| integration | JDK17 and above projects | *IntegrationTest |
49+
| default | JDK21 projects | *UnitTest |
50+
| integration | JDK21 projects | *IntegrationTest |
51+
| default-jdk17 | JDK17 and above projects | *UnitTest |
52+
| integration-jdk17 | JDK17 and above projects | *IntegrationTest |
5353
| default-heavy | Heavy/long running projects | *UnitTest |
5454
| integration-heavy | Heavy/long running projects | *IntegrationTest |
55-
| default-jd8 | JDK8 projects | *UnitTest |
55+
| default-jdk8 | JDK8 projects | *UnitTest |
5656
| integration-jdk8 | JDK8 projects | *IntegrationTest |
5757
| parents | Set of parent modules | None |
5858

core-java-modules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<module>core-java-collections-4</module>
9494
<module>core-java-collections-5</module>
9595
<module>core-java-collections-6</module>
96-
<module>core-java-collections-7</module>
96+
<!-- <module>core-java-collections-7</module>-->
9797
<module>core-java-collections-conversions</module>
9898
<module>core-java-collections-set-2</module>
9999
<module>core-java-collections-list</module>

messaging-modules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<module>spring-apache-camel</module>
2525
<module>spring-jms</module>
2626
<module>postgres-notify</module>
27-
<module>ibm-mq</module>
27+
<!-- <module>ibm-mq</module> --> <!-- BAEL-8412 -->
2828
</modules>
2929

3030
</project>

netflix-modules/mantis/pom.xml

+2-9
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<artifactId>jackson-databind</artifactId>
3737
</dependency>
3838
<dependency>
39-
<groupId>net.andreinc.mockneat</groupId>
39+
<groupId>net.andreinc</groupId>
4040
<artifactId>mockneat</artifactId>
4141
<version>${mockneat.version}</version>
4242
</dependency>
@@ -62,16 +62,9 @@
6262
</dependency>
6363
</dependencies>
6464

65-
<repositories>
66-
<repository>
67-
<id>jcenter</id>
68-
<url>https://jcenter.bintray.com/</url>
69-
</repository>
70-
</repositories>
71-
7265
<properties>
7366
<mantis-runtime.version>2.0.42</mantis-runtime.version>
74-
<mockneat.version>0.4.2</mockneat.version>
67+
<mockneat.version>0.4.8</mockneat.version>
7568
<spectator-api.version>1.6.5</spectator-api.version>
7669
</properties>
7770

netflix-modules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<modules>
1818
<module>genie</module>
19-
<module>mantis</module>
19+
<module>mantis</module>
2020
</modules>
2121

2222
</project>

pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@
540540
</profile>
541541

542542
<profile>
543-
<id>default</id>
543+
<id>default-jdk17</id>
544544
<build>
545545
<plugins>
546546
<plugin>
@@ -613,7 +613,7 @@
613613
</profile>
614614

615615
<profile>
616-
<id>default-jdk21</id>
616+
<id>default</id>
617617
<build>
618618
<plugins>
619619
<plugin>
@@ -849,7 +849,7 @@
849849
<module>xstream</module>
850850
<!-- <module>libraries-data-io-2</module> --> <!-- JAVA-39367 -->
851851
<module>spring-5-rest-docs</module>
852-
<module>maven-modules</module>
852+
<!-- <module>maven-modules</module> --> <!--JAVA 37707-->
853853
</modules>
854854

855855
<properties>
@@ -862,7 +862,7 @@
862862
</profile>
863863

864864
<profile>
865-
<id>integration</id>
865+
<id>integration-jdk17</id>
866866
<build>
867867
<plugins>
868868
<plugin>
@@ -929,7 +929,7 @@
929929
</profile>
930930

931931
<profile>
932-
<id>integration-jdk21</id>
932+
<id>integration</id>
933933
<build>
934934
<plugins>
935935
<plugin>
@@ -1159,7 +1159,7 @@
11591159
<module>xstream</module>
11601160
<!-- <module>libraries-data-io-2</module> --> <!-- JAVA-39367 -->
11611161
<module>spring-5-rest-docs</module>
1162-
<module>maven-modules</module>
1162+
<!-- <module>maven-modules</module> --> <!--JAVA 37707-->
11631163
</modules>
11641164

11651165
<properties>

spring-boot-modules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<module>spring-boot-keycloak</module>
5555
<module>spring-boot-keycloak-2</module>
5656
<module>spring-boot-libraries</module>
57-
<module>spring-boot-libraries-2</module>
57+
<!-- <module>spring-boot-libraries-2</module> --> <!-- JAVA-37799 -->
5858
<module>spring-boot-libraries-3</module>
5959
<module>spring-boot-process-automation</module>
6060
<module>spring-boot-logging-logback</module>

testing-modules/assertion-libraries-2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7-
<artifactId>assertion-libraries</artifactId>
7+
<artifactId>assertion-libraries-2</artifactId>
88
<version>0.1-SNAPSHOT</version>
99
<name>assertion-libraries-2</name>
1010

xml-2/src/test/java/com/baeldung/xmlhtml/stax/StaxTransformerUnitTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.baeldung.xmlhtml.stax;
22

3+
import org.junit.jupiter.api.Disabled;
34
import org.junit.jupiter.api.Test;
45

56
import javax.xml.stream.XMLStreamException;
@@ -12,6 +13,7 @@
1213

1314
public class StaxTransformerUnitTest {
1415

16+
@Disabled // JAVA-39223
1517
@Test
1618
public void givenXml_whenTransform_thenGetHtml() throws IOException, URISyntaxException, XMLStreamException {
1719
String path = "src/test/resources/xmlhtml/notification.xml";

0 commit comments

Comments
 (0)