SLIDER-331 fixed incorrect headers, added missing dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/80eec9b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/80eec9b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/80eec9b1 Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 80eec9b105968f5c13f97155f1d241067a6c924d Parents: a34cca8 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Mon Aug 18 17:07:34 2014 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Mon Aug 18 17:07:34 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/pom.xml | 11 +++++++++ pom.xml | 24 ++++++++++++++++--- slider-assembly/pom.xml | 14 ----------- slider-core/pom.xml | 16 ++++++++++++- .../accumulo/accumulo-funtests/pom.xml | 23 ++++++++++++++++++ slider-providers/hbase/hbase-funtests/pom.xml | 5 ++++ src/test/clusters/c6401/slider/log4j.properties | 25 +++++++++++--------- .../clusters/morzine/slider/log4j.properties | 25 +++++++++++--------- .../clusters/offline/slider/log4j.properties | 25 +++++++++++--------- .../clusters/remote/slider/log4j.properties | 25 +++++++++++--------- .../clusters/sandbox/slider/log4j.properties | 25 +++++++++++--------- 11 files changed, 145 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml index 801d90f..02bf668 100644 --- a/app-packages/accumulo/pom.xml +++ b/app-packages/accumulo/pom.xml @@ -169,6 +169,12 @@ </dependency> <dependency> <groupId>org.apache.slider</groupId> + <artifactId>slider-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.slider</groupId> <artifactId>slider-funtest</artifactId> <scope>test</scope> </dependency> @@ -177,6 +183,11 @@ <artifactId>groovy-all</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 223ff2b..22f56b1 100644 --- a/pom.xml +++ b/pom.xml @@ -145,9 +145,11 @@ <jackson.version>1.9.13</jackson.version> <jcommander.version>1.30</jcommander.version> + <jetty.version>6.1.26</jetty.version> <jersey.version>1.9</jersey.version> <servlet-api.version>2.5</servlet-api.version> <jsr311-api.version>1.1.1</jsr311-api.version> + <jaxb-api.version>2.2.7</jaxb-api.version> <junit.version>4.11</junit.version> <log4j.version>1.2.17</log4j.version> @@ -1119,6 +1121,12 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-api.version}</version> + </dependency> + + <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> <version>${jersey.version}</version> @@ -1205,9 +1213,19 @@ <!-- ======================================================== --> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-sslengine</artifactId> - <version>6.1.26</version> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-sslengine</artifactId> + <version>${jetty.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/slider-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml index d5299ee..e9defb5 100644 --- a/slider-assembly/pom.xml +++ b/slider-assembly/pom.xml @@ -141,26 +141,12 @@ </configuration> <executions> <execution> - <id>clean</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>pre-clean</phase> - </execution> - <execution> <id>default</id> <goals> <goal>enforce</goal> </goals> <phase>validate</phase> </execution> - <execution> - <id>site</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>pre-site</phase> - </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index d403034..b2bdeed 100644 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@ -406,6 +406,11 @@ </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + + <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> </dependency> @@ -466,8 +471,17 @@ <dependency> <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-sslengine</artifactId> - <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/slider-providers/accumulo/accumulo-funtests/pom.xml ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml index 0f11618..73d9ae0 100644 --- a/slider-providers/accumulo/accumulo-funtests/pom.xml +++ b/slider-providers/accumulo/accumulo-funtests/pom.xml @@ -143,6 +143,16 @@ <dependency> <groupId>org.apache.slider</groupId> <artifactId>slider-core</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.slider</groupId> + <artifactId>slider-core</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -207,9 +217,22 @@ <dependency> <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-test</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>0.9.0</version> + <scope>test</scope> + </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/slider-providers/hbase/hbase-funtests/pom.xml ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml index d5e9d0e..d143408 100644 --- a/slider-providers/hbase/hbase-funtests/pom.xml +++ b/slider-providers/hbase/hbase-funtests/pom.xml @@ -140,6 +140,11 @@ <dependency> <groupId>org.apache.slider</groupId> <artifactId>slider-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.slider</groupId> + <artifactId>slider-core</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/src/test/clusters/c6401/slider/log4j.properties ---------------------------------------------------------------------- diff --git a/src/test/clusters/c6401/slider/log4j.properties b/src/test/clusters/c6401/slider/log4j.properties index d814f14..4682a96 100644 --- a/src/test/clusters/c6401/slider/log4j.properties +++ b/src/test/clusters/c6401/slider/log4j.properties @@ -1,15 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. See accompanying LICENSE file. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # log4j configuration used during build and unit tests http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/src/test/clusters/morzine/slider/log4j.properties ---------------------------------------------------------------------- diff --git a/src/test/clusters/morzine/slider/log4j.properties b/src/test/clusters/morzine/slider/log4j.properties index d814f14..4682a96 100644 --- a/src/test/clusters/morzine/slider/log4j.properties +++ b/src/test/clusters/morzine/slider/log4j.properties @@ -1,15 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. See accompanying LICENSE file. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # log4j configuration used during build and unit tests http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/src/test/clusters/offline/slider/log4j.properties ---------------------------------------------------------------------- diff --git a/src/test/clusters/offline/slider/log4j.properties b/src/test/clusters/offline/slider/log4j.properties index d814f14..4682a96 100644 --- a/src/test/clusters/offline/slider/log4j.properties +++ b/src/test/clusters/offline/slider/log4j.properties @@ -1,15 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. See accompanying LICENSE file. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # log4j configuration used during build and unit tests http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/src/test/clusters/remote/slider/log4j.properties ---------------------------------------------------------------------- diff --git a/src/test/clusters/remote/slider/log4j.properties b/src/test/clusters/remote/slider/log4j.properties index f672472..5b59190 100644 --- a/src/test/clusters/remote/slider/log4j.properties +++ b/src/test/clusters/remote/slider/log4j.properties @@ -1,15 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. See accompanying LICENSE file. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # log4j configuration used during build and unit tests http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80eec9b1/src/test/clusters/sandbox/slider/log4j.properties ---------------------------------------------------------------------- diff --git a/src/test/clusters/sandbox/slider/log4j.properties b/src/test/clusters/sandbox/slider/log4j.properties index d814f14..4682a96 100644 --- a/src/test/clusters/sandbox/slider/log4j.properties +++ b/src/test/clusters/sandbox/slider/log4j.properties @@ -1,15 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. See accompanying LICENSE file. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # log4j configuration used during build and unit tests
