JBEAP-9486, JBEAP-9367 JBEAP-9409 JBEAP-9406 - make JDBS happy by

inog · Mar 14, 2017 · b0118c1 · b0118c1
1 parent 4a34db7
commit b0118c1
Show file tree

Hide file tree

Showing 49 changed files with 10 additions and 334 deletions.
diff --git a/app-client/ear/pom.xml b/app-client/ear/pom.xml
@@ -92,7 +92,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>

diff --git a/app-client/pom.xml b/app-client/pom.xml
@@ -44,16 +44,10 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/cluster-ha-singleton/pom.xml b/cluster-ha-singleton/pom.xml
@@ -43,21 +43,14 @@
     </modules>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/cluster-ha-singleton/service/pom.xml b/cluster-ha-singleton/service/pom.xml
@@ -66,28 +66,22 @@
     </dependencies>
 
     <build>
-        <!-- Specify the archive name -->
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <!-- must include ejb-plug-in to change the EJB version from
                     2.1 to 3.0 -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>
-                <version>${version.ejb.plugin}</version>
                 <configuration>
-                    <ejbVersion>3.1</ejbVersion>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.source}</target>
+                    <ejbVersion>3.2</ejbVersion>
                     <generateClient>true</generateClient>
                     <clientIncludes>
                         <clientInclude>**/ServiceAccess.class</clientInclude>
                     </clientIncludes>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
                         <manifestEntries>
-                            <Dependencies>org.jboss.msc,
-                                org.wildfly.clustering.singleton</Dependencies>
+                            <Dependencies>org.jboss.msc, org.wildfly.clustering.singleton</Dependencies>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -96,13 +90,11 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                     <filename>${project.artifactId}.jar</filename>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/ejb-asynchronous/ejb/pom.xml b/ejb-asynchronous/ejb/pom.xml
@@ -67,7 +67,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <filename>${project.build.finalName}.jar</filename>
                     <skip>false</skip>

diff --git a/ejb-asynchronous/pom.xml b/ejb-asynchronous/pom.xml
@@ -57,17 +57,14 @@
     </dependencyManagement>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/ejb-in-ear/ear/pom.xml b/ejb-in-ear/ear/pom.xml
@@ -88,7 +88,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>

diff --git a/ejb-in-ear/pom.xml b/ejb-in-ear/pom.xml
@@ -76,7 +76,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>

diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
@@ -64,16 +64,10 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml
@@ -47,12 +47,10 @@
     </modules>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>

diff --git a/ejb-remote/server-side/pom.xml b/ejb-remote/server-side/pom.xml
@@ -24,7 +24,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>ejb-remote-server-side</artifactId>
-    <version>7.1.0.Alpha2-SNAPSHOT</version>
     <packaging>ejb</packaging>
     <name>${qs.name.prefix} ejb-remote - server-side</name>
     <description>This project demonstrates how to access an EJB from a remote client; this is the server side POM file</description>
@@ -62,7 +61,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                     <filename>${project.build.finalName}.jar</filename>
@@ -71,7 +69,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>
-                <version>${version.ejb.plugin}</version>
                 <configuration>
                     <ejbVersion>3.2</ejbVersion>
                     <!-- this is false by default -->

diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml
@@ -79,7 +79,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>

diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
@@ -86,7 +86,6 @@
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
-                    <version>${version.wildfly.maven.plugin}</version>
                     <configuration>
                         <skip>true</skip>
                     </configuration>

diff --git a/helloworld-mbean/README.md b/helloworld-mbean/README.md
@@ -50,10 +50,10 @@ Build and Deploy the Quickstart
 -------------------------
 
 1. Make sure you have started the ${product.name} server as described above.
-2. Open a command propmt and navigate to the root directory of this quickstart.
+2. Open a command prompt and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive:
 
-        mvn clean wildfly:deploy
+        mvn clean install wildfly:deploy
 
 4. This will deploy `${project.artifactId}-webapp/target/${project.artifactId}-webapp.war` and `${project.artifactId}-service/target/${project.artifactId}-${project.artifactId}-service.sar` to the running instance of the server.
 

diff --git a/helloworld-mbean/helloworld-mbean-service/pom.xml b/helloworld-mbean/helloworld-mbean-service/pom.xml
@@ -50,9 +50,7 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
-                    <skip>false</skip>
                     <filename>${project.artifactId}.sar</filename>
                 </configuration>
             </plugin>

diff --git a/helloworld-mbean/helloworld-mbean-webapp/pom.xml b/helloworld-mbean/helloworld-mbean-webapp/pom.xml
@@ -37,18 +37,4 @@
         </license>
     </licenses>
 
-    <build>
-        <!-- Set the name of the WAR, used as the context root when the app is deployed -->
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/inter-app/appB/pom.xml b/inter-app/appB/pom.xml
@@ -89,12 +89,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <!-- WildFly plug-in to deploy the WAR -->
-            <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/inter-app/pom.xml b/inter-app/pom.xml
@@ -67,7 +67,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <inherited>false</inherited>
                 <configuration>
                     <skip>true</skip>

diff --git a/inter-app/shared/pom.xml b/inter-app/shared/pom.xml
@@ -59,20 +59,11 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                     <filename>${project.build.finalName}.jar</filename>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ejb-plugin</artifactId>
-                <version>${version.ejb.plugin}</version>
-                <configuration>
-                    <ejbVersion>3.1</ejbVersion>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/jaxws-addressing/pom.xml b/jaxws-addressing/pom.xml
@@ -57,17 +57,10 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/jaxws-addressing/service/pom.xml b/jaxws-addressing/service/pom.xml
@@ -37,7 +37,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${version.war.plugin}</version>
                 <configuration>
                     <attachClasses>true</attachClasses>
                     <classesClassifier>classes</classesClassifier>
@@ -48,7 +47,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>

diff --git a/jaxws-ejb/client/pom.xml b/jaxws-ejb/client/pom.xml
@@ -51,7 +51,6 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- Allows Client to be run via 'mvn exec:java' -->
             <plugin>

diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml
@@ -62,16 +62,10 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/jaxws-ejb/service/pom.xml b/jaxws-ejb/service/pom.xml
@@ -72,7 +72,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>

diff --git a/jaxws-pojo/pom.xml b/jaxws-pojo/pom.xml
@@ -47,16 +47,10 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/jaxws-pojo/service/pom.xml b/jaxws-pojo/service/pom.xml
@@ -54,7 +54,6 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
-                <version>${version.wildfly.maven.plugin}</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>

diff --git a/jaxws-retail/client/pom.xml b/jaxws-retail/client/pom.xml
@@ -46,13 +46,11 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <!-- Allows Client to be run via 'mvn exec:java' -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>${version.exec.plugin}</version>
                 <configuration>
                     <mainClass>org.jboss.quickstarts.ws.client.Client</mainClass>
                 </configuration>