Skip to content

Commit a49bc3b

Browse files
Pandrex247Pandrex247
authored
Merge branch 'master' into Cleanup-And-Formatting
2 parents f9ed3f2 + e30f352 commit a49bc3b

File tree

35 files changed

+288
-121
lines changed

35 files changed

+288
-121
lines changed

‎batch/pom.xml‎

Lines changed: 2 additions & 0 deletions
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>

‎cdi/pom.xml‎

Lines changed: 4 additions & 4 deletions
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>

‎concurrency/pom.xml‎

Lines changed: 4 additions & 5 deletions
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>

‎ejb/pom.xml‎

Lines changed: 2 additions & 2 deletions
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>

‎ejb/remote/vendor/pom.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,27 @@
1212

1313
<artifactId>ejb-remote-vendor</artifactId>
1414
<packaging>pom</packaging>
15+
16+
<properties>
17+
<glassfish.client.version>5.0</glassfish.client.version>
18+
<java.min.version>1.7</java.min.version>
19+
</properties>
1520

1621
<name>Java EE 7 Sample: ejb - remote - vendor</name>
22+
23+
<build>
24+
<plugins>
25+
<plugin>
26+
<groupId>org.apache.maven.plugins</groupId>
27+
<artifactId>maven-compiler-plugin</artifactId>
28+
<version>3.8.0</version>
29+
<configuration>
30+
<source>${java.min.version}</source>
31+
<target>${java.min.version}</target>
32+
</configuration>
33+
</plugin>
34+
</plugins>
35+
</build>
1736

1837
<profiles>
1938
<profile>

‎el/pom.xml‎

Lines changed: 4 additions & 5 deletions
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>

‎interceptor/pom.xml‎

Lines changed: 4 additions & 5 deletions
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>

‎jacc/pom.xml‎

Lines changed: 2 additions & 2 deletions
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>

‎jaspic/pom.xml‎

Lines changed: 2 additions & 3 deletions
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

‎javamail/pom.xml‎

Lines changed: 4 additions & 5 deletions
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>

0 commit comments

Comments
 (0)