Skip to content
This repository
Browse code

Clean up of repository and dependency management with versions in sup…

…er pom.

Also added properties for hadoop version that can be over-ridden on CLI.
  • Loading branch information...
commit 525caaca81e1ff60b519066160163c4ddc6f8d11 1 parent b3b2038
Venkatesh Seetharam venkateshs authored
14 .gitignore
... ... @@ -0,0 +1,14 @@
  1 +# Maven
  2 +target
  3 +
  4 +# IntelliJ
  5 +*.iml
  6 +*.ipr
  7 +*.iws
  8 +.idea
  9 +
  10 +# Eclipse
  11 +.classpath
  12 +.project
  13 +.settings
  14 +
24 client/pom.xml
@@ -17,7 +17,8 @@
17 17 limitations under the License.
18 18 -->
19 19
20   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  20 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  21 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21 22 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22 23
23 24 <modelVersion>4.0.0</modelVersion>
@@ -30,33 +31,44 @@
30 31 <description>Ivory CLI client</description>
31 32 <name>Ivory CLI client</name>
32 33 <packaging>jar</packaging>
  34 +
33 35 <dependencies>
34 36 <dependency>
35 37 <groupId>com.thoughtworks.xstream</groupId>
36 38 <artifactId>xstream</artifactId>
37   - <version>1.3.1</version>
38 39 </dependency>
  40 +
39 41 <dependency>
40 42 <groupId>commons-cli</groupId>
41 43 <artifactId>commons-cli</artifactId>
42   - <version>1.2</version>
43 44 </dependency>
  45 +
44 46 <dependency>
45 47 <groupId>commons-codec</groupId>
46 48 <artifactId>commons-codec</artifactId>
47   - <version>1.4</version>
48 49 </dependency>
  50 +
49 51 <dependency>
50 52 <groupId>com.sun.jersey</groupId>
51 53 <artifactId>jersey-client</artifactId>
52   - <version>1.9</version>
53 54 </dependency>
  55 +
54 56 <dependency>
55 57 <groupId>com.sun.jersey</groupId>
56 58 <artifactId>jersey-json</artifactId>
57   - <version>1.9</version>
  59 + </dependency>
  60 +
  61 + <dependency>
  62 + <groupId>log4j</groupId>
  63 + <artifactId>log4j</artifactId>
  64 + </dependency>
  65 +
  66 + <dependency>
  67 + <groupId>org.testng</groupId>
  68 + <artifactId>testng</artifactId>
58 69 </dependency>
59 70 </dependencies>
  71 +
60 72 <build>
61 73 <plugins>
62 74 <plugin>
35 common/pom.xml
@@ -29,77 +29,66 @@
29 29 <dependency>
30 30 <groupId>commons-beanutils</groupId>
31 31 <artifactId>commons-beanutils</artifactId>
32   - <version>1.8.3</version>
33 32 </dependency>
  33 +
34 34 <dependency>
35 35 <groupId>commons-lang</groupId>
36 36 <artifactId>commons-lang</artifactId>
37   - <version>2.1</version>
38 37 </dependency>
  38 +
39 39 <dependency>
40 40 <groupId>org.apache.hadoop</groupId>
41 41 <artifactId>hadoop-test</artifactId>
42   - <version>0.20.2-cdh3u0</version>
43   - <scope>test</scope>
44 42 </dependency>
  43 +
45 44 <dependency>
46 45 <groupId>org.apache.ivory</groupId>
47 46 <artifactId>ivory-client</artifactId>
48   - <version>${project.version}</version>
49 47 </dependency>
  48 +
50 49 <dependency>
51 50 <groupId>org.apache.ivory</groupId>
52 51 <artifactId>ivory-metrics</artifactId>
53   - <version>${project.version}</version>
54 52 </dependency>
  53 +
55 54 <dependency>
56 55 <groupId>javax.xml.bind</groupId>
57 56 <artifactId>jaxb-api</artifactId>
58   - <version>2.1</version>
59   - <scope>compile</scope>
60 57 </dependency>
  58 +
61 59 <dependency>
62 60 <groupId>org.apache.hadoop</groupId>
63 61 <artifactId>hadoop-core</artifactId>
64   - <version>0.20.2-cdh3u0</version>
65   - <exclusions>
66   - <exclusion>
67   - <groupId>org.eclipse.jdt</groupId>
68   - <artifactId>core</artifactId>
69   - </exclusion>
70   - </exclusions>
71 62 </dependency>
  63 +
72 64 <dependency>
73 65 <groupId>org.testng</groupId>
74 66 <artifactId>testng</artifactId>
75   - <version>6.1.1</version>
76   - <scope>test</scope>
77 67 </dependency>
  68 +
78 69 <dependency>
79 70 <groupId>org.slf4j</groupId>
80 71 <artifactId>slf4j-api</artifactId>
81   - <version>1.2</version>
82 72 </dependency>
  73 +
83 74 <dependency>
84 75 <groupId>org.codehaus.jettison</groupId>
85 76 <artifactId>jettison</artifactId>
86   - <version>1.3</version>
87 77 </dependency>
  78 +
88 79 <dependency>
89 80 <groupId>org.springframework</groupId>
90 81 <artifactId>spring-jms</artifactId>
91   - <version>3.0.3.RELEASE</version>
92 82 </dependency>
  83 +
93 84 <dependency>
94 85 <groupId>org.springframework</groupId>
95 86 <artifactId>spring-beans</artifactId>
96   - <version>3.0.3.RELEASE</version>
97 87 </dependency>
  88 +
