You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2016/11/28 21:41:40 UTC
[1/2] incubator-tamaya git commit: TAMAYA-205: Update dependencies to
try to fix build
Repository: incubator-tamaya
Updated Branches:
refs/heads/master f49c824d3 -> ac0c08380
TAMAYA-205: Update dependencies to try to fix build
* Update plugins/dependencies to try to fix the build on ASF infra
(not look for codehaus anymore)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/3be98911
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/3be98911
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/3be98911
Branch: refs/heads/master
Commit: 3be98911247611c5bc87fd9e1b46411ce280dd95
Parents: f49c824
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 28 22:40:16 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 28 22:40:16 2016 +0100
----------------------------------------------------------------------
pom.xml | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3be98911/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56eac1c..9c72c4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,6 @@ under the License.
<!-- Must/should match the JRuby version used by AsciidoctorJ -->
<jruby.version>1.7.20</jruby.version>
<findbugs.version>3.0.4</findbugs.version>
- <mockito.version>1.10.19</mockito.version>
<rat.version>0.12</rat.version>
<toolchains.plugin>1.1</toolchains.plugin>
@@ -221,8 +220,14 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
+ <version>1.10.19</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -260,14 +265,6 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -336,7 +333,7 @@ under the License.
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>6.2</version>
+ <version>7.3</version>
<exclusions><!-- MCHECKSTYLE-156 -->
<exclusion>
<groupId>com.sun</groupId>
@@ -405,7 +402,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.0</version>
<configuration>
<debug>true</debug>
<optimize>${maven.compile.optimize}</optimize>
@@ -699,7 +696,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
[2/2] incubator-tamaya git commit: TAMAYA-205: Prevent local build
failure
Posted by po...@apache.org.
TAMAYA-205: Prevent local build failure
* Add missing findbugs config for 01-minimal example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ac0c0838
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ac0c0838
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ac0c0838
Branch: refs/heads/master
Commit: ac0c083805caf9e2bbaca5ddc1c23b884c90cbfc
Parents: 3be9891
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 28 22:40:51 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 28 22:40:51 2016 +0100
----------------------------------------------------------------------
.../01-minimal/findbugs/findbugs-exclude.xml | 136 +++++++++++++++++++
1 file changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ac0c0838/examples/01-minimal/findbugs/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/examples/01-minimal/findbugs/findbugs-exclude.xml b/examples/01-minimal/findbugs/findbugs-exclude.xml
new file mode 100644
index 0000000..50255d9
--- /dev/null
+++ b/examples/01-minimal/findbugs/findbugs-exclude.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<FindBugsFilter>
+ <Match>
+ <!-- Also catches simple anonamous classes... -->
+ <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON" />
+ </Match>
+
+ <Match>
+ <!-- Note: @todo Write a bug report
+ The current version of FindBugs (version 3.0.0) is not able to detect
+ the usage of this method via a method reference.
+ Oliver B. Fischer, 17.01.2015
+ -->
+ <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD" />
+ </Match>
+
+ <Match>
+ <!-- Note: @todo Write a bug report
+ The current version of FindBugs (version 3.0.0) is not able to detect
+ correctly caught exceptions.
+ Oliver B. Fischer, 09.02.2015
+ -->
+ <Bug pattern="REC_CATCH_EXCEPTION"/>
+ </Match>
+
+ <Match>
+ <!-- Note: We will not fail because of an unread field. -->
+ <Bug pattern="URF_UNREAD_FIELD" />
+ </Match>
+
+ <Match>
+ <!-- Note: We will not fail because of an unused field -->
+ <Bug pattern="UUF_UNUSED_FIELD" />
+ </Match>
+
+ <Match>
+ <Class name='org.apache.tamaya.integration.cdi.TamayaCDIIntegration'/>
+ <Method name="initBeanManager"/>
+ </Match>
+
+ <Match>
+ <!-- Note:
+ Intended. See the inline comment on this issue in the source file
+ in revision ae66299e25b41167008021ffe95cad236f6e2bd3
+ Oliver B. Fischer, 17.01.2015
+ -->
+ <Class name='org.apache.tamaya.resource.internal.ClasspathCollector'/>
+ <Method name="doFindPathMatchingJarResources"
+ returns="java.util.Collection"/>
+ <Bug pattern="OS_OPEN_STREAM"/>
+
+ </Match>
+
+ <!-- False positive returnin null for Boolean is required by the implemented interface. -->
+ <Match>
+ <Class name="org.apache.tamaya.core.internal.converters.BooleanConverter"/>
+ </Match>
+
+ <!-- False positive: example class used for config demo. -->
+ <Match>
+ <Class name="org.apache.tamaya.examples.injection.Example"/>
+ </Match>
+
+ <!--
+ * findBugs does not detect usage via method references
+ * should be removed after see TODO ProgrammaticConfigurationContext:131
+ -->
+
+ <!-- Issues to review -->
+
+ <Match>
+ <Package name="org.apache.tamaya.core.internal"/>
+ </Match>
+
+ <!--<Match>-->
+ <!--<Class name="org.apache.tamaya.resolver.internal.ResourceResolver" />-->
+ <!--</Match>-->
+ <!--<Match>-->
+ <!--<Class name="org.apache.tamaya.resolver.internal.FileResolver" />-->
+ <!--</Match>-->
+ <!--<Match>-->
+ <!--<Class name="org.apache.tamaya.resolver.internal.DefaultExpressionEvaluator" />-->
+ <!--</Match>-->
+ <!--<Match>-->
+ <!--<Class name="org.apache.tamaya.inject.internal.ConfiguredSetterMethod" />-->
+ <!--</Match>-->
+ <Match>
+ <Class name="org.apache.tamaya.inject.internal.ConfigChangeCallbackMethod" />
+ </Match>
+
+ <Match>
+ <Class name="org.apache.tamaya.events.internal.DefaultConfigChangeObserver" />
+ <Method name="checkConfigurationUpdate" />
+ </Match>
+
+ <Match>
+ <Class name="org.apache.tamaya.inject.internal.DefaultDynamicValue"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.tamaya.integration.cdi.DefaultDynamicValue"/>
+ </Match>
+ <Match>
+ <!-- Imported from APache Felix. -->
+ <Class name="org.apache.tamaya.integration.osgi.felix.FilePersistenceManager"/>
+ </Match>
+ <Match>
+ <!-- Imported from APache Felix. -->
+ <Class name="org.apache.tamaya.integration.osgi.felix.ConfigurationHandler"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.tamaya.integration.osgi.injection.Activator"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.tamaya.resource.internal.FileCollector"/>
+ <Method name="traverseAndSelectFromChildren"/>
+ </Match>
+
+</FindBugsFilter>