From ed09e9f8dabd4ab450250b0b49edb7b45fda42ab Mon Sep 17 00:00:00 2001
From: Rafael Benevides <rafabene@gmail.com>
Date: Mon, 7 Sep 2015 21:24:56 -0400
Subject: [PATCH] Minor fixes - Found while synching with WildFly

---
 app-client/ejb/pom.xml                          |  2 +-
 .../quickstarts/cdi/alternative/TaxImpl_2.java  |  1 -
 ejb-asynchronous/client/pom.xml                 | 17 -----------------
 .../ejb/remote/client/RemoteEJBClient.java      |  4 ++--
 pom.xml                                         |  1 +
 resteasy-jaxrs-client/pom.xml                   |  2 +-
 6 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/app-client/ejb/pom.xml b/app-client/ejb/pom.xml
index 55705a90eb..0989f5a468 100644
--- a/app-client/ejb/pom.xml
+++ b/app-client/ejb/pom.xml
@@ -58,7 +58,7 @@
                 <artifactId>maven-ejb-plugin</artifactId>
                 <version>${ejb.plugin.version}</version>
                 <configuration>
-                    <ejbVersion>3.0</ejbVersion>
+                    <ejbVersion>3.1</ejbVersion>
                     <generateClient>true</generateClient>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
diff --git a/cdi-alternative/src/main/java/org/jboss/as/quickstarts/cdi/alternative/TaxImpl_2.java b/cdi-alternative/src/main/java/org/jboss/as/quickstarts/cdi/alternative/TaxImpl_2.java
index f3e7029e88..36772b9575 100644
--- a/cdi-alternative/src/main/java/org/jboss/as/quickstarts/cdi/alternative/TaxImpl_2.java
+++ b/cdi-alternative/src/main/java/org/jboss/as/quickstarts/cdi/alternative/TaxImpl_2.java
@@ -29,7 +29,6 @@ public class TaxImpl_2 implements Tax {
 
     @Override
     public String getRate() {
-        // TODO Auto-generated method stub
         return "Tax_2 Rate! To switch back to the default, comment out the 'alternatives' tag in the WEB-INF/beans.xml file";
     }
 
diff --git a/ejb-asynchronous/client/pom.xml b/ejb-asynchronous/client/pom.xml
index 44e5d0f9a6..c283d19aae 100644
--- a/ejb-asynchronous/client/pom.xml
+++ b/ejb-asynchronous/client/pom.xml
@@ -35,23 +35,6 @@
         </license>
     </licenses>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- JBoss distributes a complete set of Java EE 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-eap stack (you can
-                read this as the JBoss stack of the Java EE APIs and related components.  -->
-            <dependency>
-                <groupId>org.jboss.bom</groupId>
-                <artifactId>jboss-javaee-7.0-eap</artifactId>
-                <version>${version.jboss.bom.eap}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
 
         <!-- Import the client API of the EJB project -->
diff --git a/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java b/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java
index 6a0739f7b5..e070018cfe 100644
--- a/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java
+++ b/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java
@@ -120,7 +120,7 @@ private static RemoteCalculator lookupRemoteStatelessCalculator() throws NamingE
         // <moduleName> By the default the module name is the name of the EJB JAR file (without the
         // .jar suffix). The module name might be overridden in the ejb-jar.xml
         //
-        // <distinctName> : AS7 allows each deployment to have an (optional) distinct name.
+        // <distinctName> : EAP allows each deployment to have an (optional) distinct name.
         // This example does not use this so leave it blank.
         //
         // <beanName> : The name of the session been to be invoked.
@@ -154,7 +154,7 @@ private static RemoteCounter lookupRemoteStatefulCounter() throws NamingExceptio
         // <moduleName> By the default the module name is the name of the EJB JAR file (without the
         // .jar suffix). The module name might be overridden in the ejb-jar.xml
         //
-        // <distinctName> : AS7 allows each deployment to have an (optional) distinct name.
+        // <distinctName> : EAP allows each deployment to have an (optional) distinct name.
         // This example does not use this so leave it blank.
         //
         // <beanName> : The name of the session been to be invoked.
diff --git a/pom.xml b/pom.xml
index ec8252b5a2..26ae076331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,7 @@
                 <module>helloworld-singleton</module>
                 <module>helloworld-ws</module>
                 <module>hibernate5</module>
+                <module>inter-app</module>
                 <module>jaxws-addressing</module>
                 <module>jaxws-ejb</module>
                 <module>jaxws-pojo</module>
diff --git a/resteasy-jaxrs-client/pom.xml b/resteasy-jaxrs-client/pom.xml
index fc0582df5c..a71520680a 100644
--- a/resteasy-jaxrs-client/pom.xml
+++ b/resteasy-jaxrs-client/pom.xml
@@ -189,7 +189,7 @@
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <skip>false</skip>
+                            <skip>true</skip>
                             <systemProperties>
                                 <property>
                                     <name>xmlUrl</name>