98 89 <dependency>
99 90 <groupId>org.apache.ivory</groupId>
100 91 <artifactId>ivory-test-util</artifactId>
101   - <version>${project.version}</version>
102   - <scope>test</scope>
103 92 </dependency>
104 93 </dependencies>
105 94
52 feed/pom.xml
@@ -17,7 +17,8 @@
17 17 limitations under the License.
18 18 -->
19 19
20   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  20 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  21 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21 22 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22 23
23 24 <modelVersion>4.0.0</modelVersion>
@@ -31,28 +32,31 @@
31 32 <name>Ivory Feed</name>
32 33 <packaging>jar</packaging>
33 34
34   - <dependencies>
35   - <dependency>
36   - <groupId>org.apache.ivory</groupId>
37   - <artifactId>ivory-common</artifactId>
38   - <version>${project.version}</version>
39   - </dependency>
40   - <dependency>
41   - <groupId>org.apache.ivory</groupId>
42   - <artifactId>ivory-oozie-adaptor</artifactId>
43   - <version>${project.version}</version>
44   - </dependency>
45   - <dependency>
46   - <groupId>org.apache.ivory</groupId>
47   - <artifactId>ivory-messaging</artifactId>
48   - <version>${project.version}</version>
49   - </dependency>
50   - <dependency>
51   - <groupId>org.apache.ivory</groupId>
52   - <artifactId>ivory-test-util</artifactId>
53   - <version>${project.version}</version>
54   - <scope>test</scope>
55   - </dependency>
56   - </dependencies>
  35 + <dependencies>
  36 + <dependency>
  37 + <groupId>org.apache.ivory</groupId>
  38 + <artifactId>ivory-common</artifactId>
  39 + </dependency>
  40 +
  41 + <dependency>
  42 + <groupId>org.apache.ivory</groupId>
  43 + <artifactId>ivory-oozie-adaptor</artifactId>
  44 + </dependency>
  45 +
  46 + <dependency>
  47 + <groupId>org.apache.ivory</groupId>
  48 + <artifactId>ivory-messaging</artifactId>
  49 + </dependency>
  50 +
  51 + <dependency>
  52 + <groupId>org.apache.ivory</groupId>
  53 + <artifactId>ivory-test-util</artifactId>
  54 + </dependency>
  55 +
  56 + <dependency>
  57 + <groupId>org.testng</groupId>
  58 + <artifactId>testng</artifactId>
  59 + </dependency>
  60 + </dependencies>
57 61
58 62 </project>
131 messaging/pom.xml
@@ -11,74 +11,69 @@
11 11 OF ANY KIND, either express or implied. See the License for the specific
12 12 language governing permissions and limitations under the License. -->
13 13
14   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15   - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  14 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  15 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  16 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
16 17
17   - <modelVersion>4.0.0</modelVersion>
18   - <parent>
19   - <groupId>org.apache.ivory</groupId>
20   - <artifactId>ivory-main</artifactId>
21   - <version>0.2-SNAPSHOT</version>
22   - </parent>
23   - <artifactId>ivory-messaging</artifactId>
24   - <description>Ivory JMS messaging Module</description>
25   - <name>Ivory Messaging</name>
26   - <packaging>jar</packaging>
27   - <dependencies>
28   - <dependency>
29   - <groupId>org.apache.activemq</groupId>
30   - <artifactId>activemq-core</artifactId>
31   - <version>5.4.3</version>
32   - <exclusions>
33   - <exclusion>
34   - <groupId>com.ibm.icu</groupId>
35   - <artifactId>icu4j</artifactId>
36   - </exclusion>
37   - </exclusions>
38   - </dependency>
39   - <dependency>
40   - <groupId>org.apache.hadoop</groupId>
41   - <artifactId>hadoop-core</artifactId>
42   - <version>0.20.2-cdh3u0</version>
43   - <exclusions>
44   - <exclusion>
45   - <groupId>org.eclipse.jdt</groupId>
46   - <artifactId>core</artifactId>
47   - </exclusion>
48   - </exclusions>
49   - </dependency>
50   - <dependency>
51   - <groupId>org.apache.hadoop</groupId>
52   - <artifactId>hadoop-test</artifactId>
53   - <version>0.20.2-cdh3u0</version>
54   - <scope>test</scope>
55   - </dependency>
56   - </dependencies>
57   - <build>
58   - <plugins>
59   -<!-- <plugin>
60   - <groupId>org.apache.maven.plugins</groupId>
61   - <artifactId>maven-shade-plugin</artifactId>
62   - <version>1.5</version>
63   - <executions>
64   - <execution>
65   - <phase>package</phase>
66   - <goals>
67   - <goal>shade</goal>
68   - </goals>
69   - <configuration>
70   - <finalName>ivory-messaging-execution-jar</finalName>
71   - <transformers>
72   - <transformer
73   - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
74   - <mainClass>org.apache.ivory.messaging.MessageProducer</mainClass>
75   - </transformer>
76   - </transformers>
77   - </configuration>
78   - </execution>
79   - </executions>
80   - </plugin> -->
81   - </plugins>
82   - </build>
  18 + <modelVersion>4.0.0</modelVersion>
  19 + <parent>
  20 + <groupId>org.apache.ivory</groupId>
  21 + <artifactId>ivory-main</artifactId>
  22 + <version>0.2-SNAPSHOT</version>
  23 + </parent>
  24 + <artifactId>ivory-messaging</artifactId>
  25 + <description>Ivory JMS messaging Module</description>
  26 + <name>Ivory Messaging</name>
  27 + <packaging>jar</packaging>
  28 +
  29 + <dependencies>
  30 + <dependency>
  31 + <groupId>org.apache.activemq</groupId>
  32 + <artifactId>activemq-core</artifactId>
  33 + </dependency>
  34 +
  35 + <dependency>
  36 + <groupId>org.apache.hadoop</groupId>
  37 + <artifactId>hadoop-core</artifactId>
  38 + </dependency>
  39 +
  40 + <dependency>
  41 + <groupId>org.apache.hadoop</groupId>
  42 + <artifactId>hadoop-test</artifactId>
  43 + </dependency>
  44 +
  45 + <dependency>
  46 + <groupId>org.testng</groupId>
  47 + <artifactId>testng</artifactId>
  48 + </dependency>
  49 + </dependencies>
  50 + <build>
  51 + <plugins>
  52 + <!--
  53 + <plugin>
  54 + <groupId>org.apache.maven.plugins</groupId>
  55 + <artifactId>maven-shade-plugin</artifactId>
  56 + <version>1.5</version>
  57 + <executions>
  58 + <execution>
  59 + <phase>package</phase>
  60 + <goals>
  61 + <goal>shade</goal>
  62 + </goals>
  63 + <configuration>
  64 + <finalName>ivory-messaging-execution-jar</finalName>
  65 + <transformers>
  66 + <transformer
  67 + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
  68 + <mainClass>org.apache.ivory.messaging.MessageProducer</mainClass>
  69 + </transformer>
  70 + </transformers>
  71 + </configuration>
  72 + </execution>
  73 + </executions>
  74 + </plugin>
  75 + -->
  76 + </plugins>
  77 + </build>
