Fix tabs/spaces in pom.xml and resolve unnoticed merge conflict (#432)

Author: arjantijms

cdi/dynamic-interceptor/src/main/java/org/javaee7/cdi/dynamic/interceptor/extension/Hello.java

@@ -1,7 +1,6 @@
 package org.javaee7.cdi.dynamic.interceptor.extension;
 
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Inherited;
@@ -14,6 +13,6 @@
 @Inherited
 @InterceptorBinding
 @Retention(RUNTIME)
-@Target( {METHOD, TYPE} )
+@Target(METHOD)
 public @interface Hello {
 }

pom.xml

@@ -10,7 +10,7 @@
     <name>Java EE 7 Sample: javaee7-samples</name>
 
     <properties>
-	<arquillian.version>1.1.14.Final</arquillian.version>
+    <arquillian.version>1.1.14.Final</arquillian.version>
         <java.min.version>1.7</java.min.version>
         <maven.min.version>3.0.0</maven.min.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -57,19 +57,19 @@
             </snapshots>
         </repository>
 
-		<repository>
-			<id>payara-milestones</id>
-			<name>Payara Milestones</name>
-			
-			<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
-			
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
+        <repository>
+            <id>payara-milestones</id>
+            <name>Payara Milestones</name>
+            
+            <url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
+            
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
 
         <repository>
             <id>ossrh</id>
@@ -145,11 +145,11 @@
                 <version>1.4.195</version>
             </dependency>
             <dependency>
-				<groupId>fish.payara.arquillian</groupId>
-   					<artifactId>payara-client-ee7</artifactId>
-   					<version>1.0.Beta3-m1</version>
-   					<scope>test</scope>
-			</dependency>
+                <groupId>fish.payara.arquillian</groupId>
+                       <artifactId>payara-client-ee7</artifactId>
+                       <version>1.0.Beta3-m1</version>
+                       <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -360,12 +360,11 @@
             </activation>
 
             <dependencies>
-                
                  <!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
-				<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-    					<artifactId>payara-client-ee7</artifactId>
-				</dependency>
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>payara-client-ee7</artifactId>
+                </dependency>
 
                 <!-- The actual Arquillian connector -->
                 <dependency>
@@ -430,11 +429,11 @@
             </properties>
 
             <dependencies>
-            		<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
-				<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-    					<artifactId>payara-client-ee7</artifactId>
-				</dependency>
+                <!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>payara-client-ee7</artifactId>
+                </dependency>
 
                 <!-- The Arquillian connector -->
                 <dependency>
@@ -443,20 +442,6 @@
                     <version>1.0.Beta3-m1</version> 
                     <scope>test</scope>
                 </dependency>
-                
-                <!-- WebSocket client dependencies -->
-                <dependency>
-                    <groupId>org.glassfish.tyrus</groupId>
-                    <artifactId>tyrus-client</artifactId>
-                    <version>1.13</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.glassfish.tyrus</groupId>
-                    <artifactId>tyrus-container-grizzly-client</artifactId>
-                    <version>1.13</version>
-                    <scope>test</scope>
-                </dependency>
             </dependencies>
 
             <build>
@@ -503,10 +488,10 @@
             <id>payara-embedded</id>
             <dependencies>
                 <!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
-				<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-    					<artifactId>payara-client-ee7</artifactId>
-				</dependency>
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                        <artifactId>payara-client-ee7</artifactId>
+                </dependency>
 
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
@@ -533,11 +518,11 @@
             <id>payara-remote</id>
 
             <dependencies>
-				<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
-				<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-    					<artifactId>payara-client-ee7</artifactId>
-				</dependency>
+                <!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>payara-client-ee7</artifactId>
+                </dependency>
 
                 <!-- The actual Arquillian connector -->
                 <dependency>