Skip to content

Commit 9d55d25

Browse files
author
Burak Serdar
committed
Merge remote-tracking branch 'upstream/v2-head'
2 parents 2cf62c1 + d4091ca commit 9d55d25

File tree

97 files changed

+6282
-2809
lines changed

Some content is hidden

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

97 files changed

+6282
-2809
lines changed

‎config/pom.xml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<!--
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
32
Copyright 2013 Red Hat, Inc. and/or its affiliates.
43
54
This file is part of lightblue.
@@ -16,48 +15,47 @@
1615
1716
You should have received a copy of the GNU General Public License
1817
along with this program. If not, see <http://www.gnu.org/licenses />.
19-
-->
20-
<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/maven-v4_0_0.xsd">
18+
--><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/maven-v4_0_0.xsd">
2119
<modelVersion>4.0.0</modelVersion>
2220
<parent>
2321
<groupId>com.redhat.lightblue</groupId>
2422
<artifactId>lightblue-core-pom</artifactId>
25-
<version>1.16.0-SNAPSHOT</version>
23+
<version>2.0.0-SNAPSHOT</version>
2624
</parent>
2725
<groupId>com.redhat.lightblue</groupId>
28-
<artifactId>lightblue-core-config</artifactId>
26+
<version>2.0.0-SNAPSHOT</version><artifactId>lightblue-core-config</artifactId>
2927
<packaging>jar</packaging>
3028
<name>lightblue-core: ${project.groupId}|${project.artifactId}</name>
3129
<dependencies>
3230
<dependency>
3331
<groupId>com.redhat.lightblue</groupId>
3432
<artifactId>lightblue-core-metadata</artifactId>
35-
<version>${project.version}</version>
33+
<version>2.0.0-SNAPSHOT</version>
3634
</dependency>
3735
<dependency>
3836
<groupId>com.redhat.lightblue</groupId>
3937
<artifactId>lightblue-core-util</artifactId>
40-
<version>${project.version}</version>
38+
<version>2.0.0-SNAPSHOT</version>
4139
</dependency>
4240
<dependency>
4341
<groupId>com.redhat.lightblue</groupId>
4442
<artifactId>lightblue-core-api</artifactId>
45-
<version>${project.version}</version>
43+
<version>2.0.0-SNAPSHOT</version>
4644
</dependency>
4745
<dependency>
4846
<groupId>com.redhat.lightblue</groupId>
4947
<artifactId>lightblue-core-query-api</artifactId>
50-
<version>${project.version}</version>
48+
<version>2.0.0-SNAPSHOT</version>
5149
</dependency>
5250
<dependency>
5351
<groupId>com.redhat.lightblue</groupId>
5452
<artifactId>lightblue-core-crud</artifactId>
55-
<version>${project.version}</version>
53+
<version>2.0.0-SNAPSHOT</version>
5654
</dependency>
5755
<dependency>
5856
<groupId>com.redhat.lightblue</groupId>
5957
<artifactId>lightblue-core-extensions</artifactId>
60-
<version>${project.version}</version>
58+
<version>2.0.0-SNAPSHOT</version>
6159
</dependency>
6260
<dependency>
6361
<groupId>com.fasterxml.jackson.core</groupId>

‎core-api/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<!--
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
32
Copyright 2013 Red Hat, Inc. and/or its affiliates.
43
54
This file is part of lightblue.
@@ -16,23 +15,22 @@
1615
1716
You should have received a copy of the GNU General Public License
1817
along with this program. If not, see <http://www.gnu.org/licenses />.
19-
-->
20-
<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/maven-v4_0_0.xsd">
18+
--><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/maven-v4_0_0.xsd">
2119
<modelVersion>4.0.0</modelVersion>
2220
<parent>
2321
<groupId>com.redhat.lightblue</groupId>
2422
<artifactId>lightblue-core-pom</artifactId>
25-
<version>1.16.0-SNAPSHOT</version>
23+
<version>2.0.0-SNAPSHOT</version>
2624
</parent>
2725
<groupId>com.redhat.lightblue</groupId>
28-
<artifactId>lightblue-core-api</artifactId>
26+
<version>2.0.0-SNAPSHOT</version><artifactId>lightblue-core-api</artifactId>
2927
<packaging>jar</packaging>
3028
<name>lightblue-core: ${project.groupId}|${project.artifactId}</name>
3129
<dependencies>
3230
<dependency>
3331
<groupId>com.redhat.lightblue</groupId>
3432
<artifactId>lightblue-core-util</artifactId>
35-
<version>${project.version}</version>
33+
<version>2.0.0-SNAPSHOT</version>
3634
</dependency>
3735
<dependency>
3836
<groupId>com.fasterxml.jackson.core</groupId>

‎crud/pom.xml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<!--
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
32
Copyright 2013 Red Hat, Inc. and/or its affiliates.
43
54
This file is part of lightblue.
@@ -16,43 +15,42 @@
1615
1716
You should have received a copy of the GNU General Public License
1817
along with this program. If not, see <http://www.gnu.org/licenses />.
19-
-->
20-
<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/maven-v4_0_0.xsd">
18+
--><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/maven-v4_0_0.xsd">
2119
<modelVersion>4.0.0</modelVersion>
2220
<parent>
2321
<groupId>com.redhat.lightblue</groupId>
2422
<artifactId>lightblue-core-pom</artifactId>
25-
<version>1.16.0-SNAPSHOT</version>
23+
<version>2.0.0-SNAPSHOT</version>
2624
</parent>
2725
<groupId>com.redhat.lightblue</groupId>
28-
<artifactId>lightblue-core-crud</artifactId>
26+
<version>2.0.0-SNAPSHOT</version><artifactId>lightblue-core-crud</artifactId>
2927
<packaging>jar</packaging>
3028
<name>lightblue-core: ${project.groupId}|${project.artifactId}</name>
3129
<dependencies>
3230
<dependency>
3331
<groupId>com.redhat.lightblue</groupId>
3432
<artifactId>lightblue-core-metadata</artifactId>
35-
<version>${project.version}</version>
33+
<version>2.0.0-SNAPSHOT</version>
3634
</dependency>
3735
<dependency>
3836
<groupId>com.redhat.lightblue</groupId>
3937
<artifactId>lightblue-core-api</artifactId>
40-
<version>${project.version}</version>
38+
<version>2.0.0-SNAPSHOT</version>
4139
</dependency>
4240
<dependency>
4341
<groupId>com.redhat.lightblue</groupId>
4442
<artifactId>lightblue-core-query-api</artifactId>
45-
<version>${project.version}</version>
43+
<version>2.0.0-SNAPSHOT</version>
4644
</dependency>
4745
<dependency>
4846
<groupId>com.redhat.lightblue</groupId>
4947
<artifactId>lightblue-core-util</artifactId>
50-
<version>${project.version}</version>
48+
<version>2.0.0-SNAPSHOT</version>
5149
</dependency>
5250
<dependency>
5351
<groupId>com.redhat.lightblue</groupId>
5452
<artifactId>lightblue-core-extensions</artifactId>
55-
<version>${project.version}</version>
53+
<version>2.0.0-SNAPSHOT</version>
5654
</dependency>
5755
<dependency>
5856
<groupId>com.fasterxml.jackson.core</groupId>
@@ -86,7 +84,12 @@
8684
<artifactId>json-schema-validator</artifactId>
8785
<scope>test</scope>
8886
</dependency>
89-
</dependencies>
87+
<dependency>
88+
<groupId>org.skyscreamer</groupId>
89+
<artifactId>jsonassert</artifactId>
90+
<scope>test</scope>
91+
</dependency>
92+
</dependencies>
9093
<build>
9194
</build>
9295
</project>

0 commit comments

Comments
 (0)