83 78
84 79 </project>
10 metrics/pom.xml
@@ -17,7 +17,8 @@
17 17 limitations under the License.
18 18 -->
19 19
20   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  20 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  21 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21 22 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22 23
23 24 <modelVersion>4.0.0</modelVersion>
@@ -36,13 +37,16 @@
36 37 <dependency>
37 38 <groupId>org.aspectj</groupId>
38 39 <artifactId>aspectjrt</artifactId>
39   - <version>1.6.11</version>
40 40 </dependency>
41 41
42 42 <dependency>
43 43 <groupId>org.aspectj</groupId>
44 44 <artifactId>aspectjweaver</artifactId>
45   - <version>1.6.11</version>
  45 + </dependency>
  46 +
  47 + <dependency>
  48 + <groupId>log4j</groupId>
  49 + <artifactId>log4j</artifactId>
46 50 </dependency>
47 51 </dependencies>
48 52 </project>
34 oozie/pom.xml
@@ -35,36 +35,34 @@
35 35 <dependency>
36 36 <groupId>org.apache.ivory</groupId>
37 37 <artifactId>ivory-messaging</artifactId>
38   - <version>${project.version}</version>
39 38 </dependency>
  39 +
40 40 <dependency>
41 41 <groupId>org.apache.ivory</groupId>
42 42 <artifactId>ivory-common</artifactId>
43   - <version>${project.version}</version>
44 43 </dependency>
  44 +
45 45 <dependency>
46 46 <groupId>org.apache.ivory</groupId>
47 47 <artifactId>ivory-test-util</artifactId>
48   - <version>${project.version}</version>
49   - <scope>test</scope>
50 48 </dependency>
  49 +
51 50 <dependency>
52 51 <groupId>org.apache.oozie</groupId>
53 52 <artifactId>oozie-client</artifactId>
54   - <version>3.2.2</version>
55 53 </dependency>
  54 +
56 55 <dependency>
57 56 <groupId>org.apache.hadoop</groupId>
58 57 <artifactId>hadoop-core</artifactId>
59   - <version>0.20.2-cdh3u0</version>
60   - <exclusions>
61   - <exclusion>
62   - <groupId>org.eclipse.jdt</groupId>
63   - <artifactId>core</artifactId>
64   - </exclusion>
65   - </exclusions>
  58 + </dependency>
  59 +
  60 + <dependency>
  61 + <groupId>org.testng</groupId>
  62 + <artifactId>testng</artifactId>
66 63 </dependency>
67 64 </dependencies>
  65 +
68 66 <build>
69 67 <plugins>
70 68 <plugin>
@@ -74,12 +72,12 @@
74 72 <executions>
75 73 <execution>
76 74 <id>1</id>
77   - <!-- <phase>generate-sources</phase> -->
  75 + <!-- <phase>generate-sources</phase> -->
78 76 <goals>
79 77 <goal>generate</goal>
80 78 </goals>
81 79 <configuration>
82   - <!-- <generateDirectory>src/main/java</generateDirectory> -->
  80 + <!-- <generateDirectory>src/main/java</generateDirectory> -->
83 81 <generatePackage>org.apache.ivory.oozie.coordinator</generatePackage>
84 82 <includeSchemas>
85 83 <includeSchema>oozie-coordinator-0.3.xsd</includeSchema>
@@ -91,12 +89,12 @@
91 89 </execution>
92 90 <execution>
93 91 <id>2</id>
94   - <!-- <phase>generate-sources</phase> -->
  92 + <!-- <phase>generate-sources</phase> -->
