Resolving merge conflict. pom versions set to 0.6.1

ekwhite · Feb 11, 2016 · 26008b0 · 26008b0
2 parents b4404d9 + ddae2cd
commit 26008b0
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 42 deletions.
diff --git a/datasource-rdfizer/scripts/pom-rdf-gen-9606.xml b/datasource-rdfizer/scripts/pom-rdf-gen-9606.xml
@@ -1,26 +1,28 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.ucdenver.ccp</groupId>
 	<artifactId>datasource-rdfizer-rdf-gen</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7-SNAPSHOT</version>
+    <version>0.6.1</version>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>edu.ucdenver.ccp</groupId>
-			<artifactId>datasource-rdfizer</artifactId>
-			<version>0.7-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+      <dependency>
+        <groupId>edu.ucdenver.ccp</groupId>
+        <artifactId>datasource-rdfizer</artifactId>
+        <version>0.6.1</version>
+        <type>jar</type>
+        <scope>compile</scope>
+      </dependency>
 	</dependencies>
 
-
 	<build>
 		<plugins>
 			<plugin>

diff --git a/datasource-rdfizer/scripts/pom-rdf-gen-modelorgs.xml b/datasource-rdfizer/scripts/pom-rdf-gen-modelorgs.xml
@@ -1,26 +1,28 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.ucdenver.ccp</groupId>
 	<artifactId>datasource-rdfizer-rdf-gen</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7-SNAPSHOT</version>
+    <version>0.6.1</version>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>edu.ucdenver.ccp</groupId>
-			<artifactId>datasource-rdfizer</artifactId>
-			<version>0.7-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+      <dependency>
+        <groupId>edu.ucdenver.ccp</groupId>
+        <artifactId>datasource-rdfizer</artifactId>
+        <version>0.6.1</version>
+        <type>jar</type>
+        <scope>compile</scope>
+      </dependency>
 	</dependencies>
 
-
 	<build>
 		<plugins>
 			<plugin>

diff --git a/datasource-rdfizer/scripts/pom-rdf-gen.xml b/datasource-rdfizer/scripts/pom-rdf-gen.xml
@@ -1,26 +1,28 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.ucdenver.ccp</groupId>
 	<artifactId>datasource-rdfizer-rdf-gen</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7-SNAPSHOT</version>
+    <version>0.6.1</version>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>edu.ucdenver.ccp</groupId>
-			<artifactId>datasource-rdfizer</artifactId>
-			<version>0.7-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+      <dependency>
+        <groupId>edu.ucdenver.ccp</groupId>
+        <artifactId>datasource-rdfizer</artifactId>
+        <version>0.6.1</version>
+        <type>jar</type>
+        <scope>compile</scope>
+      </dependency>
 	</dependencies>
 
-
 	<build>
 		<plugins>
 			<plugin>

diff --git a/datasource-rdfizer/scripts/pom-rdf-list-datasource-names.xml b/datasource-rdfizer/scripts/pom-rdf-list-datasource-names.xml
@@ -1,12 +1,13 @@
 <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/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>edu.ucdenver.ccp</groupId>
   <artifactId>datasource-rdfizer-rdf-gen-ids</artifactId>
   <packaging>pom</packaging>
-  <version>0.7-SNAPSHOT</version>
+  <version>0.6.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,7 +17,7 @@
     <dependency>
       <groupId>edu.ucdenver.ccp</groupId>
       <artifactId>datasource-rdfizer</artifactId>
-      <version>0.7-SNAPSHOT</version>
+      <version>0.6.1</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,8 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.ucdenver.ccp</groupId>
 	<artifactId>datasource</artifactId>
@@ -7,8 +11,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- This property is inherited by all sub-modules and used to define their 
-			version -->
 	</properties>
 
 	<dependencyManagement>