minor formatting cleanup
This commit is contained in:
eugenp
parent
94c315c1c2
commit
3fc01ee7e0
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>parent-modules</artifactId>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>apache-fop</artifactId>
|
||||
|
|
|
|||
|
|
@ -111,18 +111,8 @@
|
|||
<Xlint>ignore</Xlint>
|
||||
<encoding>${project.build.sourceEncoding}</encoding>
|
||||
<!-- Post-compile weaving -->
|
||||
<!--
|
||||
<weaveDependencies>
|
||||
<weaveDependency>
|
||||
<groupId>org.agroup</groupId>
|
||||
<artifactId>to-weave</artifactId>
|
||||
</weaveDependency>
|
||||
<weaveDependency>
|
||||
<groupId>org.anothergroup</groupId>
|
||||
<artifactId>gen</artifactId>
|
||||
</weaveDependency>
|
||||
</weaveDependencies>
|
||||
-->
|
||||
<!-- <weaveDependencies> <weaveDependency> <groupId>org.agroup</groupId> <artifactId>to-weave</artifactId> </weaveDependency>
|
||||
<weaveDependency> <groupId>org.anothergroup</groupId> <artifactId>gen</artifactId> </weaveDependency> </weaveDependencies> -->
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
@ -134,18 +124,9 @@
|
|||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.10</version>
|
||||
<configuration>
|
||||
<argLine>-javaagent:"${settings.localRepository}"/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</argLine>
|
||||
<useSystemClassLoader>true</useSystemClassLoader>
|
||||
<forkMode>always</forkMode>
|
||||
</configuration>
|
||||
</plugin>
|
||||
-->
|
||||
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.10</version>
|
||||
<configuration> <argLine>-javaagent:"${settings.localRepository}"/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</argLine>
|
||||
<useSystemClassLoader>true</useSystemClassLoader> <forkMode>always</forkMode> </configuration> </plugin> -->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.baeldung</groupId>
|
||||
|
|
@ -23,8 +22,6 @@
|
|||
<version>${org.slf4j.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest-library</artifactId>
|
||||
|
|
|
|||
|
|
@ -19,11 +19,10 @@
|
|||
</licenses>
|
||||
|
||||
<properties>
|
||||
<!-- Explicitly declaring the source encoding eliminates the following
|
||||
message: -->
|
||||
<!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
|
||||
resources, i.e. build is platform dependent! -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<!-- Explicitly declaring the source encoding eliminates the following message: -->
|
||||
<!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
|
||||
<project.build.sourceEncoding>
|
||||
UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<slf4j.version>1.7.21</slf4j.version>
|
||||
<querydsl.version>3.7.4</querydsl.version>
|
||||
|
|
@ -32,8 +31,7 @@
|
|||
<!-- JBoss dependency versions -->
|
||||
<wildfly.maven.plugin.version>1.0.2.Final</wildfly.maven.plugin.version>
|
||||
|
||||
<!-- Define the version of the JBoss BOMs we want to import to specify
|
||||
tested stacks. -->
|
||||
<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
|
||||
<jboss.bom.version>8.2.2.Final</jboss.bom.version>
|
||||
|
||||
<!-- other plugin versions -->
|
||||
|
|
@ -50,14 +48,11 @@
|
|||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<!-- 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 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, 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 extras
|
||||
from the Hibernate family of projects) -->
|
||||
<!-- 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 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, 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 extras from the Hibernate family of
|
||||
projects) -->
|
||||
<dependency>
|
||||
<groupId>org.wildfly.bom</groupId>
|
||||
<artifactId>jboss-javaee-7.0-with-tools</artifactId>
|
||||
|
|
@ -77,43 +72,37 @@
|
|||
|
||||
<dependencies>
|
||||
|
||||
<!-- First declare the APIs we depend on and need for compilation. All
|
||||
of them are provided by JBoss WildFly -->
|
||||
<!-- First declare the APIs we depend on and need for compilation. All of them are provided by JBoss WildFly -->
|
||||
|
||||
<!-- Import the CDI API, we use provided scope as the API is included in
|
||||
JBoss WildFly -->
|
||||
<!-- Import the CDI API, we use provided scope as the API is included in JBoss WildFly -->
|
||||
<dependency>
|
||||
<groupId>javax.enterprise</groupId>
|
||||
<artifactId>cdi-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Import the Common Annotations API (JSR-250), we use provided scope
|
||||
as the API is included in JBoss WildFly -->
|
||||
<!-- Import the Common Annotations API (JSR-250), we use provided scope as the API is included in JBoss WildFly -->
|
||||
<dependency>
|
||||
<groupId>org.jboss.spec.javax.annotation</groupId>
|
||||
<artifactId>jboss-annotations-api_1.2_spec</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Import the JAX-RS API, we use provided scope as the API is included
|
||||
in JBoss WildFly -->
|
||||
<!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss WildFly -->
|
||||
<dependency>
|
||||
<groupId>org.jboss.resteasy</groupId>
|
||||
<artifactId>jaxrs-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Import the JPA API, we use provided scope as the API is included in
|
||||
JBoss WildFly -->
|
||||
<!-- Import the JPA API, we use provided scope as the API is included in JBoss WildFly -->
|
||||
<dependency>
|
||||
<groupId>org.hibernate.javax.persistence</groupId>
|
||||
<artifactId>hibernate-jpa-2.1-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Import the EJB API, we use provided scope as the API is included in
|
||||
JBoss WildFly -->
|
||||
<!-- Import the EJB API, we use provided scope as the API is included in JBoss WildFly -->
|
||||
<dependency>
|
||||
<groupId>org.jboss.spec.javax.ejb</groupId>
|
||||
<artifactId>jboss-ejb-api_3.2_spec</artifactId>
|
||||
|
|
@ -135,8 +124,7 @@
|
|||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Import the JSF API, we use provided scope as the API is included in
|
||||
JBoss WildFly -->
|
||||
<!-- Import the JSF API, we use provided scope as the API is included in JBoss WildFly -->
|
||||
<dependency>
|
||||
<groupId>org.jboss.spec.javax.faces</groupId>
|
||||
<artifactId>jboss-jsf-api_2.2_spec</artifactId>
|
||||
|
|
@ -145,16 +133,14 @@
|
|||
|
||||
<!-- Now we declare any tools needed -->
|
||||
|
||||
<!-- Annotation processor to generate the JPA 2.0 metamodel classes for
|
||||
typesafe criteria queries -->
|
||||
<!-- Annotation processor to generate the JPA 2.0 metamodel classes for typesafe criteria queries -->
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-jpamodelgen</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Annotation processor that raising compilation errors whenever constraint
|
||||
annotations are incorrectly used. -->
|
||||
<!-- Annotation processor that raising compilation errors whenever constraint annotations are incorrectly used. -->
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-validator-annotation-processor</artifactId>
|
||||
|
|
@ -169,8 +155,7 @@
|
|||
</dependency>
|
||||
|
||||
<!-- Optional, but highly recommended -->
|
||||
<!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA)
|
||||
JPA from JUnit/TestNG -->
|
||||
<!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) JPA from JUnit/TestNG -->
|
||||
<dependency>
|
||||
<groupId>org.jboss.arquillian.junit</groupId>
|
||||
<artifactId>arquillian-junit-container</artifactId>
|
||||
|
|
@ -225,8 +210,7 @@
|
|||
</dependencies>
|
||||
|
||||
<build>
|
||||
<!-- Maven will append the version to the finalName (which is the name
|
||||
given to the generated war, and hence the context root) -->
|
||||
<!-- Maven will append the version to the finalName (which is the name given to the generated war, and hence the context root) -->
|
||||
<finalName>${project.artifactId}</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
|
@ -265,10 +249,8 @@
|
|||
|
||||
<profiles>
|
||||
<profile>
|
||||
<!-- The default profile skips all tests, though you can tune it to run
|
||||
just unit tests based on a custom pattern -->
|
||||
<!-- Seperate profiles are provided for running all tests, including Arquillian
|
||||
tests that execute in the specified container -->
|
||||
<!-- The default profile skips all tests, though you can tune it to run just unit tests based on a custom pattern -->
|
||||
<!-- Seperate profiles are provided for running all tests, including Arquillian tests that execute in the specified container -->
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
|
|
@ -288,10 +270,8 @@
|
|||
|
||||
<profile>
|
||||
|
||||
<!-- An optional Arquillian testing profile that executes tests
|
||||
in your WildFly instance -->
|
||||
<!-- This profile will start a new WildFly instance, and execute the
|
||||
test, shutting it down when done -->
|
||||
<!-- An optional Arquillian testing profile that executes tests in your WildFly instance -->
|
||||
<!-- This profile will start a new WildFly instance, and execute the test, shutting it down when done -->
|
||||
<!-- Run with: mvn clean test -Parq-wildfly-managed -->
|
||||
<id>arq-wildfly-managed</id>
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue