Skip to content

Commit fa112ee

Browse files
committed
JAVA-5223: Fix formatting of POMs (Persistence Modules - Part 1)
1 parent 1490c06 commit fa112ee

File tree

30 files changed

+138
-177
lines changed

30 files changed

+138
-177
lines changed

persistence-modules/activejdbc/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>activejdbc</artifactId>
67
<version>1.0-SNAPSHOT</version>

persistence-modules/apache-bookkeeper/pom.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
65
<modelVersion>4.0.0</modelVersion>
76
<artifactId>apache-bookkeeper</artifactId>
87
<version>0.0.1-SNAPSHOT</version>
@@ -27,21 +26,17 @@
2726
</exclusion>
2827
</exclusions>
2928
</dependency>
30-
3129
<dependency>
3230
<groupId>org.testcontainers</groupId>
3331
<artifactId>testcontainers</artifactId>
3432
<version>${testcontainers.version}</version>
3533
<scope>test</scope>
3634
</dependency>
37-
3835
</dependencies>
3936

4037
<properties>
4138
<org.apache.bookkeeper.version>4.10.0</org.apache.bookkeeper.version>
4239
<testcontainers.version>1.14.3</testcontainers.version>
4340
</properties>
4441

45-
46-
</project>
47-
42+
</project>

persistence-modules/apache-cayenne/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>apache-cayenne</artifactId>
67
<version>0.0.1-SNAPSHOT</version>
@@ -43,4 +44,4 @@
4344
<cayenne.version>4.0.M5</cayenne.version>
4445
</properties>
4546

46-
</project>
47+
</project>

persistence-modules/core-java-persistence-2/pom.xml

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<groupId>com.baeldung.core-java-persistence-2</groupId>
67
<artifactId>core-java-persistence-2</artifactId>
@@ -31,24 +32,15 @@
3132
<artifactId>mysql-connector-java</artifactId>
3233
<version>${mysql.driver.version}</version>
3334
</dependency>
34-
<!--
35-
==================================================================
36-
This jar is not in maven central repo due to some license issues.
37-
We need to manually download and install to maven repository.
38-
==================================================================
39-
40-
<dependency>
41-
<groupId>com.oracle</groupId>
42-
<artifactId>ojdbc14</artifactId>
43-
<version>${oracle.driver.version}</version>
44-
</dependency>
45-
-->
35+
<!-- ================================================================== This jar is not in maven
36+
central repo due to some license issues. We need to manually download and install to maven repository.
37+
================================================================== <dependency> <groupId>com.oracle</groupId>
38+
<artifactId>ojdbc14</artifactId> <version>${oracle.driver.version}</version> </dependency> -->
4639
<dependency>
4740
<groupId>com.microsoft.sqlserver</groupId>
4841
<artifactId>mssql-jdbc</artifactId>
4942
<version>${mssql.driver.version}</version>
5043
</dependency>
51-
5244
</dependencies>
5345

5446
<properties>
@@ -59,4 +51,4 @@
5951
<mysql.driver.version>8.0.22</mysql.driver.version>
6052
</properties>
6153

62-
</project>
54+
</project>

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<groupId>com.baeldung.core-java-persistence</groupId>
67
<artifactId>core-java-persistence</artifactId>

persistence-modules/deltaspike/pom.xml

+23-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>deltaspike</artifactId>
67
<version>1.0</version>
@@ -16,44 +17,39 @@
1617
</parent>
1718

