cleanup pom (#1836)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies * remove commons-logging * merge * fix conflict * exclude commons-logging dependency * cleanup * minor fix * minor fix * fix dependency issues * Revert "fix dependency issues" This reverts commit 83bf1f9fd2e1a9a55f9cacb085669568b06b49ec. * fix dependency issues * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue * add parent to pom * cleanup parent dependencies * cleanup pom
This commit is contained in:
+48
-26
@@ -22,11 +22,13 @@
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>parent-modules</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
</parent>
|
||||
|
||||
<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! -->
|
||||
<!-- 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>
|
||||
|
||||
<querydsl.version>3.7.4</querydsl.version>
|
||||
@@ -35,7 +37,8 @@
|
||||
<!-- 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 -->
|
||||
@@ -46,11 +49,14 @@
|
||||
|
||||
<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>
|
||||
@@ -70,37 +76,43 @@
|
||||
|
||||
<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>
|
||||
@@ -122,7 +134,8 @@
|
||||
</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>
|
||||
@@ -131,14 +144,16 @@
|
||||
|
||||
<!-- 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>
|
||||
@@ -146,7 +161,8 @@
|
||||
</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>
|
||||
@@ -195,14 +211,16 @@
|
||||
</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>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>${war.plugin.version}</version>
|
||||
<configuration>
|
||||
<!-- Java EE 7 doesn't require web.xml, Maven needs to catch up! -->
|
||||
<!-- Java EE 7 doesn't require web.xml, Maven needs to
|
||||
catch up! -->
|
||||
<failOnMissingWebXml>false</failOnMissingWebXml>
|
||||
</configuration>
|
||||
</plugin>
|
||||
@@ -234,8 +252,10 @@
|
||||
|
||||
<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>
|
||||
@@ -255,8 +275,10 @@
|
||||
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user