Merge branch 'release/0.6'

ekwhite · Jan 25, 2016 · f92f444 · f92f444
2 parents 37c491f + 599f434
commit f92f444
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -9,17 +9,19 @@ Kevin M Livingston, Michael Bada, William A Baumgartner, Lawrence E Hunter
 BMC Bioinformatics (accepted)
 ``` 
 
-## Use with Java 1.8
+## Development
+This project follows the Git-Flow approach to branching as originally described [here](http://nvie.com/posts/a-successful-git-branching-model/). 
+To facilitate the Git-Flow branching approach, this project makes use of the [jgitflow-maven-plugin](https://bitbucket.org/atlassian/jgit-flow) as described [here](http://george-stathis.com/2013/11/09/painless-maven-project-releases-with-maven-gitflow-plugin/).
+
+Code in the [master branch](https://github.com/UCDenver-ccp/datasource/tree/master) reflects the latest release of this library. Code in the [development](https://github.com/UCDenver-ccp/datasource/tree/development) branch contains the most up-to-date version of this project.
 
-Note: This code was developed using **Java 1.7**. There have been reports that
-the project won't build using **Java 1.8**.
 
 ## Maven signature if only using the file parser API
 ```xml
 <dependency>
 	<groupId>edu.ucdenver.ccp</groupId>
 	<artifactId>datasource-fileparsers</artifactId>
-	<version>0.5</version>
+	<version>0.6</version>
 </dependency>
 
 <repository>
@@ -33,7 +35,7 @@ the project won't build using **Java 1.8**.
 <dependency>
 	<groupId>edu.ucdenver.ccp</groupId>
 	<artifactId>datasource-rdfizer</artifactId>
-	<version>0.5</version>
+	<version>0.6</version>
 </dependency>
 
 <repository>
@@ -159,4 +161,4 @@ arabidopsis, and zebrafish), use:
 When a taxon-aware file parser is used, some extra data is downloaded to ensure
 that the mappings from biological concepts to taxon identifiers are
 present. This download can be time consuming due to one of the files being very
-large, but it is a one-time cost.
+large, but it is a one-time cost.
diff --git a/datasource-fileparsers/pom.xml b/datasource-fileparsers/pom.xml
@@ -1,14 +1,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/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>
 	<parent>
 		<artifactId>datasource</artifactId>
 		<groupId>edu.ucdenver.ccp</groupId>
-		<version>0.6-SNAPSHOT</version>
+		<version>0.6</version>
 	</parent>
 	<artifactId>datasource-fileparsers</artifactId>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -117,4 +121,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/datasource-identifiers/pom.xml b/datasource-identifiers/pom.xml
@@ -1,10 +1,9 @@
-<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>
 	<parent>
 		<artifactId>datasource</artifactId>
 		<groupId>edu.ucdenver.ccp</groupId>
-		<version>0.6-SNAPSHOT</version>
+		<version>0.6</version>
 	</parent>
 	<artifactId>datasource-identifiers</artifactId>
 

diff --git a/datasource-rdfizer/pom.xml b/datasource-rdfizer/pom.xml
@@ -1,10 +1,9 @@
-<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>
 	<parent>
 		<groupId>edu.ucdenver.ccp</groupId>
 		<artifactId>datasource</artifactId>
-		<version>0.6-SNAPSHOT</version>
+		<version>0.6</version>
 	</parent>
 	<artifactId>datasource-rdfizer</artifactId>
 

diff --git a/pom.xml b/pom.xml
@@ -1,9 +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>
-	<version>0.6-SNAPSHOT</version>
+	<version>0.6</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -210,7 +209,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore />
 									</action>
 								</pluginExecution>
 							</pluginExecutions>