Skip to content

Commit c32fc13

Browse files
Merge pull request #1 from erosb/master
Package refactoring
2 parents f4eb889 + a80db3a commit c32fc13

Some content is hidden

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

69 files changed

+130
-121
lines changed

core/pom.xml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,18 @@
2727
<version>7.0.1</version>
2828
</parent>
2929

30-
<groupId>org.everit.expression</groupId>
31-
<artifactId>org.everit.expression.json.schema</artifactId>
30+
<groupId>org.everit.json</groupId>
31+
<artifactId>org.everit.json.schema</artifactId>
3232
<version>1.0.0</version>
3333

3434
<packaging>bundle</packaging>
3535

36+
<properties>
37+
<projectpath>json-schema-validator</projectpath>
38+
<maven.compiler.source>1.8</maven.compiler.source>
39+
<maven.compiler.target>1.8</maven.compiler.target>
40+
</properties>
41+
3642
<licenses>
3743
<license>
3844
<name>Apache License, Version 2.0</name>
@@ -51,18 +57,15 @@
5157
<name>Everit Kft.</name>
5258
<url>http://www.everit.org</url>
5359
</organization>
60+
61+
<scm>
62+
<connection>scm:git:git://github.com/everit-org/${projectpath}.git</connection>
63+
<developerConnection>scm:git:https://github.com/everit-org/${projectpath}.git</developerConnection>
64+
<url>https://github.com/everit-org/${projectpath}</url>
65+
</scm>
5466

5567
<build>
5668
<plugins>
57-
<plugin>
58-
<groupId>org.apache.maven.plugins</groupId>
59-
<artifactId>maven-compiler-plugin</artifactId>
60-
<version>3.3</version>
61-
<configuration>
62-
<source>1.8</source>
63-
<target>1.8</target>
64-
</configuration>
65-
</plugin>
6669
<plugin>
6770
<groupId>org.apache.felix</groupId>
6871
<artifactId>maven-bundle-plugin</artifactId>

core/src/main/java/org/everit/expression/json/schema/ArraySchema.java renamed to core/src/main/java/org/everit/json/schema/ArraySchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import java.util.ArrayList;
1919
import java.util.Collection;

core/src/main/java/org/everit/expression/json/schema/BooleanSchema.java renamed to core/src/main/java/org/everit/json/schema/BooleanSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
/**
1919
* Boolean schema validator.

core/src/main/java/org/everit/expression/json/schema/CombinedSchema.java renamed to core/src/main/java/org/everit/json/schema/CombinedSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import java.util.ArrayList;
1919
import java.util.Collection;

core/src/main/java/org/everit/expression/json/schema/EmptySchema.java renamed to core/src/main/java/org/everit/json/schema/EmptySchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
/**
1919
* A schema not specifying any restrictions, ie. accepting any values.

core/src/main/java/org/everit/expression/json/schema/EnumSchema.java renamed to core/src/main/java/org/everit/json/schema/EnumSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import java.util.Collections;
1919
import java.util.HashSet;

core/src/main/java/org/everit/expression/json/schema/NotSchema.java renamed to core/src/main/java/org/everit/json/schema/NotSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import java.util.Objects;
1919

core/src/main/java/org/everit/expression/json/schema/NullSchema.java renamed to core/src/main/java/org/everit/json/schema/NullSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import org.json.JSONObject;
1919

core/src/main/java/org/everit/expression/json/schema/NumberSchema.java renamed to core/src/main/java/org/everit/json/schema/NumberSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import java.math.BigDecimal;
1919

core/src/main/java/org/everit/expression/json/schema/ObjectComparator.java renamed to core/src/main/java/org/everit/json/schema/ObjectComparator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.everit.expression.json.schema;
16+
package org.everit.json.schema;
1717

1818
import java.util.Arrays;
1919
import java.util.Objects;

0 commit comments

Comments
 (0)