Skip to content

Commit 7c67df1

Browse files
erosberosb
committed
changing directory structure for android-compat testing
1 parent e24e578 commit 7c67df1

File tree

226 files changed

+133
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+133
-63
lines changed

‎tests/android/pom.xml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?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+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.everit.json</groupId>
9+
<artifactId>org.everit.json.schema.tests.parent</artifactId>
10+
<version>1.10.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>org.everit.json.schema.tests.android</artifactId>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-compiler-plugin</artifactId>
20+
<version>3.3</version>
21+
<configuration>
22+
<source>1.8</source>
23+
<target>1.8</target>
24+
</configuration>
25+
</plugin>
26+
</plugins>
27+
</build>
28+
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.everit.json</groupId>
32+
<artifactId>org.everit.json.schema</artifactId>
33+
<version>${project.version}</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>org.json</groupId>
37+
<artifactId>json</artifactId>
38+
</exclusion>
39+
</exclusions>
40+
</dependency>
41+
<dependency>
42+
<groupId>junit</groupId>
43+
<artifactId>junit</artifactId>
44+
<version>4.12</version>
45+
<scope>test</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.reflections</groupId>
49+
<artifactId>reflections</artifactId>
50+
<version>0.9.10</version>
51+
<scope>test</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.eclipse.jetty</groupId>
55+
<artifactId>jetty-server</artifactId>
56+
<version>9.3.4.RC0</version>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.eclipse.jetty</groupId>
61+
<artifactId>jetty-servlet</artifactId>
62+
<version>9.3.4.RC0</version>
63+
</dependency>
64+
</dependencies>
65+
</project>

‎tests/pom.xml‎

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
4-
Copyright (C) 2011 Everit Kft. (http://www.everit.org)
5-
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
18-
-->
192
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
203
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
224
<modelVersion>4.0.0</modelVersion>
23-
245
<parent>
256
<groupId>org.everit.json</groupId>
267
<artifactId>org.everit.json.schema.parent</artifactId>
278
<version>1.10.0-SNAPSHOT</version>
289
</parent>
2910

30-
<artifactId>org.everit.json.schema.tests</artifactId>
11+
<artifactId>org.everit.json.schema.tests.parent</artifactId>
12+
13+
<packaging>pom</packaging>
3114

32-
<build>
33-
<plugins>
34-
<plugin>
35-
<groupId>org.apache.maven.plugins</groupId>
36-
<artifactId>maven-compiler-plugin</artifactId>
37-
<version>3.3</version>
38-
<configuration>
39-
<source>1.8</source>
40-
<target>1.8</target>
41-
</configuration>
42-
</plugin>
43-
</plugins>
44-
</build>
15+
<modules>
16+
<module>vanilla</module>
17+
<module>android</module>
18+
</modules>
4519

46-
<dependencies>
47-
<dependency>
48-
<groupId>org.everit.json</groupId>
49-
<artifactId>org.everit.json.schema</artifactId>
50-
<version>${project.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>junit</groupId>
54-
<artifactId>junit</artifactId>
55-
<version>4.12</version>
56-
<scope>test</scope>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.reflections</groupId>
60-
<artifactId>reflections</artifactId>
61-
<version>0.9.10</version>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.eclipse.jetty</groupId>
66-
<artifactId>jetty-server</artifactId>
67-
<version>9.3.4.RC0</version>
68-
<scope>test</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.eclipse.jetty</groupId>
72-
<artifactId>jetty-servlet</artifactId>
73-
<version>9.3.4.RC0</version>
74-
</dependency>
75-
</dependencies>
7620
</project>
21+
22+

‎tests/vanilla/pom.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?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+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.everit.json</groupId>
9+
<artifactId>org.everit.json.schema.tests.parent</artifactId>
10+
<version>1.10.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>org.everit.json.schema.tests.vanilla</artifactId>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-compiler-plugin</artifactId>
20+
<version>3.3</version>
21+
<configuration>
22+
<source>1.8</source>
23+
<target>1.8</target>
24+
</configuration>
25+
</plugin>
26+
</plugins>
27+
</build>
28+
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.everit.json</groupId>
32+
<artifactId>org.everit.json.schema</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>junit</groupId>
37+
<artifactId>junit</artifactId>
38+
<version>4.12</version>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.reflections</groupId>
43+
<artifactId>reflections</artifactId>
44+
<version>0.9.10</version>
45+
<scope>test</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.eclipse.jetty</groupId>
49+
<artifactId>jetty-server</artifactId>
50+
<version>9.3.4.RC0</version>
51+
<scope>test</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.eclipse.jetty</groupId>
55+
<artifactId>jetty-servlet</artifactId>
56+
<version>9.3.4.RC0</version>
57+
</dependency>
58+
</dependencies>
59+
</project>

‎tests/src/test/java/org/everit/json/schema/EmptyObjectTest.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/EmptyObjectTest.java‎

File renamed without changes.

‎tests/src/test/java/org/everit/json/schema/EvenCharNumValidator.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/EvenCharNumValidator.java‎

File renamed without changes.

‎tests/src/test/java/org/everit/json/schema/InvalidObjectInArrayTest.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/InvalidObjectInArrayTest.java‎

File renamed without changes.

‎tests/src/test/java/org/everit/json/schema/IssueServlet.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/IssueServlet.java‎

File renamed without changes.

‎tests/src/test/java/org/everit/json/schema/IssueTest.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/IssueTest.java‎

File renamed without changes.

‎tests/src/test/java/org/everit/json/schema/JettyWrapper.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/JettyWrapper.java‎

File renamed without changes.

‎tests/src/test/java/org/everit/json/schema/MetaSchemaTest.java‎ renamed to ‎tests/vanilla/src/test/java/org/everit/json/schema/MetaSchemaTest.java‎

File renamed without changes.

0 commit comments

Comments
 (0)