minor formatting cleanup

This commit is contained in:
eugenp 2017-01-11 11:45:43 +02:00
parent 94c315c1c2
commit 3fc01ee7e0
14 changed files with 396 additions and 439 deletions

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>parent-modules</artifactId> <artifactId>parent-modules</artifactId>

View File

@ -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> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>apache-fop</artifactId> <artifactId>apache-fop</artifactId>

View File

@ -111,18 +111,8 @@
<Xlint>ignore</Xlint> <Xlint>ignore</Xlint>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<!-- Post-compile weaving --> <!-- Post-compile weaving -->
<!-- <!-- <weaveDependencies> <weaveDependency> <groupId>org.agroup</groupId> <artifactId>to-weave</artifactId> </weaveDependency>
<weaveDependencies> <weaveDependency> <groupId>org.anothergroup</groupId> <artifactId>gen</artifactId> </weaveDependency> </weaveDependencies> -->
<weaveDependency>
<groupId>org.agroup</groupId>
<artifactId>to-weave</artifactId>
</weaveDependency>
<weaveDependency>
<groupId>org.anothergroup</groupId>
<artifactId>gen</artifactId>
</weaveDependency>
</weaveDependencies>
-->
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -134,18 +124,9 @@
</executions> </executions>
</plugin> </plugin>
<!-- <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.10</version>
<plugin> <configuration> <argLine>-javaagent:"${settings.localRepository}"/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</argLine>
<groupId>org.apache.maven.plugins</groupId> <useSystemClassLoader>true</useSystemClassLoader> <forkMode>always</forkMode> </configuration> </plugin> -->
<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> </plugins>
</build> </build>

View File

