From cd351105e51c9306f89a567b5753a37f97b33a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= Date: Fri, 2 Oct 2015 09:32:46 +0200 Subject: [PATCH 1/3] METAMODEL-191: Added tattletale plugin (build will fail now) --- full/pom.xml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/full/pom.xml b/full/pom.xml index d3754111e..3ec76aa5a 100644 --- a/full/pom.xml +++ b/full/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + MetaModel org.apache.metamodel @@ -47,6 +48,30 @@ under the License. + + + org.jboss.tattletale + tattletale-maven + 1.1.2.Final + + + verify + + report + + + + + ${project.build.directory}/lib + ${project.reporting.outputDirectory}/tattletale + + jar + multiplejars + + tattletale-filters.properties + true + + From 94dd5f82cf8317d6f1dc9a7efab687358b044dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= Date: Fri, 2 Oct 2015 10:44:42 +0200 Subject: [PATCH 2/3] METAMODEL-191: Added exclusions and dependency bans to fix conflicts --- excel/pom.xml | 7 ++++- full/tattletale-filters.properties | 2 ++ hadoop/pom.xml | 11 +++++++- hbase/pom.xml | 8 ++++++ pom.xml | 44 +++++++++++++++++++++++++++++- 5 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 full/tattletale-filters.properties diff --git a/excel/pom.xml b/excel/pom.xml index e690be704..c26e65452 100644 --- a/excel/pom.xml +++ b/excel/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + MetaModel org.apache.metamodel @@ -50,6 +51,10 @@ under the License. log4j log4j + + stax + stax-api + org.apache.geronimo.specs geronimo-stax-api_1.0_spec diff --git a/full/tattletale-filters.properties b/full/tattletale-filters.properties new file mode 100644 index 000000000..fe90afdd4 --- /dev/null +++ b/full/tattletale-filters.properties @@ -0,0 +1,2 @@ +#Filtering file used for the Tattletale plugin. Since Hadoop has a few overlapping package-info files, this class mentions them explicitly to filter them out in the tattletale validation. +multiplejars=org.apache.hadoop.yarn.client.api.impl.package-info,org.apache.hadoop.yarn.client.api.package-info,org.apache.hadoop.yarn.factories.package-info,org.apache.hadoop.yarn.factory.providers.package-info,org.apache.hadoop.yarn.util.package-info \ No newline at end of file diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 0659b5051..01cc692be 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -9,7 +9,8 @@ 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. --> - + MetaModel org.apache.metamodel @@ -33,6 +34,14 @@ org.apache.hadoop hadoop-client + + commons-beanutils + commons-beanutils + + + net.sourceforge.findbugs + annotations + org.slf4j jcl-over-slf4j diff --git a/hbase/pom.xml b/hbase/pom.xml index 7ca2fca96..8367e1ed7 100644 --- a/hbase/pom.xml +++ b/hbase/pom.xml @@ -62,6 +62,10 @@ jetty-util org.mortbay.jetty + + com.github.stephenc.findbugs + findbugs-annotations + tomcat jasper-runtime @@ -132,6 +136,10 @@ + + net.sourceforge.findbugs + annotations + org.slf4j jcl-over-slf4j diff --git a/pom.xml b/pom.xml index 86273ab48..6d9d86240 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 UTF-8 @@ -273,6 +274,16 @@ under the License. commons-logging:commons-logging:compile org.codehaus.jackson:compile + + + commons-beanutils:commons-beanutils-core:* + + + stax:stax-api:* + javax.xml.stream:stax-api + + + com.github.stephenc.findbugs:findbugs-annotations:* @@ -374,6 +385,7 @@ under the License. **/*.iws/** **/*.ipr/** **/.idea/** + **/tattletale-filters.properties DEPENDENCIES DISCLAIMER @@ -428,6 +440,22 @@ under the License. + + commons-beanutils + commons-beanutils + 1.9.2 + + + commons-logging + commons-logging + + + + + net.sourceforge.findbugs + annotations + 1.3.2 + org.apache.httpcomponents httpcore @@ -499,6 +527,10 @@ under the License. jetty-util org.mortbay.jetty + + com.github.stephenc.findbugs + findbugs-annotations + commons-logging commons-logging @@ -529,6 +561,12 @@ under the License. org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} + + + javax.xml.stream + stax-api + + org.apache.hadoop @@ -551,6 +589,10 @@ under the License. commons-logging commons-logging + + commons-beanutils + commons-beanutils-core + jetty org.mortbay.jetty From be8cfe857eff1a6855ed4846c4a0d42b1fea430d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= Date: Sat, 3 Oct 2015 12:25:21 +0200 Subject: [PATCH 3/3] METAMODEL-191: Added the necesary exclusions to test dependencies. --- cassandra/pom.xml | 37 ++++++++++++++++++++++--------------- jdbc/pom.xml | 37 +++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 473cf309f..9a0b18480 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -9,7 +9,8 @@ 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. --> - + MetaModel org.apache.metamodel @@ -29,13 +30,13 @@ MetaModel-core ${project.version} - - - com.datastax.cassandra - cassandra-driver-core - ${cassandra.driver.latest.version} - - + + + com.datastax.cassandra + cassandra-driver-core + ${cassandra.driver.latest.version} + + commons-io commons-io @@ -50,11 +51,17 @@ junit test - - org.cassandraunit - cassandra-unit - 2.1.3.1 - test - - + + org.cassandraunit + cassandra-unit + 2.1.3.1 + test + + + javax.xml.stream + stax-api + + + + diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 378ebf0e4..bba6d710b 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -1,23 +1,16 @@ - - + + MetaModel org.apache.metamodel @@ -37,7 +30,7 @@ under the License. commons-pool commons-pool - + org.slf4j @@ -122,6 +115,10 @@ under the License. commons-logging commons-logging + + javax.xml.stream + stax-api +