#61 latest master

DICE-UNC · Apr 28, 2015 · b0d691d · b0d691d
1 parent d83084a
commit b0d691d
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 46 deletions.
diff --git a/jargon-core/pom.xml b/jargon-core/pom.xml
@@ -2,11 +2,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-<<<<<<< HEAD
 		<version>4.0.3.1-SNAPSHOT</version>
-=======
-		<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.irods.jargon</groupId>

diff --git a/jargon-data-utils/pom.xml b/jargon-data-utils/pom.xml
@@ -3,11 +3,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-<<<<<<< HEAD
 		<version>4.0.3.1-SNAPSHOT</version>
-=======
-		<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-data-utils</artifactId>

diff --git a/jargon-httpstream/pom.xml b/jargon-httpstream/pom.xml
@@ -4,11 +4,7 @@
   <parent>
     <artifactId>jargon</artifactId>
     <groupId>org.irods</groupId>
-<<<<<<< HEAD
 	<version>4.0.3.1-SNAPSHOT</version>
-=======
-	<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
   </parent>
   <groupId>org.irods.jargon</groupId>
   <artifactId>jargon-httpstream</artifactId> 

diff --git a/jargon-ruleservice/pom.xml b/jargon-ruleservice/pom.xml
@@ -3,11 +3,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-<<<<<<< HEAD
 		<version>4.0.3.1-SNAPSHOT</version>
-=======
-		<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-ruleservice</artifactId>

diff --git a/jargon-ticket/pom.xml b/jargon-ticket/pom.xml
@@ -3,11 +3,7 @@
 	<parent>
 		<groupId>org.irods</groupId>
 		<artifactId>jargon</artifactId>
-<<<<<<< HEAD
 		<version>4.0.3.1-SNAPSHOT</version>
-=======
-		<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-ticket</artifactId>

diff --git a/jargon-user-profile/pom.xml b/jargon-user-profile/pom.xml
@@ -4,11 +4,7 @@
   <parent>
     <artifactId>jargon</artifactId>
     <groupId>org.irods</groupId>
-<<<<<<< HEAD
 	<version>4.0.3.1-SNAPSHOT</version>
-=======
-	<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
   </parent>
   <groupId>org.irods.jargon</groupId>
   <artifactId>jargon-user-profile</artifactId>

diff --git a/jargon-user-tagging/pom.xml b/jargon-user-tagging/pom.xml
@@ -2,11 +2,7 @@
   <parent>
     <groupId>org.irods</groupId>
     <artifactId>jargon</artifactId>
-<<<<<<< HEAD
 	<version>4.0.3.1-SNAPSHOT</version>
-=======
-	<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
   </parent>
   <modelVersion>4.0.0</modelVersion> 
   <groupId>org.irods.jargon</groupId>

diff --git a/jargon-workflow/pom.xml b/jargon-workflow/pom.xml
@@ -6,11 +6,7 @@
 	<parent>
 		<artifactId>jargon</artifactId>
 		<groupId>org.irods</groupId>
-<<<<<<< HEAD
 		<version>4.0.3.1-SNAPSHOT</version>
-=======
-		<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
 	</parent>
 	<groupId>org.irods.jargon</groupId>
 	<artifactId>jargon-workflow</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-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/maven-v4_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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.irods</groupId>
 	<artifactId>jargon</artifactId>
 	<packaging>pom</packaging>
-<<<<<<< HEAD
 	<version>4.0.3.1-SNAPSHOT</version>
-=======
-	<version>4.0.2.2-SNAPSHOT</version>
->>>>>>> master
 	<name>Jargon</name>
 	<description>Core Java API and related libraries for iRODS</description>
 	<url>https://github.com/DICE-UNC/jargon</url>
@@ -392,13 +389,9 @@
 	<build>
 		<pluginManagement>
 			<plugins>
-				<!--   <plugin>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.8.1</version>
-					<configuration>
-						<altDeploymentRepository>internal.repo::default::file://${git.repo.root}/snapsots</altDeploymentRepository>
-					</configuration>
-				</plugin>-->
+				<!-- <plugin> <artifactId>maven-deploy-plugin</artifactId> <version>2.8.1</version> 
+					<configuration> <altDeploymentRepository>internal.repo::default::file://${git.repo.root}/snapsots</altDeploymentRepository> 
+					</configuration> </plugin> -->
 
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -478,6 +471,6 @@
 		<module>jargon-conveyor</module>
 		<module>jargon-workflow</module>
 		<module>jargon-ruleservice</module>
-    <module>data-profile</module>
-  </modules>
+		<module>data-profile</module>
+	</modules>
 </project>