@ -1,5 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
@ -23,8 +22,6 @@
<version>${org.slf4j.version}</version> <version>${org.slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest-library</artifactId>

View File

@ -19,11 +19,10 @@
</licenses> </licenses>
<properties> <properties>
<!-- Explicitly declaring the source encoding eliminates the following <!-- Explicitly declaring the source encoding eliminates the following message: -->
message: --> <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
<!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered <project.build.sourceEncoding>
resources, i.e. build is platform dependent! --> UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<querydsl.version>3.7.4</querydsl.version> <querydsl.version>3.7.4</querydsl.version>
@ -32,8 +31,7 @@
<!-- JBoss dependency versions --> <!-- JBoss dependency versions -->
<wildfly.maven.plugin.version>1.0.2.Final</wildfly.maven.plugin.version> <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 <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
tested stacks. -->
<jboss.bom.version>8.2.2.Final</jboss.bom.version> <jboss.bom.version>8.2.2.Final</jboss.bom.version>
<!-- other plugin versions --> <!-- other plugin versions -->
@ -50,14 +48,11 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- JBoss distributes a complete set of Java EE 7 APIs including a Bill <!-- JBoss distributes a complete set of Java EE 7 APIs including a Bill of Materials (BOM). A BOM specifies the versions of a "stack"
of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection) (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
of artifacts. We use this here so that we always get the correct versions 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
of artifacts. Here we use the jboss-javaee-7.0-with-tools stack (you can 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
read this as the JBoss stack of the Java EE 7 APIs, with some extras tools projects) -->
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> <dependency>
<groupId>org.wildfly.bom</groupId> <groupId>org.wildfly.bom</groupId>
<artifactId>jboss-javaee-7.0-with-tools</artifactId> <artifactId>jboss-javaee-7.0-with-tools</artifactId>
@ -77,43 +72,37 @@
<dependencies> <dependencies>
<!-- First declare the APIs we depend on and need for compilation. All <!-- First declare the APIs we depend on and need for compilation. All of them are provided by JBoss WildFly -->
of them are provided by JBoss WildFly -->
<!-- Import the CDI API, we use provided scope as the API is included in <!-- Import the CDI API, we use provided scope as the API is included in JBoss WildFly -->
JBoss WildFly -->
<dependency> <dependency>
<groupId>javax.enterprise</groupId> <groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId> <artifactId>cdi-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Import the Common Annotations API (JSR-250), we use provided scope <!-- Import the Common Annotations API (JSR-250), we use provided scope as the API is included in JBoss WildFly -->
as the API is included in JBoss WildFly -->
<dependency> <dependency>
<groupId>org.jboss.spec.javax.annotation</groupId> <groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.2_spec</artifactId> <artifactId>jboss-annotations-api_1.2_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Import the JAX-RS API, we use provided scope as the API is included <!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss WildFly -->
in JBoss WildFly -->
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId> <artifactId>jaxrs-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Import the JPA API, we use provided scope as the API is included in <!-- Import the JPA API, we use provided scope as the API is included in JBoss WildFly -->
JBoss WildFly -->
<dependency> <dependency>
<groupId>org.hibernate.javax.persistence</groupId> <groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId> <artifactId>hibernate-jpa-2.1-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Import the EJB API, we use provided scope as the API is included in <!-- Import the EJB API, we use provided scope as the API is included in JBoss WildFly -->
JBoss WildFly -->
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ejb</groupId> <groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.2_spec</artifactId> <artifactId>jboss-ejb-api_3.2_spec</artifactId>
@ -135,8 +124,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Import the JSF API, we use provided scope as the API is included in <!-- Import the JSF API, we use provided scope as the API is included in JBoss WildFly -->
JBoss WildFly -->
<dependency> <dependency>
<groupId>org.jboss.spec.javax.faces</groupId> <groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.2_spec</artifactId> <artifactId>jboss-jsf-api_2.2_spec</artifactId>
@ -145,16 +133,14 @@
<!-- Now we declare any tools needed --> <!-- Now we declare any tools needed -->
<!-- Annotation processor to generate the JPA 2.0 metamodel classes for <!-- Annotation processor to generate the JPA 2.0 metamodel classes for typesafe criteria queries -->
typesafe criteria queries -->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId> <artifactId>hibernate-jpamodelgen</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Annotation processor that raising compilation errors whenever constraint <!-- Annotation processor that raising compilation errors whenever constraint annotations are incorrectly used. -->
annotations are incorrectly used. -->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-annotation-processor</artifactId> <artifactId>hibernate-validator-annotation-processor</artifactId>
@ -169,8 +155,7 @@
</dependency> </dependency>
<!-- Optional, but highly recommended --> <!-- Optional, but highly recommended -->
<!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) <!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) JPA from JUnit/TestNG -->
JPA from JUnit/TestNG -->
<dependency> <dependency>
<groupId>org.jboss.arquillian.junit</groupId> <groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId> <artifactId>arquillian-junit-container</artifactId>
@ -225,8 +210,7 @@
</dependencies> </dependencies>
<build> <build>
<!-- Maven will append the version to the finalName (which is the name <!-- Maven will append the version to the finalName (which is the name given to the generated war, and hence the context root) -->
given to the generated war, and hence the context root) -->
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<plugins> <plugins>
<plugin> <plugin>
@ -265,10 +249,8 @@
<profiles> <profiles>
<profile> <profile>
<!-- The default profile skips all tests, though you can tune it to run <!-- The default profile skips all tests, though you can tune it to run just unit tests based on a custom pattern -->
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 -->
<!-- Seperate profiles are provided for running all tests, including Arquillian
tests that execute in the specified container -->
<id>default</id> <id>default</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
@ -288,10 +270,8 @@
<profile> <profile>
<!-- An optional Arquillian testing profile that executes tests <!-- An optional Arquillian testing profile that executes tests in your WildFly instance -->
in your WildFly instance --> <!-- This profile will start a new WildFly instance, and execute the test, shutting it down when done -->
<!-- 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 --> <!-- Run with: mvn clean test -Parq-wildfly-managed -->
<id>arq-wildfly-managed</id> <id>arq-wildfly-managed</id>
<dependencies> <dependencies>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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"> 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> <modelVersion>4.0.0</modelVersion>