[concurrentlinkedhashmap-lru] remove bundled JCP JSR-166

gil gil at fedoraproject.org
Fri Mar 13 16:11:32 UTC 2015


commit 963dbbe6a73982b2c61e22d13f934fa5e4965dfe
Author: gil <puntogil at libero.it>
Date:   Fri Mar 13 17:11:26 2015 +0100

    remove bundled JCP JSR-166

 concurrentlinkedhashmap-lru.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/concurrentlinkedhashmap-lru.spec b/concurrentlinkedhashmap-lru.spec
index 7eec57d..1de94e7 100644
--- a/concurrentlinkedhashmap-lru.spec
+++ b/concurrentlinkedhashmap-lru.spec
@@ -62,11 +62,16 @@ find . -name "*.jar" -type f -print -delete
 
 # Fix http://jira.codehaus.org/browse/MCOMPILER-130
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:compilerArgument"
-#%% pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" "
-#<compilerArgument>-Werror</compilerArgument>"
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" "
+<compilerArgument>-Werror</compilerArgument>"
 %pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" "
 <compilerArgument>-Xlint:all</compilerArgument>"
 
+# remove bundled Doug Lea JCP JSR-166
+rm -r src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentHashMapV8.java
+sed -i "s|ConcurrentHashMapV8|java.util.concurrent.ConcurrentHashMap|" \
+ src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
+
 # Fix mojo-signatures aId
 #sed -i "s|jdk.version}-sun</artifactId>|jdk.version}</artifactId>|" pom.xml
 # Disabled currently is broken


More information about the scm-commits mailing list