Merge pull request #47 from gchq/release/2.0.0

Upgrade to 2.0.0

Author: GCHQDeveloper42

Diff for: core/pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>uk.gov.gchq.magma-core</groupId>
     <artifactId>magma-core</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>uk.gov.gchq.magma-core</groupId>
   <artifactId>core</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <name>core</name>
 

Diff for: examples/pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>uk.gov.gchq.magma-core</groupId>
     <artifactId>magma-core</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>uk.gov.gchq.magma-core</groupId>
   <artifactId>demo</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <name>examples</name>
 

Diff for: examples/src/main/java/uk/gov/gchq/magmacore/examples/data/ExampleRdl.java

@@ -53,7 +53,7 @@ public static DbChangeSet createRefDataObjects() {
         final IRI naturalMemberOfSocietyRole = new IRI(REF_BASE, uid());
         final IRI domesticPropertyRole = new IRI(REF_BASE, uid());
         final IRI domesticOccupantInPropertyRole = new IRI(REF_BASE, uid());
-        final IRI occupierOfPropertyRole = new IRI(REF_BASE, "occupierOfPropertyRole ");
+        final IRI occupierOfPropertyRole = new IRI(REF_BASE, "occupierOfPropertyRole");
         final IRI occupantInPropertyKindOfAssociation = new IRI(REF_BASE, uid());
 
         // Add DbCreateOperations to create the objects and their properties.

Diff for: hqdm-rdf/pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>uk.gov.gchq.magma-core</groupId>
     <artifactId>magma-core</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>uk.gov.gchq.magma-core</groupId>
   <artifactId>hqdm-rdf</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <name>hqdm-rdf</name>
 

Diff for: hqdm/pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>uk.gov.gchq.magma-core</groupId>
     <artifactId>magma-core</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>uk.gov.gchq.magma-core</groupId>
   <artifactId>hqdm</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <name>hqdm</name>
 

Diff for: pom.xml

@@ -19,7 +19,7 @@
 
   <groupId>uk.gov.gchq.magma-core</groupId>
   <artifactId>magma-core</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>2.0.0</version>
   <packaging>pom</packaging>
 
   <name>Magma Core</name>
@@ -54,22 +54,22 @@
       <dependency>
         <groupId>uk.gov.gchq.magma-core</groupId>
         <artifactId>core</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.gchq.magma-core</groupId>
         <artifactId>hqdm</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.gchq.magma-core</groupId>
         <artifactId>hqdm-rdf</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.13.1</version>
+        <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -81,12 +81,12 @@
         <groupId>org.apache.jena</groupId>
         <artifactId>apache-jena-libs</artifactId>
         <type>pom</type>
-        <version>4.3.2</version>
+        <version>4.5.0</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-jdk14</artifactId>
-        <version>1.7.12</version>
+        <version>2.0.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -101,7 +101,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.42</version>
+            <version>10.3.3</version>
           </dependency>
         </dependencies>
         <executions>
@@ -128,46 +128,46 @@
         <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.0</version>
         </plugin>
         <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.10.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M6</version>
+          <version>3.0.0-M7</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>3.0.0-M1</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M1</version>
+          <version>3.0.0</version>
         </plugin>
         <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.9.1</version>
+          <version>3.12.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.4.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.4.1</version>
         </plugin>
       </plugins>
     </pluginManagement>