Skip to content

Commit 29c1a53

Browse files
arjantijmsarjantijms
committed
Removed parent from test utility lib and set scope to test
This should fix the inability to resume and run individual test folders.
1 parent a0f6328 commit 29c1a53

File tree

24 files changed

+102
-82
lines changed

24 files changed

+102
-82
lines changed

Diff for: ‎batch/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
<groupId>org.javaee7</groupId>
3636
<artifactId>test-utils</artifactId>
3737
<version>${project.version}</version>
38+
<scope>test</scope>
3839
</dependency>
3940
<dependency>
4041
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
4142
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
43+
<scope>test</scope>
4244
</dependency>
4345
</dependencies>
4446
</project>

Diff for: ‎cdi/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
9+
1110
<groupId>org.javaee7</groupId>
1211
<artifactId>cdi</artifactId>
13-
<version>1.0-SNAPSHOT</version>
12+
1413
<packaging>pom</packaging>
1514
<name>Java EE 7 Sample: cdi</name>
1615

@@ -48,6 +47,7 @@
4847
<groupId>org.javaee7</groupId>
4948
<artifactId>test-utils</artifactId>
5049
<version>${project.version}</version>
50+
<scope>test</scope>
5151
</dependency>
5252
</dependencies>
5353
</project>

Diff for: ‎concurrency/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
11-
<groupId>org.javaee7</groupId>
9+
1210
<artifactId>concurrency</artifactId>
13-
<version>1.0-SNAPSHOT</version>
1411
<packaging>pom</packaging>
12+
1513
<name>Java EE 7 Sample: concurrency</name>
1614

1715
<modules>
@@ -26,6 +24,7 @@
2624
<groupId>org.javaee7</groupId>
2725
<artifactId>test-utils</artifactId>
2826
<version>${project.version}</version>
27+
<scope>test</scope>
2928
</dependency>
3029
</dependencies>
3130
</project>

Diff for: ‎ejb/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
@@ -29,6 +28,7 @@
2928
<groupId>org.javaee7</groupId>
3029
<artifactId>test-utils</artifactId>
3130
<version>${project.version}</version>
31+
<scope>test</scope>
3232
</dependency>
3333
</dependencies>
3434
</project>

Diff for: ‎el/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
11-
<groupId>org.javaee7</groupId>
9+
1210
<artifactId>el</artifactId>
13-
<version>1.0-SNAPSHOT</version>
1411
<packaging>pom</packaging>
12+
1513
<name>Java EE 7 Sample: el</name>
1614

1715
<modules>
@@ -23,6 +21,7 @@
2321
<groupId>org.javaee7</groupId>
2422
<artifactId>test-utils</artifactId>
2523
<version>${project.version}</version>
24+
<scope>test</scope>
2625
</dependency>
2726
</dependencies>
2827
</project>

Diff for: ‎interceptor/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
11-
<groupId>org.javaee7</groupId>
9+
1210
<artifactId>interceptor</artifactId>
13-
<version>1.0-SNAPSHOT</version>
1411
<packaging>pom</packaging>
12+
1513
<name>Java EE 7 Sample: interceptor</name>
1614

1715
<modules>
@@ -23,6 +21,7 @@
2321
<groupId>org.javaee7</groupId>
2422
<artifactId>test-utils</artifactId>
2523
<version>${project.version}</version>
24+
<scope>test</scope>
2625
</dependency>
2726
</dependencies>
2827
</project>

Diff for: ‎jacc/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
<version>1.0-SNAPSHOT</version>
77
</parent>
88

9-
<groupId>org.javaee7</groupId>
109
<artifactId>jacc</artifactId>
11-
1210
<packaging>pom</packaging>
11+
1312
<name>Java EE 7 Sample: jacc</name>
1413

1514
<modules>
@@ -22,6 +21,7 @@
2221
<groupId>org.javaee7</groupId>
2322
<artifactId>test-utils</artifactId>
2423
<version>${project.version}</version>
24+
<scope>test</scope>
2525
</dependency>
2626
</dependencies>
2727
</project>

Diff for: ‎jaspic/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
119

1210
<artifactId>jaspic</artifactId>
@@ -83,6 +81,7 @@
8381
<groupId>org.javaee7</groupId>
8482
<artifactId>test-utils</artifactId>
8583
<version>${project.version}</version>
84+
<scope>test</scope>
8685
</dependency>
8786
</dependencies>
8887

Diff for: ‎javamail/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
11-
<groupId>org.javaee7</groupId>
9+
1210
<artifactId>javamail</artifactId>
13-
<version>1.0-SNAPSHOT</version>
1411
<packaging>pom</packaging>
12+
1513
<name>Java EE 7 Sample: javamail</name>
1614

