Skip to content

Commit dd3c4bf

Browse files
committed
Update to simplified seed / poms
1 parent 227f752 commit dd3c4bf

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

pom.xml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515

1616
<parent>
1717
<groupId>org.seedstack</groupId>
18-
<artifactId>parent</artifactId>
19-
<version>2.0.1-SNAPSHOT</version>
18+
<artifactId>parent-internal</artifactId>
19+
<version>2.1.0-SNAPSHOT</version>
2020
</parent>
2121

22-
<artifactId>seed-validation</artifactId>
23-
<version>2.0.1-SNAPSHOT</version>
22+
<groupId>org.seedstack.addons</groupId>
23+
<artifactId>validation</artifactId>
24+
<version>2.1.0-M1-SNAPSHOT</version>
2425

2526
<properties>
26-
<seed.version>2.0.0</seed.version>
27+
<seed.version>2.1.0-M1-SNAPSHOT</seed.version>
2728
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
2829

2930
<compatibility.groupId>org.seedstack.seed</compatibility.groupId>
@@ -41,12 +42,9 @@
4142
<includedLicenses>
4243
<includedLicense>Apache 2</includedLicense>
4344
<includedLicense>BSD</includedLicense>
44-
<includedLicense>EPL 1.0</includedLicense>
45-
<includedLicense>LGPL 2.1</includedLicense>
4645
<includedLicense>LGPL 3.0</includedLicense>
4746
<includedLicense>MIT License</includedLicense>
4847
<includedLicense>MPL 2.0</includedLicense>
49-
<includedLicense>The JSON License</includedLicense>
5048
<includedLicense>Public Domain</includedLicense>
5149
<includedLicense>WTFPL</includedLicense>
5250

@@ -59,8 +57,6 @@
5957
<licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
6058
<licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
6159
<licenseMerge>BSD|The New BSD License</licenseMerge>
62-
<licenseMerge>EPL 1.0|Eclipse Public License, Version 1.0</licenseMerge>
63-
<licenseMerge>LGPL 2.1|GNU Lesser General Public License, Version 2.1</licenseMerge>
6460
<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
6561
<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
6662
<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
@@ -74,7 +70,7 @@
7470
<dependencies>
7571
<dependency>
7672
<groupId>org.seedstack.seed</groupId>
77-
<artifactId>seed-core-support-core</artifactId>
73+
<artifactId>seed-core</artifactId>
7874
<version>${seed.version}</version>
7975
</dependency>
8076
<dependency>
@@ -86,26 +82,26 @@
8682

8783
<dependency>
8884
<groupId>org.seedstack.seed</groupId>
89-
<artifactId>seed-integrationtest-support-core</artifactId>
85+
<artifactId>seed-testing</artifactId>
9086
<version>${seed.version}</version>
9187
<scope>test</scope>
9288
</dependency>
9389
<dependency>
9490
<groupId>org.seedstack.seed</groupId>
95-
<artifactId>seed-el-support</artifactId>
91+
<artifactId>seed-el</artifactId>
9692
<version>${seed.version}</version>
9793
<scope>test</scope>
9894
</dependency>
9995
<dependency>
10096
<groupId>javax.el</groupId>
10197
<artifactId>javax.el-api</artifactId>
102-
<version>2.2.5</version>
98+
<version>${javax-el.version}</version>
10399
<scope>test</scope>
104100
</dependency>
105101
<dependency>
106102
<groupId>ch.qos.logback</groupId>
107103
<artifactId>logback-classic</artifactId>
108-
<version>1.1.3</version>
104+
<version>${logback.version}</version>
109105
<scope>test</scope>
110106
</dependency>
111107
</dependencies>

src/it/java/org/seedstack/seed/validation/internal/ValidationPlugin_ValidationErrorIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.assertj.core.api.Assertions.assertThat;
2222

2323
@RunWith(SeedITRunner.class)
24-
@Expect(ValidationException.class)
24+
@Expect(value = ValidationException.class, step = Expect.TestingStep.INSTANTIATION)
2525
public class ValidationPlugin_ValidationErrorIT {
2626

2727
@Inject

0 commit comments

Comments
 (0)