1819
<dependencies>
19-
20-
<!-- First declare the APIs we depend on and need for compilation. All of them are provided by JBoss WildFly -->
21-
20+
<!-- First declare the APIs we depend on and need for compilation. All of them are provided by
21+
JBoss WildFly -->
2222
<!-- Import the CDI API, we use provided scope as the API is included in JBoss WildFly -->
2323
<dependency>
2424
<groupId>javax.enterprise</groupId>
2525
<artifactId>cdi-api</artifactId>
2626
<scope>provided</scope>
2727
</dependency>
28-
29-
<!-- Import the Common Annotations API (JSR-250), we use provided scope as the API is included in JBoss WildFly -->
28+
<!-- Import the Common Annotations API (JSR-250), we use provided scope as the API is included
29+
in JBoss WildFly -->
3030
<dependency>
3131
<groupId>org.jboss.spec.javax.annotation</groupId>
3232
<artifactId>jboss-annotations-api_1.2_spec</artifactId>
3333
<scope>provided</scope>
3434
</dependency>
35-
3635
<!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss WildFly -->
3736
<dependency>
3837
<groupId>org.jboss.resteasy</groupId>
3938
<artifactId>jaxrs-api</artifactId>
4039
<scope>provided</scope>
4140
</dependency>
42-
4341
<!-- Import the JPA API, we use provided scope as the API is included in JBoss WildFly -->
4442
<dependency>
4543
<groupId>org.hibernate.javax.persistence</groupId>
4644
<artifactId>hibernate-jpa-2.1-api</artifactId>
4745
<scope>provided</scope>
4846
</dependency>
49-
5047
<!-- Import the EJB API, we use provided scope as the API is included in JBoss WildFly -->
5148
<dependency>
5249
<groupId>org.jboss.spec.javax.ejb</groupId>
5350
<artifactId>jboss-ejb-api_3.2_spec</artifactId>
5451
<scope>provided</scope>
5552
</dependency>
56-
5753
<!-- JSR-303 (Bean Validation) Implementation -->
5854
<!-- Provides portable constraints such as @Email -->
5955
<!-- Hibernate Validator is shipped in JBoss WildFly -->
@@ -68,137 +64,119 @@
6864
</exclusion>
6965
</exclusions>
7066
</dependency>
71-
7267
<!-- Import the JSF API, we use provided scope as the API is included in JBoss WildFly -->
7368
<dependency>
7469
<groupId>org.jboss.spec.javax.faces</groupId>
7570
<artifactId>jboss-jsf-api_2.2_spec</artifactId>
7671
<scope>provided</scope>
7772
</dependency>
78-
7973
<!-- Now we declare any tools needed -->
80-
8174
<!-- Annotation processor to generate the JPA 2.0 metamodel classes for typesafe criteria queries -->
8275
<dependency>
8376
<groupId>org.hibernate</groupId>
8477
<artifactId>hibernate-jpamodelgen</artifactId>
8578
<scope>provided</scope>
8679
</dependency>
87-
88-
<!-- Annotation processor that raising compilation errors whenever constraint annotations are incorrectly used. -->
80+
<!-- Annotation processor that raising compilation errors whenever constraint annotations are
81+
incorrectly used. -->
8982
<dependency>
9083
<groupId>org.hibernate</groupId>
9184
<artifactId>hibernate-validator-annotation-processor</artifactId>
9285
<scope>provided</scope>
9386
</dependency>
94-
9587
<!-- Optional, but highly recommended -->
96-
<!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) JPA from JUnit/TestNG -->
88+
<!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) JPA from
89+
JUnit/TestNG -->
9790
<dependency>
9891
<groupId>org.jboss.arquillian.junit</groupId>
9992
<artifactId>arquillian-junit-container</artifactId>
10093
<scope>test</scope>
10194
</dependency>
102-
10395
<dependency>
10496
<groupId>org.jboss.arquillian.protocol</groupId>
10597
<artifactId>arquillian-protocol-servlet</artifactId>
10698
<scope>test</scope>
10799
</dependency>
108-
109100
<dependency>
110101
<groupId>org.jboss.shrinkwrap.resolver</groupId>
111102
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
112103
<scope>test</scope>
113104
</dependency>
114-
115105
<dependency>
116106
<groupId>org.apache.deltaspike.modules</groupId>
117107
<artifactId>deltaspike-data-module-api</artifactId>
118108
<scope>compile</scope>
119109
</dependency>
120-
121110
<dependency>
122111
<groupId>org.apache.deltaspike.modules</groupId>
123112
<artifactId>deltaspike-data-module-impl</artifactId>
124113
<scope>runtime</scope>
125114
</dependency>
126-
127115
<!-- querydsl libraries -->
128116
<dependency>
129117
<groupId>com.mysema.querydsl</groupId>
130118
<artifactId>querydsl-apt</artifactId>
131119
<version>${querydsl.version}</version>
132120
<scope>provided</scope>
133121
</dependency>
134-
135122
<dependency>
136123
<groupId>com.mysema.querydsl</groupId>
137124
<artifactId>querydsl-jpa</artifactId>
138125
<version>${querydsl.version}</version>
139126
</dependency>
140-
141127
<dependency>
142128
<groupId>org.apache.deltaspike.modules</groupId>
143129
<artifactId>deltaspike-test-control-module-api</artifactId>
144130
<scope>test</scope>
145131
</dependency>
146-
147132
<dependency>
148133
<groupId>org.apache.deltaspike.modules</groupId>
149134
<artifactId>deltaspike-test-control-module-impl</artifactId>
150135
<scope>test</scope>
151136
</dependency>
152-
153137
<dependency>
154138
<groupId>org.apache.deltaspike.cdictrl</groupId>
155139
<artifactId>deltaspike-cdictrl-weld</artifactId>
156140
<scope>test</scope>
157141
</dependency>
158-
159142
<dependency>
160143
<groupId>org.jboss.weld.se</groupId>
161144
<artifactId>weld-se-core</artifactId>
162145
<version>${weld.version}</version>
163146
<scope>test</scope>
164147
</dependency>
165-
166148
<dependency>
167149
<groupId>org.hibernate</groupId>
168150
<artifactId>hibernate-core</artifactId>
169151
<scope>provided</scope>
170152
</dependency>
171-
172153
<dependency>
173154
<groupId>org.jboss</groupId>
174155
<artifactId>jandex</artifactId>
175156
<version>${jandex.version}</version>
176157
</dependency>
177-
178158
<dependency>
179159
<groupId>com.h2database</groupId>
180160
<artifactId>h2</artifactId>
181161
<version>${h2.version}</version>
182162
<scope>test</scope>
183163
</dependency>
184-
185164
<dependency>
186165
<groupId>org.hibernate</groupId>
187166
<artifactId>hibernate-entitymanager</artifactId>
188167
<scope>provided</scope>
189168
</dependency>
190-
191169
<!-- Others -->
192170
<dependency>
193171
<groupId>org.apache.commons</groupId>
194172
<artifactId>commons-lang3</artifactId>
195173
<version>${commons-lang3.version}</version>
196174
</dependency>
197-
198175
</dependencies>
199176