95 93 <goals>
96 94 <goal>generate</goal>
97 95 </goals>
98 96 <configuration>
99   - <!-- <generateDirectory>src/main/java</generateDirectory> -->
  97 + <!-- <generateDirectory>src/main/java</generateDirectory> -->
100 98 <generatePackage>org.apache.ivory.oozie.workflow</generatePackage>
101 99 <includeSchemas>
102 100 <includeSchema>oozie-workflow-0.3.xsd</includeSchema>
@@ -108,12 +106,12 @@
108 106 </execution>
109 107 <execution>
110 108 <id>3</id>
111   - <!-- <phase>generate-sources</phase> -->
  109 + <!-- <phase>generate-sources</phase> -->
112 110 <goals>
113 111 <goal>generate</goal>
114 112 </goals>
115 113 <configuration>
116   - <!-- <generateDirectory>src/main/java</generateDirectory> -->
  114 + <!-- <generateDirectory>src/main/java</generateDirectory> -->
117 115 <generatePackage>org.apache.ivory.oozie.bundle</generatePackage>
118 116 <includeSchemas>
119 117 <includeSchema>oozie-bundle-0.1.xsd</includeSchema>
510 pom.xml
@@ -27,6 +27,12 @@
27 27
28 28 <properties>
29 29 <include.prism>true</include.prism>
  30 +
  31 + <hadoop.version>1.1.1</hadoop.version>
  32 + <oozie.version>3.2.2</oozie.version>
  33 + <activemq.version>5.4.3</activemq.version>
  34 + <hadoop-distcp.version>0.3</hadoop-distcp.version>
  35 + <jetty.version>6.1.26</jetty.version>
30 36 </properties>
31 37
32 38 <profiles>
@@ -76,20 +82,32 @@
76 82 <url>https://github.com/sriksun/Ivory</url>
77 83 </scm>
78 84
79   -
80 85 <repositories>
81 86 <repository>
82   - <id>inmobi.repo</id>
83   - <url>https://github.com/InMobi/mvn-repo/raw/master/releases/</url>
  87 + <id>central</id>
  88 + <url>http://repo1.maven.org/maven2</url>
  89 + <snapshots>
  90 + <enabled>false</enabled>
  91 + </snapshots>
84 92 </repository>
85 93 <repository>
86   - <id>default</id>
87   - <url>https://repository.apache.org/content/groups/public/</url>
  94 + <id>Codehaus repository</id>
  95 + <url>http://repository.codehaus.org/</url>
  96 + <snapshots>
  97 + <enabled>false</enabled>
  98 + </snapshots>
88 99 </repository>
89 100 <repository>
90   - <id>mvnrepository</id>
91   - <name>mvnrepository</name>
92   - <url>http://mvnrepository.com/artifact/org.slf4j/slf4j-api/</url>
  101 + <id>apache.snapshots.repo</id>
  102 + <url>https://repository.apache.org/content/groups/snapshots</url>
  103 + <name>Apache Snapshots Repository</name>
  104 + <snapshots>
  105 + <enabled>true</enabled>
  106 + </snapshots>
  107 + </repository>
  108 + <repository>
  109 + <id>default</id>
  110 + <url>https://repository.apache.org/content/groups/public/</url>
