Skip to content

Commit 26fa521

Browse files
arjantijmsarjantijms
authored
Fix tabs/spaces in pom.xml and resolve unnoticed merge conflict (#432)
1 parent 5f6d613 commit 26fa521

2 files changed

Lines changed: 38 additions & 54 deletions

File tree

  • cdi/dynamic-interceptor/src/main/java/org/javaee7/cdi/dynamic/interceptor/extension
  • pom.xml

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.javaee7.cdi.dynamic.interceptor.extension;
22

33
import static java.lang.annotation.ElementType.METHOD;
4-
import static java.lang.annotation.ElementType.TYPE;
54
import static java.lang.annotation.RetentionPolicy.RUNTIME;
65

76
import java.lang.annotation.Inherited;
@@ -14,6 +13,6 @@
1413
@Inherited
1514
@InterceptorBinding
1615
@Retention(RUNTIME)
17-
@Target( {METHOD, TYPE} )
16+
@Target(METHOD)
1817
public @interface Hello {
1918
}

‎pom.xml‎

Lines changed: 37 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<name>Java EE 7 Sample: javaee7-samples</name>
1111

1212
<properties>
13-
<arquillian.version>1.1.14.Final</arquillian.version>
13+
<arquillian.version>1.1.14.Final</arquillian.version>
1414
<java.min.version>1.7</java.min.version>
1515
<maven.min.version>3.0.0</maven.min.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -57,19 +57,19 @@
5757
</snapshots>
5858
</repository>
5959

60-
<repository>
61-
<id>payara-milestones</id>
62-
<name>Payara Milestones</name>
63-
64-
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
65-
66-
<releases>
67-
<enabled>true</enabled>
68-
</releases>
69-
<snapshots>
70-
<enabled>false</enabled>
71-
</snapshots>
72-
</repository>
60+
<repository>
61+
<id>payara-milestones</id>
62+
<name>Payara Milestones</name>
63+
64+
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
65+
66+
<releases>
67+
<enabled>true</enabled>
68+
</releases>
69+
<snapshots>
70+
<enabled>false</enabled>
71+
</snapshots>
72+
</repository>
7373

7474
<repository>
7575
<id>ossrh</id>
@@ -145,11 +145,11 @@
145145
<version>1.4.195</version>
146146
</dependency>
147147
<dependency>
148-
<groupId>fish.payara.arquillian</groupId>
149-
<artifactId>payara-client-ee7</artifactId>
150-
<version>1.0.Beta3-m1</version>
151-
<scope>test</scope>
152-
</dependency>
148+
<groupId>fish.payara.arquillian</groupId>
149+
<artifactId>payara-client-ee7</artifactId>
150+
<version>1.0.Beta3-m1</version>
151+
<scope>test</scope>
152+
</dependency>
153153
</dependencies>
154154
</dependencyManagement>
155155

@@ -360,12 +360,11 @@
360360
</activation>
361361

362362
<dependencies>
363-
364363
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
365-
<dependency>
366-
<groupId>fish.payara.arquillian</groupId>
367-
<artifactId>payara-client-ee7</artifactId>
368-
</dependency>
364+
<dependency>
365+
<groupId>fish.payara.arquillian</groupId>
366+
<artifactId>payara-client-ee7</artifactId>
367+
</dependency>
369368

370369
<!-- The actual Arquillian connector -->
371370
<dependency>
@@ -430,11 +429,11 @@
430429
</properties>
431430

432431
<dependencies>
433-
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
434-
<dependency>
435-
<groupId>fish.payara.arquillian</groupId>
436-
<artifactId>payara-client-ee7</artifactId>
437-
</dependency>
432+
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
433+
<dependency>
434+
<groupId>fish.payara.arquillian</groupId>
435+
<artifactId>payara-client-ee7</artifactId>
436+
</dependency>
438437

439438
<!-- The Arquillian connector -->
440439
<dependency>
@@ -443,20 +442,6 @@
443442
<version>1.0.Beta3-m1</version>
444443
<scope>test</scope>
445444
</dependency>
446-
447-
<!-- WebSocket client dependencies -->
448-
<dependency>
449-
<groupId>org.glassfish.tyrus</groupId>
450-
<artifactId>tyrus-client</artifactId>
451-
<version>1.13</version>
452-
<scope>test</scope>
453-
</dependency>
454-
<dependency>
455-
<groupId>org.glassfish.tyrus</groupId>
456-
<artifactId>tyrus-container-grizzly-client</artifactId>
457-
<version>1.13</version>
458-
<scope>test</scope>
459-
</dependency>
460445
</dependencies>
461446

462447
<build>
@@ -503,10 +488,10 @@
503488
<id>payara-embedded</id>
504489
<dependencies>
505490
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
506-
<dependency>
507-
<groupId>fish.payara.arquillian</groupId>
508-
<artifactId>payara-client-ee7</artifactId>
509-
</dependency>
491+
<dependency>
492+
<groupId>fish.payara.arquillian</groupId>
493+
<artifactId>payara-client-ee7</artifactId>
494+
</dependency>
510495

511496
<dependency>
512497
<groupId>org.jboss.arquillian.container</groupId>
@@ -533,11 +518,11 @@
533518
<id>payara-remote</id>
534519

535520
<dependencies>
536-
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
537-
<dependency>
538-
<groupId>fish.payara.arquillian</groupId>
539-
<artifactId>payara-client-ee7</artifactId>
540-
</dependency>
521+
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
522+
<dependency>
523+
<groupId>fish.payara.arquillian</groupId>
524+
<artifactId>payara-client-ee7</artifactId>
525+
</dependency>
541526

542527
<!-- The actual Arquillian connector -->
543528
<dependency>

0 commit comments

Comments
 (0)