200177
<build>
201-
<!-- Maven will append the version to the finalName (which is the name given to the generated war, and hence the context root) -->
178+
<!-- Maven will append the version to the finalName (which is the name given to the generated
179+
war, and hence the context root) -->
202180
<finalName>${project.artifactId}</finalName>
203181
<plugins>
204182
<plugin>
@@ -237,9 +215,9 @@
237215

238216
<profiles>
239217
<profile>
240-
241218
<!-- An optional Arquillian testing profile that executes tests in your WildFly instance -->
242-
<!-- This profile will start a new WildFly instance, and execute the test, shutting it down when done -->
219+
<!-- This profile will start a new WildFly instance, and execute the test, shutting it down
220+
when done -->
243221
<!-- Run with: mvn clean test -Parq-wildfly-managed -->
244222
<id>arq-wildfly-managed</id>
245223
<dependencies>
@@ -259,6 +237,7 @@
259237
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
260238
</license>
261239
</licenses>
240+
262241
<repositories>
263242
<repository>
264243
<id>redhat-repository-techpreview</id>
@@ -268,10 +247,12 @@
268247

269248
<dependencyManagement>
270249
<dependencies>
271-
<!-- JBoss distributes a complete set of Java EE 7 APIs including a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection) of artifacts. We
272-
use this here so that we always get the correct versions of artifacts. Here we use the jboss-javaee-7.0-with-tools stack (you can read this as the JBoss stack of the Java EE 7 APIs,
273-
with some extras tools for your project, such as Arquillian for testing) and the jboss-javaee-7.0-with-hibernate stack you can read this as the JBoss stack of the Java EE 7 APIs, with
274-
extras from the Hibernate family of projects) -->
250+
<!-- JBoss distributes a complete set of Java EE 7 APIs including a Bill of Materials (BOM).
251+
A BOM specifies the versions of a "stack" (or a collection) of artifacts. We use this here so that we
252+
always get the correct versions of artifacts. Here we use the jboss-javaee-7.0-with-tools stack (you
253+
can read this as the JBoss stack of the Java EE 7 APIs, with some extras tools for your project, such
254+
as Arquillian for testing) and the jboss-javaee-7.0-with-hibernate stack you can read this as the JBoss
255+
stack of the Java EE 7 APIs, with extras from the Hibernate family of projects) -->
275256
<dependency>
276257
<groupId>org.wildfly.bom</groupId>
277258
<artifactId>jboss-javaee-7.0-with-tools</artifactId>
@@ -310,4 +291,4 @@
310291
<jandex.version>1.2.5.Final-redhat-1</jandex.version>
311292
</properties>
312293

313-
</project>
294+
</project>

persistence-modules/elasticsearch/pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>elasticsearch</artifactId>
67
<version>0.0.1-SNAPSHOT</version>
@@ -29,5 +30,5 @@
2930
<properties>
3031
<jest.version>6.3.1</jest.version>
3132
</properties>
32-
33-
</project>
33+
34+
</project>

0 commit comments

Comments
 (0)