93 111 </repository>
94 112 <repository>
95 113 <id>java.net-Public</id>
@@ -101,115 +119,379 @@
101 119 <name>JBoss repository</name>
102 120 <url>https://repository.jboss.org/nexus/content/groups/public</url>
103 121 </repository>
104   - <repository>
105   - <id>cdh.repo</id>
106   - <url>https://repository.cloudera.com/content/groups/cloudera-repos</url>
107   - <name>Cloudera Repository</name>
108   - <snapshots>
109   - <enabled>false</enabled>
110   - </snapshots>
111   - </repository>
112 122 </repositories>
113 123
114   - <dependencies>
115   - <dependency>
116   - <groupId>commons-logging</groupId>
117   - <artifactId>commons-logging</artifactId>
118   - <version>1.1</version>
119   - <scope>compile</scope>
120   - <exclusions>
121   - <exclusion>
122   - <groupId>avalon-framework</groupId>
123   - <artifactId>avalon-framework</artifactId>
124   - </exclusion>
125   - <exclusion>
126   - <groupId>logkit</groupId>
127   - <artifactId>logkit</artifactId>
128   - </exclusion>
129   - <exclusion>
130   - <groupId>javax.servlet</groupId>
131   - <artifactId>servlet-api</artifactId>
132   - </exclusion>
133   - </exclusions>
134   - </dependency>
135   -
136   - <dependency>
137   - <groupId>org.testng</groupId>
138   - <artifactId>testng</artifactId>
139   - <version>5.8</version>
140   - <classifier>jdk15</classifier>
141   - <scope>test</scope>
142   - </dependency>
143   -
144   - <dependency>
145   - <groupId>org.slf4j</groupId>
146   - <artifactId>slf4j-simple</artifactId>
147   - <version>1.2</version>
148   - </dependency>
149   -
150   - <dependency>
151   - <groupId>com.inmobi.grid</groupId>
152   - <artifactId>s4fs</artifactId>
153   - <version>0.1</version>
154   - </dependency>
155   -
156   - <dependency>
157   - <groupId>log4j</groupId>
158   - <artifactId>log4j</artifactId>
159   - <version>1.2.15</version>
160   - <scope>compile</scope>
161   - <exclusions>
162   - <exclusion>
163   - <groupId>com.sun.jdmk</groupId>
164   - <artifactId>jmxtools</artifactId>
165   - </exclusion>
166   - <exclusion>
167   - <groupId>com.sun.jmx</groupId>
168   - <artifactId>jmxri</artifactId>
169   - </exclusion>
170   - <exclusion>
171   - <groupId>javax.mail</groupId>
172   - <artifactId>mail</artifactId>
173   - </exclusion>
174   - <exclusion>
175   - <groupId>javax.jms</groupId>
176   - <artifactId>jmx</artifactId>
177   - </exclusion>
178   - <exclusion>
179   - <groupId>javax.jms</groupId>
180   - <artifactId>jms</artifactId>
181   - </exclusion>
182   - </exclusions>
183   - </dependency>
184   -
185   - <dependency>
186   - <groupId>org.perf4j</groupId>
187   - <artifactId>perf4j</artifactId>
188   - <version>0.9.9</version>
189   - <classifier>log4jonly</classifier>
190   - </dependency>
191   -
192   - <dependency>
193   - <groupId>org.easymock</groupId>
194   - <artifactId>easymock</artifactId>
195   - <version>2.4</version>
196   - <scope>test</scope>
197   - </dependency>
198   -
199   - <dependency>
200   - <groupId>org.codehaus.jackson</groupId>
201   - <artifactId>jackson-core-asl</artifactId>
202   - <version>1.5.2</version>
203   - </dependency>
204   -
205   - <dependency>
206   - <groupId>org.codehaus.jackson</groupId>
207   - <artifactId>jackson-mapper-asl</artifactId>
208   - <version>1.5.2</version>
209   - </dependency>
210   -
211   - </dependencies>
  124 + <dependencyManagement>
  125 + <dependencies>
  126 + <dependency>
  127 + <groupId>commons-logging</groupId>
  128 + <artifactId>commons-logging</artifactId>
  129 + <version>1.1</version>
  130 + <scope>compile</scope>
  131 + <exclusions>
  132 + <exclusion>
  133 + <groupId>avalon-framework</groupId>
  134 + <artifactId>avalon-framework</artifactId>
  135 + </exclusion>
  136 + <exclusion>
  137 + <groupId>logkit</groupId>
  138 + <artifactId>logkit</artifactId>
  139 + </exclusion>
  140 + <exclusion>
  141 + <groupId>javax.servlet</groupId>
  142 + <artifactId>servlet-api</artifactId>
  143 + </exclusion>
  144 + </exclusions>
  145 + </dependency>
  146 +
  147 + <dependency>
  148 + <groupId>org.testng</groupId>
  149 + <artifactId>testng</artifactId>
  150 + <version>5.8</version>
  151 + <classifier>jdk15</classifier>
  152 + <scope>test</scope>
  153 + </dependency>
  154 +
  155 + <dependency>
  156 + <groupId>org.slf4j</groupId>
  157 + <artifactId>slf4j-simple</artifactId>
  158 + <version>1.2</version>
  159 + </dependency>
  160 +
  161 + <dependency>
  162 + <groupId>com.inmobi.grid</groupId>
  163 + <artifactId>s4fs</artifactId>
  164 + <version>0.1</version>
  165 + </dependency>
  166 +
  167 + <dependency>
  168 + <groupId>log4j</groupId>
  169 + <artifactId>log4j</artifactId>
  170 + <version>1.2.15</version>
  171 + <scope>compile</scope>
  172 + <exclusions>
  173 + <exclusion>
  174 + <groupId>com.sun.jdmk</groupId>
  175 + <artifactId>jmxtools</artifactId>
  176 + </exclusion>
  177 + <exclusion>
  178 + <groupId>com.sun.jmx</groupId>
  179 + <artifactId>jmxri</artifactId>
  180 + </exclusion>
  181 + <exclusion>
  182 + <groupId>javax.mail</groupId>
  183 + <artifactId>mail</artifactId>
  184 + </exclusion>
  185 + <exclusion>
  186 + <groupId>javax.jms</groupId>
  187 + <artifactId>jmx</artifactId>
  188 + </exclusion>
  189 + <exclusion>
  190 + <groupId>javax.jms</groupId>
  191 + <artifactId>jms</artifactId>
  192 + </exclusion>
  193 + </exclusions>
  194 + </dependency>
  195 +
  196 + <dependency>
  197 + <groupId>org.perf4j</groupId>
  198 + <artifactId>perf4j</artifactId>
  199 + <version>0.9.9</version>
  200 + <classifier>log4jonly</classifier>
  201 + </dependency>
  202 +
  203 + <dependency>
  204 + <groupId>org.easymock</groupId>
  205 + <artifactId>easymock</artifactId>
  206 + <version>2.4</version>
  207 + <scope>test</scope>
  208 + </dependency>
  209 +
  210 + <dependency>
  211 + <groupId>org.codehaus.jackson</groupId>
  212 + <artifactId>jackson-core-asl</artifactId>
  213 + <version>1.5.2</version>
  214 + </dependency>
  215 +
  216 + <dependency>
  217 + <groupId>org.codehaus.jackson</groupId>
  218 + <artifactId>jackson-mapper-asl</artifactId>
  219 + <version>1.5.2</version>
  220 + </dependency>
  221 +
  222 + <dependency>
  223 + <groupId>com.thoughtworks.xstream</groupId>
  224 + <artifactId>xstream</artifactId>
  225 + <version>1.3.1</version>
  226 + </dependency>
  227 +
  228 + <dependency>
  229 + <groupId>commons-cli</groupId>
  230 + <artifactId>commons-cli</artifactId>
  231 + <version>1.2</version>
  232 + </dependency>
  233 +
  234 + <dependency>
  235 + <groupId>commons-codec</groupId>
  236 + <artifactId>commons-codec</artifactId>
  237 + <version>1.4</version>
  238 + </dependency>
  239 +
  240 + <dependency>
  241 + <groupId>com.sun.jersey</groupId>
  242 + <artifactId>jersey-client</artifactId>
  243 + <version>1.9</version>
  244 + </dependency>
  245 +
  246 + <dependency>
  247 + <groupId>com.sun.jersey</groupId>
  248 + <artifactId>jersey-json</artifactId>
  249 + <version>1.9</version>
  250 + </dependency>
  251 +
  252 +
  253 + <dependency>
  254 + <groupId>commons-beanutils</groupId>
  255 + <artifactId>commons-beanutils</artifactId>
  256 + <version>1.8.3</version>
  257 + </dependency>
  258 +
  259 + <dependency>
  260 + <groupId>commons-lang</groupId>
  261 + <artifactId>commons-lang</artifactId>
  262 + <version>2.1</version>
  263 + </dependency>
  264 +
  265 + <dependency>
  266 + <groupId>org.apache.ivory</groupId>
  267 + <artifactId>ivory-client</artifactId>
  268 + <version>${project.version}</version>
  269 + </dependency>
  270 +
  271 + <dependency>
  272 + <groupId>org.apache.ivory</groupId>
  273 + <artifactId>ivory-metrics</artifactId>
  274 + <version>${project.version}</version>
  275 + </dependency>
  276 +
  277 + <dependency>
  278 + <groupId>javax.xml.bind</groupId>
  279 + <artifactId>jaxb-api</artifactId>
  280 + <version>2.1</version>
  281 + <scope>compile</scope>
  282 + </dependency>
  283 +
  284 + <dependency>
  285 + <groupId>org.testng</groupId>
  286 + <artifactId>testng</artifactId>
  287 + <version>6.1.1</version>
  288 + <scope>test</scope>
  289 + </dependency>
  290 +
  291 + <dependency>
  292 + <groupId>org.slf4j</groupId>
  293 + <artifactId>slf4j-api</artifactId>
  294 + <version>1.2</version>
  295 + </dependency>
  296 +
  297 + <dependency>
  298 + <groupId>org.codehaus.jettison</groupId>
  299 + <artifactId>jettison</artifactId>
  300 + <version>1.3</version>
  301 + </dependency>
  302 +
  303 + <dependency>
  304 + <groupId>org.springframework</groupId>
  305 + <artifactId>spring-jms</artifactId>
  306 + <version>3.0.3.RELEASE</version>
  307 + </dependency>
  308 +
  309 + <dependency>
  310 + <groupId>org.springframework</groupId>
  311 + <artifactId>spring-beans</artifactId>
  312 + <version>3.0.3.RELEASE</version>
  313 + </dependency>
  314 +
  315 + <dependency>
  316 + <groupId>com.sun.jersey</groupId>
  317 + <artifactId>jersey-server</artifactId>
  318 + <version>1.9</version>
  319 + </dependency>
  320 +
  321 + <dependency>
  322 + <groupId>javax.jms</groupId>
  323 + <artifactId>jms</artifactId>
  324 + <version>1.1</version>
  325 + </dependency>
  326 +
  327 + <dependency>
  328 + <groupId>org.mockito</groupId>
  329 + <artifactId>mockito-all</artifactId>
  330 + <version>1.8.5</version>
  331 + <scope>provided</scope>
  332 + </dependency>
  333 +
  334 + <dependency>
  335 + <groupId>org.aspectj</groupId>
  336 + <artifactId>aspectjrt</artifactId>
  337 + <version>1.6.11</version>
  338 + </dependency>
  339 +
  340 + <dependency>
  341 + <groupId>org.aspectj</groupId>
  342 + <artifactId>aspectjweaver</artifactId>
  343 + <version>1.6.11</version>
  344 + </dependency>
  345 +
  346 + <dependency>
  347 + <groupId>com.googlecode.json-simple</groupId>
  348 + <artifactId>json-simple</artifactId>
  349 + <version>1.1</version>
  350 + </dependency>
  351 +
  352 + <dependency>
  353 + <groupId>org.mortbay.jetty</groupId>
  354 + <artifactId>jetty</artifactId>
  355 + <version>${jetty.version}</version>
  356 + <scope>compile</scope>
  357 + </dependency>
  358 +
  359 + <dependency>
  360 + <groupId>org.mortbay.jetty</groupId>
  361 + <artifactId>jetty-plus</artifactId>
  362 + <version>${jetty.version}</version>
  363 + <scope>compile</scope>
  364 + </dependency>
  365 +
  366 + <dependency>
  367 + <groupId>com.jcraft</groupId>
  368 + <artifactId>jsch</artifactId>
  369 + <version>0.1.42</version>
  370 + </dependency>
  371 +
  372 + <dependency>
  373 + <groupId>com.jcraft</groupId>
  374 + <artifactId>jzlib</artifactId>
  375 + <version>1.0.7</version>
  376 + </dependency>
  377 +
  378 + <dependency>
  379 + <groupId>org.apache.activemq</groupId>
  380 + <artifactId>activemq-core</artifactId>
  381 + <version>${activemq.version}</version>
  382 + <exclusions>
  383 + <exclusion>
  384 + <groupId>com.ibm.icu</groupId>
  385 + <artifactId>icu4j</artifactId>
  386 + </exclusion>
  387 + </exclusions>
  388 + </dependency>
  389 +
  390 + <dependency>
  391 + <groupId>org.apache.oozie</groupId>
  392 + <artifactId>oozie-client</artifactId>
  393 + <version>${oozie.version}</version>
  394 + </dependency>
  395 +
  396 + <dependency>
  397 + <groupId>org.apache.hadoop</groupId>
  398 + <artifactId>hadoop-core</artifactId>
  399 + <version>${hadoop.version}</version>
  400 + <exclusions>
  401 + <exclusion>
  402 + <groupId>org.eclipse.jdt</groupId>
  403 + <artifactId>core</artifactId>
  404 + </exclusion>
  405 + </exclusions>
  406 + </dependency>
  407 +
  408 + <dependency>
  409 + <groupId>org.apache.hadoop.inmobi.tools</groupId>
  410 + <artifactId>hadoop-distcp</artifactId>
  411 + <version>${hadoop-distcp.version}</version>
  412 + </dependency>
  413 +
  414 + <dependency>
  415 + <groupId>org.apache.hadoop</groupId>
  416 + <artifactId>hadoop-test</artifactId>
  417 + <version>${hadoop.version}</version>
  418 + <!--<scope>test</scope>-->
  419 + <exclusions>
  420 + <exclusion>
  421 + <groupId>org.apache.ftpserver</groupId>
  422 + <artifactId>ftpserver-core</artifactId>
  423 + </exclusion>
  424 + <exclusion>
  425 + <groupId>org.apache.ftpserver</groupId>
  426 + <artifactId>ftpserver-deprecated</artifactId>
  427 + </exclusion>
  428 + </exclusions>
  429 + </dependency>
  430 +
  431 + <dependency>
  432 + <groupId>org.apache.ivory</groupId>
  433 + <artifactId>ivory-messaging</artifactId>
  434 + <version>${project.version}</version>
  435 + </dependency>
  436 +
  437 + <dependency>
  438 + <groupId>org.apache.ivory</groupId>
  439 + <artifactId>ivory-common</artifactId>
  440 + <version>${project.version}</version>
  441 + </dependency>
  442 +
  443 + <dependency>
  444 + <groupId>org.apache.ivory</groupId>
  445 + <artifactId>ivory-process</artifactId>
  446 + <version>${project.version}</version>
  447 + </dependency>
  448 +
  449 + <dependency>
  450 + <groupId>org.apache.ivory</groupId>
  451 + <artifactId>ivory-oozie-adaptor</artifactId>
  452 + <version>${project.version}</version>
  453 + </dependency>
  454 +
  455 + <dependency>
  456 + <groupId>org.apache.ivory</groupId>
  457 + <artifactId>ivory-feed</artifactId>
  458 + <version>${project.version}</version>
  459 + </dependency>
  460 +
  461 + <dependency>
  462 + <groupId>org.apache.ivory</groupId>
  463 + <artifactId>ivory-retention</artifactId>
  464 + <version>${project.version}</version>
  465 + </dependency>
  466 +
  467 + <dependency>
  468 + <groupId>org.apache.ivory</groupId>
  469 + <artifactId>ivory-rerun</artifactId>
  470 + <version>${project.version}</version>
  471 + </dependency>
  472 +
  473 + <dependency>
  474 + <groupId>org.apache.ivory</groupId>
  475 + <artifactId>ivory-replication</artifactId>
  476 + <version>${project.version}</version>
  477 + </dependency>
  478 +
  479 + <dependency>
  480 + <groupId>org.apache.ivory</groupId>
  481 + <artifactId>ivory-prism</artifactId>
  482 + <version>${project.version}</version>
  483 + <classifier>classes</classifier>
  484 + </dependency>
  485 +
  486 + <dependency>
  487 + <groupId>org.apache.ivory</groupId>
  488 + <artifactId>ivory-test-util</artifactId>
  489 + <version>${project.version}</version>
  490 + <scope>test</scope>
  491 + </dependency>
