changing groupId:artifactId to org.everit.expression:org.everit.expression.json.schema, package names modified too

Author: erosb

.travis.yml

@@ -8,4 +8,4 @@ before_install:
     - export MANPATH="$HOME/.linuxbrew/share/man:$MANPATH"
     - export INFOPATH="$HOME/.linuxbrew/share/info:$INFOPATH"
     - brew install jdk
-    - export JAVA_HOME=/home/travis/.linuxbrew/Cellar/jdk/1.8.0-60
+    - export JAVA_HOME=/home/travis/.linuxbrew/Cellar/jdk/1.8.0-45

README.md

@@ -13,9 +13,11 @@ import org.everit.jsonvalidator.loader.SchemaLoader;
 import org.json.JSONObject;
 import org.json.JSONTokener;
 // ...
-JSONObject rawSchema = new JSONObject(new JSONTokener(getClass().getResourceAsStream("/path/to/your/schema.json")));
-Schema schema = SchemaLoader.load(rawSchema);
-schema.validate(new JSONObject("{\"hello\" : \"world\"}")); // throws a ValidationException if this object is invalid
+try (InputStream inputStream = getClass().getResourceAsStream("/path/to/your/schema.json")) {
+  JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream));
+  Schema schema = SchemaLoader.load(rawSchema);
+  schema.validate(new JSONObject("{\"hello\" : \"world\"}")); // throws a ValidationException if this object is invalid
+}
 ```
 
 

core/pom.xml

@@ -22,12 +22,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.everit</groupId>
-    <artifactId>org.everit.jsonvalidator.parent</artifactId>
-    <version>1.0.0</version>
+    <groupId>org.everit.config</groupId>
+    <artifactId>org.everit.config.oss</artifactId>
+    <version>6.0.7</version>
   </parent>
 
-  <artifactId>org.everit.jsonvalidator</artifactId>
+  <groupId>org.everit.expression</groupId>
+  <artifactId>org.everit.expression.json.schema</artifactId>
+  <version>1.0.0</version>
 
   <packaging>bundle</packaging>
 
@@ -72,8 +74,8 @@
               *
             </Import-Package>
             <Export-Package>
-              org.everit.jsonvalidator;version=${project.version},
-              org.everit.jsonvalidator.loader;version=${project.version}
+              ${project.artifactId};version=${project.version},
+              ${project.artifactId}.loader;version=${project.version}
             </Export-Package>
           </instructions>
         </configuration>

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 /**
  * Boolean schema validator.

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 /**
  * A schema not specifying any restrictions, ie. accepting any values.

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 import java.util.Collections;
 import java.util.HashSet;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 import java.util.Objects;
 

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.everit.jsonvalidator;
+package org.everit.expression.json.schema;
 
 import org.json.JSONObject;