You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/08/05 21:03:13 UTC
[14/50] [abbrv] phoenix git commit: PHOENIX-3101 Remove findbugs'
annotations dependency as it is lgpl
PHOENIX-3101 Remove findbugs' annotations dependency as it is lgpl
Findbugs' annotation class also included implementations for the
JCIP annotations. Add in stephenc's jcip-annotations for this.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7073a697
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7073a697
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7073a697
Branch: refs/heads/encodecolumns
Commit: 7073a6979f73eb1c45c49e09f29494294af27dcf
Parents: 71f3143
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 20 13:55:30 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 21 15:47:29 2016 -0400
----------------------------------------------------------------------
dev/release_files/NOTICE | 28 ++++++++++++++++++----------
phoenix-core/pom.xml | 10 +++++++---
pom.xml | 14 ++++++++++----
3 files changed, 35 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7073a697/dev/release_files/NOTICE
----------------------------------------------------------------------
diff --git a/dev/release_files/NOTICE b/dev/release_files/NOTICE
index ae85c56..eed1edc 100644
--- a/dev/release_files/NOTICE
+++ b/dev/release_files/NOTICE
@@ -256,16 +256,24 @@ Xalan-Java
Apache Xerces Java
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
Apache XML Commons XML APIs
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
+jcip-annotations
+
+ Copyright 2013 Stephen Connolly.
+
+findbugs-annotations
+
+ Copyright Stephen Connolly.
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7073a697/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 4a2de67..d20183c 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -273,10 +273,14 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <!-- Findbugs Annotation -->
+ <!-- JSR-305 and jcip-annotations -->
<dependency>
- <groupId>net.sourceforge.findbugs</groupId>
- <artifactId>annotations</artifactId>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7073a697/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8b1b506..8bda1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,8 @@
<sqlline.version>1.1.9</sqlline.version>
<guava.version>13.0.1</guava.version>
<flume.version>1.4.0</flume.version>
- <findbugs.version>1.3.2</findbugs.version>
+ <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
+ <jcip-annotations.version>1.0-1</jcip-annotations.version>
<jline.version>2.11</jline.version>
<snappy.version>0.3</snappy.version>
<netty.version>3.6.6.Final</netty.version>
@@ -721,9 +722,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.findbugs</groupId>
- <artifactId>annotations</artifactId>
- <version>${findbugs.version}</version>
+ <groupId>com.github.stephenc.findbugs</groupId>
+ <artifactId>findbugs-annotations</artifactId>
+ <version>${findbugs-annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>${jcip-annotations.version}</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>