212 492
  493 + </dependencies>
  494 + </dependencyManagement>
213 495
214 496 <build>
215 497 <directory>target</directory>
27 prism/pom.xml
@@ -35,115 +35,92 @@
35 35 <dependency>
36 36 <groupId>org.apache.ivory</groupId>
37 37 <artifactId>ivory-common</artifactId>
38   - <version>${project.version}</version>
39 38 </dependency>
40 39
41 40 <dependency>
42 41 <groupId>org.apache.ivory</groupId>
43 42 <artifactId>ivory-test-util</artifactId>
44   - <version>${project.version}</version>
45   - <scope>test</scope>
46 43 </dependency>
47 44
48 45 <dependency>
49 46 <groupId>org.apache.ivory</groupId>
50 47 <artifactId>ivory-process</artifactId>
51   - <version>${project.version}</version>
52 48 </dependency>
53 49
54 50 <dependency>
55 51 <groupId>org.apache.ivory</groupId>
56 52 <artifactId>ivory-oozie-adaptor</artifactId>
57   - <version>${project.version}</version>
58 53 </dependency>
59 54
60 55 <dependency>
61 56 <groupId>org.apache.ivory</groupId>
62 57 <artifactId>ivory-feed</artifactId>
63   - <version>${project.version}</version>
64 58 </dependency>
65 59
66 60 <dependency>
67 61 <groupId>org.apache.ivory</groupId>
68 62 <artifactId>ivory-retention</artifactId>
69   - <version>${project.version}</version>
70 63 </dependency>
71 64
72 65 <dependency>
73 66 <groupId>org.apache.ivory</groupId>
74 67 <artifactId>ivory-metrics</artifactId>
75   - <version>${project.version}</version>
76 68 </dependency>
77 69
78 70 <dependency>
79 71 <groupId>org.apache.ivory</groupId>
80 72 <artifactId>ivory-rerun</artifactId>
81   - <version>${project.version}</version>
82 73 </dependency>
83 74
84 75 <dependency>
85 76 <groupId>com.sun.jersey</groupId>
86 77 <artifactId>jersey-server</artifactId>
87   - <version>1.9</version>
88 78 </dependency>
89 79
90 80 <dependency>
91 81 <groupId>com.sun.jersey</groupId>
92 82 <artifactId>jersey-client</artifactId>
93   - <version>1.9</version>
94 83 </dependency>
95 84
96 85 <dependency>
97 86 <groupId>com.sun.jersey</groupId>
98 87 <artifactId>jersey-json</artifactId>
99   - <version>1.9</version>
100 88 </dependency>
101 89
102 90 <dependency>
103 91 <groupId>com.googlecode.json-simple</groupId>
104 92 <artifactId>json-simple</artifactId>
105   - <version>1.1</version>
106 93 </dependency>
107 94
108 95 <dependency>
109 96 <groupId>org.mortbay.jetty</groupId>
110 97 <artifactId>jetty</artifactId>
111   - <version>6.1.26</version>
112   - <scope>compile</scope>
113 98 </dependency>
114 99
115 100 <dependency>
116 101 <groupId>org.mortbay.jetty</groupId>
117 102 <artifactId>jetty-plus</artifactId>
118   - <version>6.1.26</version>
119   - <scope>compile</scope>
120 103 </dependency>
121 104
122 105 <dependency>
123 106 <groupId>org.mockito</groupId>
124 107 <artifactId>mockito-all</artifactId>
125   - <version>1.8.5</version>
126   - <scope>provided</scope>
127 108 </dependency>
128 109
129 110 <dependency>
130 111 <groupId>org.aspectj</groupId>
131 112 <artifactId>aspectjrt</artifactId>
132   - <version>1.6.11</version>
133 113 </dependency>
134 114
135 115 <dependency>
136 116 <groupId>org.aspectj</groupId>
137 117 <artifactId>aspectjweaver</artifactId>
138   - <version>1.6.11</version>
139 118 </dependency>
140 119
141 120 <dependency>
142   - <groupId>org.aspectj</groupId>
143   - <artifactId>aspectjweaver</artifactId>
144   - <version>1.6.11</version>
  121 + <groupId>org.testng</groupId>
  122 + <artifactId>testng</artifactId>
