OAK-7259 - Improve SegmentNodeStoreStats to include number of commits…

… per thread and threads currently waiting on the semaphore Removed dependency to concurrentlinkedhashmap from other bundles and embedded it in oak-segment-tar git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1826245 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 8, 2018 · 1332a09 · 1332a09
1 parent 820b198
commit 1332a09
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 55 deletions.
diff --git a/oak-examples/standalone/pom.xml b/oak-examples/standalone/pom.xml
@@ -100,11 +100,6 @@
       <artifactId>metrics-core</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-   	  <artifactId>concurrentlinkedhashmap-lru</artifactId>
-   	  <optional>true</optional>
-	</dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>mongo-java-driver</artifactId>

diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml
@@ -201,11 +201,6 @@
       <artifactId>metrics-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-   	  <artifactId>concurrentlinkedhashmap-lru</artifactId>
-   	  <scope>test</scope>
-	</dependency>
   </dependencies>
 
   <build>

diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
@@ -188,11 +188,6 @@
       <artifactId>metrics-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-   	  <artifactId>concurrentlinkedhashmap-lru</artifactId>
-   	  <scope>test</scope>
-	</dependency>
   </dependencies>
 
 </project>
diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml
@@ -51,7 +51,6 @@
         <include>org.apache.jackrabbit:oak-security-spi</include>
         <include>org.apache.jackrabbit:oak-blob-plugins</include>
         <include>io.dropwizard.metrics:metrics-core</include>
-        <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
       </includes>
     </dependencySet>
   </dependencySets>

diff --git a/oak-it/pom.xml b/oak-it/pom.xml
@@ -212,10 +212,5 @@
             <artifactId>metrics-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-	  		<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-	    	<artifactId>concurrentlinkedhashmap-lru</artifactId>
-	    	<scope>test</scope>
-      	</dependency>
     </dependencies>
 </project>
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
@@ -458,10 +458,5 @@
       <artifactId>metrics-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-	  <artifactId>concurrentlinkedhashmap-lru</artifactId>
-	  <scope>test</scope>
-   	</dependency>
   </dependencies>
 </project>
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
@@ -387,11 +387,6 @@
       <artifactId>metrics-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
- 	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-	  <artifactId>concurrentlinkedhashmap-lru</artifactId>
-	  <scope>test</scope>
-   	</dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-exec</artifactId>

diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
@@ -540,11 +540,6 @@
         <artifactId>guava</artifactId>
         <version>${guava.version}</version>
       </dependency>
-      <dependency>
-	  	<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-	    <artifactId>concurrentlinkedhashmap-lru</artifactId>
-	    <version>1.4.2</version>
-      </dependency>
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>

diff --git a/oak-pojosr/pom.xml b/oak-pojosr/pom.xml
@@ -352,10 +352,5 @@
       <artifactId>metrics-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
- 	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-      <artifactId>concurrentlinkedhashmap-lru</artifactId>
-      <scope>test</scope>
-   	</dependency>
   </dependencies>
 </project>
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
@@ -113,10 +113,6 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
-        <dependency>
- 	 	 	<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-	 		 <artifactId>concurrentlinkedhashmap-lru</artifactId>
-   		</dependency>
 
         <!-- Test dependencies -->
         <dependency>

diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml
@@ -34,6 +34,7 @@
 
     <properties>
         <netty.version>4.1.14.Final</netty.version>
+        <concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
     </properties>
 
     <build>
@@ -45,7 +46,8 @@
                     <instructions>
                         <Export-Package />
                         <Embed-Dependency>
-                            netty-*
+                            netty-*,
+                            concurrentlinkedhashmap-lru
                         </Embed-Dependency>
                         <Import-Package>
                             com.codahale.metrics*;version="[3.1,4)",
@@ -236,11 +238,6 @@
             <artifactId>jsr305</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-            <artifactId>concurrentlinkedhashmap-lru</artifactId>
-            <scope>provided</scope>
-	    </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -262,6 +259,8 @@
             <scope>provided</scope>
         </dependency>
 
+		<!-- Embedded dependencies -->
+
         <!-- Netty -->
 
         <dependency>
@@ -301,6 +300,15 @@
             <scope>compile</scope>
         </dependency>
 
+		<!-- ConcurrentLinkedHashMap -->
+
+        <dependency>
+            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+            <version>${concurrentlinkedhashmap.version}</version>
+            <scope>compile</scope>
+	    </dependency>
+
         <!-- Dependencies on Oak testing modules -->
 
         <dependency>

diff --git a/oak-upgrade/pom.xml b/oak-upgrade/pom.xml
@@ -172,10 +172,6 @@
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
-    <dependency>
-	  <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-	  <artifactId>concurrentlinkedhashmap-lru</artifactId>
-    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>