1715
<modules>
@@ -23,6 +21,7 @@
2321
<groupId>org.javaee7</groupId>
2422
<artifactId>test-utils</artifactId>
2523
<version>${project.version}</version>
24+
<scope>test</scope>
2625
</dependency>
2726
</dependencies>
2827
</project>

Diff for: ‎jaxrpc/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<groupId>org.javaee7</groupId>
2222
<artifactId>test-utils</artifactId>
2323
<version>${project.version}</version>
24+
<scope>test</scope>
2425
</dependency>
2526
</dependencies>
2627
</project>

Diff for: ‎jaxrs/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<artifactId>jaxrs</artifactId>
1111
<packaging>pom</packaging>
12+
1213
<name>Java EE 7 Sample: jaxrs</name>
1314

1415
<modules>
@@ -48,6 +49,7 @@
4849
<groupId>org.javaee7</groupId>
4950
<artifactId>test-utils</artifactId>
5051
<version>${project.version}</version>
52+
<scope>test</scope>
5153
</dependency>
5254
</dependencies>
5355
</project>

Diff for: ‎jaxws/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<groupId>org.javaee7</groupId>
2323
<artifactId>test-utils</artifactId>
2424
<version>${project.version}</version>
25+
<scope>test</scope>
2526
</dependency>
2627
</dependencies>
2728

Diff for: ‎jca/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
53

64
<parent>
75
<groupId>org.javaee7</groupId>
@@ -11,6 +9,7 @@
119

1210
<artifactId>jca</artifactId>
1311
<packaging>pom</packaging>
12+
1413
<name>Java EE 7 Sample: jca</name>
1514

1615
<modules>
@@ -23,6 +22,7 @@
2322
<groupId>org.javaee7</groupId>
2423
<artifactId>test-utils</artifactId>
2524
<version>${project.version}</version>
25+
<scope>test</scope>
2626
</dependency>
2727
</dependencies>
2828
</project>

Diff for: ‎jms/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<groupId>org.javaee7</groupId>
2626
<artifactId>test-utils</artifactId>
2727
<version>${project.version}</version>
28+
<scope>test</scope>
2829
</dependency>
2930
</dependencies>
3031

Diff for: ‎jpa/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
119

1210
<artifactId>jpa</artifactId>
@@ -50,6 +48,7 @@
5048
<groupId>org.javaee7</groupId>
5149
<artifactId>test-utils</artifactId>
5250
<version>${project.version}</version>
51+
<scope>test</scope>
5352
</dependency>
5453
</dependencies>
5554

Diff for: ‎jsf/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
@@ -9,7 +8,6 @@
98
</parent>
109

1110
<artifactId>jsf</artifactId>
12-
<version>1.0-SNAPSHOT</version>
1311
<packaging>pom</packaging>
1412

1513
<name>Java EE 7 Sample: jsf</name>
@@ -40,6 +38,7 @@
4038
<groupId>org.javaee7</groupId>
4139
<artifactId>test-utils</artifactId>
4240
<version>${project.version}</version>
41+
<scope>test</scope>
4342
</dependency>
4443
</dependencies>
4544

Diff for: ‎json/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
11-
<groupId>org.javaee7</groupId>
9+
1210
<artifactId>json</artifactId>
13-
<version>1.0-SNAPSHOT</version>
1411
<packaging>pom</packaging>
12+
1513
<name>Java EE 7 Sample: json</name>
1614

1715
<modules>
@@ -26,6 +24,7 @@
2624
<groupId>org.javaee7</groupId>
2725
<artifactId>test-utils</artifactId>
2826
<version>${project.version}</version>
27+
<scope>test</scope>
2928
</dependency>
3029
</dependencies>
3130
</project>

Diff for: ‎jta/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>org.javaee7</groupId>
76
<artifactId>samples-parent</artifactId>
87
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
108
</parent>
11-
<groupId>org.javaee7</groupId>
9+
1210
<artifactId>jta</artifactId>
13-
<version>1.0-SNAPSHOT</version>
1411
<packaging>pom</packaging>
12+
1513
<name>Java EE 7 Sample: jta</name>
1614

1715
<modules>
@@ -25,6 +23,7 @@
2523
<groupId>org.javaee7</groupId>
2624
<artifactId>test-utils</artifactId>
2725
<version>${project.version}</version>
26+
<scope>test</scope>
2827
</dependency>
2928
</dependencies>
3029

0 commit comments

Comments
 (0)