Merge remote-tracking branch 'origin/development' into milestone-4211

DICE-UNC · Mar 22, 2017 · 99bb805 · 99bb805
2 parents 855006a + 27311c9
commit 99bb805
Show file tree

Hide file tree

Showing 16 changed files with 2,913 additions and 1,203 deletions.
diff --git a/SpecWhitePaper-MetadataTemplates-03_13_2017.pdf b/SpecWhitePaper-MetadataTemplates-03_13_2017.pdf
diff --git a/metadata-templates/attic/MetadataTemplateFormBotService.java b/metadata-templates/attic/MetadataTemplateFormBotService.java
diff --git a/metadata-templates/pom.xml b/metadata-templates/pom.xml
@@ -8,7 +8,6 @@
 		<groupId>org.irods.jargon</groupId>
 		<version>4.2.1.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.irods.jargon</groupId>
 	<artifactId>metadata-templates</artifactId>
 	<name>metadata-templates</name>
 	<url>http://maven.apache.org</url>
@@ -159,7 +158,6 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
-
 				<!--This plugin's configuration is used to store Eclipse m2e settings 
 					only. It has no influence on the Maven build itself. -->
 				<plugin>