Repository: usergrid Updated Branches: refs/heads/master 2af22a871 -> 8fda9374f
Fix more netty dependency exclusions. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8fda9374 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8fda9374 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8fda9374 Branch: refs/heads/master Commit: 8fda9374f76940b41038b31ea034d8c666bdb66f Parents: 2af22a8 Author: Michael Russo <[email protected]> Authored: Sun Nov 20 22:30:53 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Sun Nov 20 22:30:53 2016 -0800 ---------------------------------------------------------------------- stack/core/pom.xml | 4 +-- .../src/test/resources/log4j.properties | 38 ++++++++++++++++++++ .../cache/src/test/resources/log4j.properties | 38 ++++++++++++++++++++ stack/corepersistence/collection/pom.xml | 6 ++++ stack/corepersistence/common/pom.xml | 11 +++--- .../common/src/test/resources/log4j.properties | 1 + .../map/src/test/resources/log4j.properties | 38 ++++++++++++++++++++ stack/corepersistence/pom.xml | 2 +- stack/pom.xml | 12 +++---- stack/services/pom.xml | 2 +- stack/test-utils/pom.xml | 6 +++- 11 files changed, 140 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/core/pom.xml ---------------------------------------------------------------------- diff --git a/stack/core/pom.xml b/stack/core/pom.xml index 8e05530..09047bb 100644 --- a/stack/core/pom.xml +++ b/stack/core/pom.xml @@ -130,10 +130,10 @@ </exclusion> <exclusion> <groupId>net.jpountz.lz4</groupId> - <artifactId>*</artifactId> + <artifactId>lz4</artifactId> </exclusion> <exclusion> - <artifactId>*</artifactId> + <artifactId>netty-all</artifactId> <groupId>io.netty</groupId> </exclusion> </exclusions> http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/actorsystem/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/actorsystem/src/test/resources/log4j.properties b/stack/corepersistence/actorsystem/src/test/resources/log4j.properties new file mode 100644 index 0000000..d9f6b7f --- /dev/null +++ b/stack/corepersistence/actorsystem/src/test/resources/log4j.properties @@ -0,0 +1,38 @@ +# +# 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 +# +# 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. +# + +# suppress inspection "UnusedProperty" for whole file +log4j.rootLogger=INFO,stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p %c{3}.%M(%L)<%t>- %m%n + +#log4j.logger.com.datastax.driver.core=TRACE +log4j.logger.org.safehaus.chop.plugin=DEBUG +log4j.logger.org.safehaus.guicyfig=ERROR +log4j.logger.org.safehaus.chop.api.store.amazon=DEBUG +log4j.logger.org.apache.http=ERROR +log4j.logger.com.amazonaws.request=ERROR +log4j.logger.cassandra.db=ERROR + +#log4j.logger.org.apache.usergrid=DEBUG +#log4j.logger.org.apache.usergrid.persistence.collection=TRACE +log4j.logger.org.apache.usergrid.persistence.collection.mvcc.stage.delete.VersionCompact=TRACE + http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/cache/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/cache/src/test/resources/log4j.properties b/stack/corepersistence/cache/src/test/resources/log4j.properties new file mode 100644 index 0000000..d9f6b7f --- /dev/null +++ b/stack/corepersistence/cache/src/test/resources/log4j.properties @@ -0,0 +1,38 @@ +# +# 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 +# +# 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. +# + +# suppress inspection "UnusedProperty" for whole file +log4j.rootLogger=INFO,stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p %c{3}.%M(%L)<%t>- %m%n + +#log4j.logger.com.datastax.driver.core=TRACE +log4j.logger.org.safehaus.chop.plugin=DEBUG +log4j.logger.org.safehaus.guicyfig=ERROR +log4j.logger.org.safehaus.chop.api.store.amazon=DEBUG +log4j.logger.org.apache.http=ERROR +log4j.logger.com.amazonaws.request=ERROR +log4j.logger.cassandra.db=ERROR + +#log4j.logger.org.apache.usergrid=DEBUG +#log4j.logger.org.apache.usergrid.persistence.collection=TRACE +log4j.logger.org.apache.usergrid.persistence.collection.mvcc.stage.delete.VersionCompact=TRACE + http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/collection/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml index 2c7702b..5e4f365 100644 --- a/stack/corepersistence/collection/pom.xml +++ b/stack/corepersistence/collection/pom.xml @@ -39,6 +39,12 @@ <groupId>org.apache.usergrid</groupId> <artifactId>common</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <artifactId>netty-all</artifactId> + <groupId>io.netty</groupId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/common/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml index a85d07e..e1b0430 100644 --- a/stack/corepersistence/common/pom.xml +++ b/stack/corepersistence/common/pom.xml @@ -74,10 +74,10 @@ <exclusions> <exclusion> <groupId>net.jpountz.lz4</groupId> - <artifactId>*</artifactId> + <artifactId>lz4</artifactId> </exclusion> <exclusion> - <artifactId>*</artifactId> + <artifactId>netty-all</artifactId> <groupId>io.netty</groupId> </exclusion> <exclusion> @@ -219,17 +219,16 @@ <exclusions> <exclusion> <groupId>io.netty</groupId> - <artifactId>*</artifactId> + <artifactId>netty-all</artifactId> </exclusion> </exclusions> </dependency> - <!-- LZ4 compression used for Datastax Java Driver: - https://datastax.github.io/java-driver/2.1.7/features/compression/ --> + <!-- LZ4 compression used for Datastax Java Driver --> <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/common/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/resources/log4j.properties b/stack/corepersistence/common/src/test/resources/log4j.properties index 9a0ecb0..733ec0b 100644 --- a/stack/corepersistence/common/src/test/resources/log4j.properties +++ b/stack/corepersistence/common/src/test/resources/log4j.properties @@ -24,6 +24,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p %c{3}.%M(%L)<%t>- %m%n +#log4j.logger.com.datastax.driver.core=TRACE #log4j.logger.org.safehaus.chop.plugin=DEBUG log4j.logger.org.safehaus.guicyfig=ERROR log4j.logger.org.safehaus.chop.api.store.amazon=DEBUG http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/map/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/map/src/test/resources/log4j.properties b/stack/corepersistence/map/src/test/resources/log4j.properties new file mode 100644 index 0000000..d9f6b7f --- /dev/null +++ b/stack/corepersistence/map/src/test/resources/log4j.properties @@ -0,0 +1,38 @@ +# +# 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 +# +# 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. +# + +# suppress inspection "UnusedProperty" for whole file +log4j.rootLogger=INFO,stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p %c{3}.%M(%L)<%t>- %m%n + +#log4j.logger.com.datastax.driver.core=TRACE +log4j.logger.org.safehaus.chop.plugin=DEBUG +log4j.logger.org.safehaus.guicyfig=ERROR +log4j.logger.org.safehaus.chop.api.store.amazon=DEBUG +log4j.logger.org.apache.http=ERROR +log4j.logger.com.amazonaws.request=ERROR +log4j.logger.cassandra.db=ERROR + +#log4j.logger.org.apache.usergrid=DEBUG +#log4j.logger.org.apache.usergrid.persistence.collection=TRACE +log4j.logger.org.apache.usergrid.persistence.collection.mvcc.stage.delete.VersionCompact=TRACE + http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/corepersistence/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml index 8c379c0..527e439 100644 --- a/stack/corepersistence/pom.xml +++ b/stack/corepersistence/pom.xml @@ -80,7 +80,7 @@ limitations under the License. <commons.collections.version>3.2.1</commons.collections.version> <commons.io.version>2.4</commons.io.version> <commons.lang.version>3.1</commons.lang.version> - <datastax.version>2.1.9</datastax.version> + <datastax.version>2.1.10.3</datastax.version> <elasticsearch.version>1.7.5</elasticsearch.version> <fasterxml-uuid.version>3.1.3</fasterxml-uuid.version> <guava.version>18.0</guava.version> http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index d6f0bae..513c894 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -352,6 +352,10 @@ <exclusions> <exclusion> + <artifactId>netty-all</artifactId> + <groupId>io.netty</groupId> + </exclusion> + <exclusion> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> </exclusion> @@ -468,7 +472,7 @@ <exclusion> <groupId>net.jpountz.lz4</groupId> - <artifactId>*</artifactId> + <artifactId>lz4</artifactId> </exclusion> <exclusion> @@ -633,12 +637,6 @@ <!-- Other Commercial Dependencies --> <dependency> - <groupId>com.datastax.hector</groupId> - <artifactId>hector-composite</artifactId> - <version>0.8.0-rc1-SNAPSHOT</version> - </dependency> - - <dependency> <groupId>com.fasterxml.uuid</groupId> <artifactId>java-uuid-generator</artifactId> <version>3.1.2</version> http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/services/pom.xml ---------------------------------------------------------------------- diff --git a/stack/services/pom.xml b/stack/services/pom.xml index d045bfa..4f892d6 100644 --- a/stack/services/pom.xml +++ b/stack/services/pom.xml @@ -296,7 +296,7 @@ <artifactId>jclouds-netty</artifactId> <exclusions> <exclusion> - <artifactId>*</artifactId> + <artifactId>netty-all</artifactId> <groupId>io.netty</groupId> </exclusion> </exclusions> http://git-wip-us.apache.org/repos/asf/usergrid/blob/8fda9374/stack/test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml index 5f1b08d..bbcf1ff 100644 --- a/stack/test-utils/pom.xml +++ b/stack/test-utils/pom.xml @@ -103,7 +103,11 @@ </exclusion> <exclusion> <groupId>net.jpountz.lz4</groupId> - <artifactId>*</artifactId> + <artifactId>lz4</artifactId> + </exclusion> + <exclusion> + <artifactId>netty-all</artifactId> + <groupId>io.netty</groupId> </exclusion> </exclusions> </dependency>