145 123 </dependency>
146   -
147 124 </dependencies>
148 125
149 126 <build>
43 process/pom.xml
@@ -24,64 +24,61 @@
24 24 <description>Ivory Process Module</description>
25 25 <name>Ivory Process</name>
26 26 <packaging>jar</packaging>
27   - <dependencies>
  27 +
  28 + <dependencies>
28 29 <dependency>
29 30 <groupId>commons-cli</groupId>
30 31 <artifactId>commons-cli</artifactId>
31   - <version>1.2</version>
32 32 </dependency>
33   - <dependency>
  33 +
  34 + <dependency>
34 35 <groupId>org.apache.ivory</groupId>
35 36 <artifactId>ivory-oozie-adaptor</artifactId>
36   - <version>${project.version}</version>
37 37 </dependency>
38   - <dependency>
  38 +
  39 + <dependency>
39 40 <groupId>org.apache.ivory</groupId>
40 41 <artifactId>ivory-common</artifactId>
41   - <version>${project.version}</version>
42 42 </dependency>
43   - <dependency>
  43 +
  44 + <dependency>
44 45 <groupId>org.apache.ivory</groupId>
45 46 <artifactId>ivory-feed</artifactId>
46   - <version>${project.version}</version>
47 47 </dependency>
48   - <dependency>
  48 +
  49 + <dependency>
49 50 <groupId>org.apache.ivory</groupId>
50 51 <artifactId>ivory-test-util</artifactId>
51   - <version>${project.version}</version>
52   - <scope>test</scope>
53 52 </dependency>
  53 +
54 54 <dependency>
55 55 <groupId>org.apache.ivory</groupId>
56 56 <artifactId>ivory-messaging</artifactId>
57   - <version>${project.version}</version>
58 57 </dependency>
  58 +
59 59 <dependency>
60 60 <groupId>org.apache.hadoop</groupId>
61 61 <artifactId>hadoop-core</artifactId>
62   - <version>0.20.2-cdh3u0</version>
63   - <exclusions>
64   - <exclusion>
65   - <groupId>org.eclipse.jdt</groupId>
66   - <artifactId>core</artifactId>
67   - </exclusion>
68   - </exclusions>
69 62 </dependency>
  63 +
70 64 <dependency>
71 65 <groupId>org.apache.hadoop</groupId>
72 66 <artifactId>hadoop-test</artifactId>
73   - <version>0.20.2-cdh3u0</version>
74   - <scope>test</scope>
75 67 </dependency>
  68 +
76 69 <dependency>
77 70 <groupId>org.springframework</groupId>
78 71 <artifactId>spring-jms</artifactId>