Resolve conflicts.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/401f2416 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/401f2416 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/401f2416 Branch: refs/heads/master Commit: 401f241696781fbb46ba56f43d71c6878a2913b0 Parents: 5794ec3 dab5820 Author: Chris Mattmann <chris.a.mattm...@jpl.nasa.gov> Authored: Fri Oct 13 22:48:24 2017 -0700 Committer: Chris Mattmann <chris.a.mattm...@jpl.nasa.gov> Committed: Fri Oct 13 22:48:24 2017 -0700 ---------------------------------------------------------------------- commons/pom.xml | 72 ++++ .../org/apache/oodt/commons/AvroExecServer.java | 369 +++++++++++++++++++ .../org/apache/oodt/commons/ExecServer.java | 2 +- .../oodt/commons/AvroMultiServerTest.java | 96 +++++ 4 files changed, 538 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/401f2416/commons/pom.xml ---------------------------------------------------------------------- diff --cc commons/pom.xml index d5108a2,3703c12..cf54eba --- a/commons/pom.xml +++ b/commons/pom.xml @@@ -177,4 -104,74 +177,76 @@@ </build> </profile> </profiles> ++<<<<<<< HEAD ++======= + <dependencies> + + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.7.7</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-ipc</artifactId> + <version>1.7.7</version> + </dependency> + + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>2.5.4</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-hibernate3</artifactId> + <version>2.0.8</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>xmlrpc</groupId> + <artifactId>xmlrpc</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/oodt/blob/401f2416/commons/src/main/java/org/apache/oodt/commons/ExecServer.java ----------------------------------------------------------------------