accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [45/50] [abbrv] git commit: ACCUMULO-1496 Update scannotations version
Date Wed, 17 Jul 2013 02:33:47 GMT
ACCUMULO-1496 Update scannotations version


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b17d9806
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b17d9806
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b17d9806

Branch: refs/heads/ACCUMULO-1496
Commit: b17d98069953366abcaca29f756acd95a384062e
Parents: 424caaa
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jul 16 15:13:27 2013 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jul 16 15:13:27 2013 -0400

----------------------------------------------------------------------
 assemble/pom.xml                           | 8 ++++----
 assemble/src/main/assemblies/component.xml | 2 +-
 pom.xml                                    | 6 +++---
 start/pom.xml                              | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b17d9806/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 96a1094..e7daa0b 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -47,10 +47,6 @@
       <artifactId>jline</artifactId>
     </dependency>
     <dependency>
-      <groupId>net.sf.scannotation</groupId>
-      <artifactId>scannotation</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-core</artifactId>
     </dependency>
@@ -98,6 +94,10 @@
       <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.scannotation</groupId>
+      <artifactId>scannotation</artifactId>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b17d9806/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index c366c41..b5f1419 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -32,9 +32,9 @@
         <include>com.google.code.gson:gson</include>
         <include>com.google.guava:guava</include>
         <include>jline:jline</include>
-        <include>net.sf.scannotation:scannotation</include>
         <include>org.apache.thrift:libthrift</include>
         <include>org.javassist:javassist</include>
+        <include>org.scannotation:scannotation</include>
       </includes>
       <excludes>
         <exclude>${groupId}:${artifactId}-docs</exclude>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b17d9806/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1534f7..39f6091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,9 +206,9 @@
         <version>1.2.16</version>
       </dependency>
       <dependency>
-        <groupId>net.sf.scannotation</groupId>
+        <groupId>org.scannotation</groupId>
         <artifactId>scannotation</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
@@ -335,7 +335,7 @@
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-        <version>3.17.1-GA</version>
+        <version>3.18.0-GA</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b17d9806/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 61496bf..6cdd4a4 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -26,10 +26,6 @@
   <name>Start</name>
   <dependencies>
     <dependency>
-      <groupId>net.sf.scannotation</groupId>
-      <artifactId>scannotation</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-vfs2</artifactId>
     </dependency>
@@ -38,6 +34,10 @@
       <artifactId>javassist</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.scannotation</groupId>
+      <artifactId>scannotation</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>provided</scope>


Mime
View raw message