[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java opensaml-core/s...

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Mar 24 15:15:31 2012
New Revision: 2959

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2959&view=rev
Log:
Bump versions of some deps and remove JCIP concurrency annotations (we have the JSR305 ones now)

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IDIndex.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexedXMLObjectChildrenList.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexingObjectStore.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/SOAPClient.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/http/HttpClientBuilder.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/http/HttpSOAPClient.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/http/HttpSOAPRequestParameters.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/http/TLSProtocolSocketFactory.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java?rev=2959&r1=2958&r2=2959&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java Sat Mar 24 15:15:31 2012
@@ -22,17 +22,17 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.concurrent.NotThreadSafe;
 import javax.xml.namespace.QName;
 
-import net.jcip.annotations.NotThreadSafe;
 import net.shibboleth.utilities.java.support.collection.LazyMap;
 import net.shibboleth.utilities.java.support.collection.LazySet;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
 
-import org.opensaml.xml.XMLObjectProviderRegistrySupport;
 import org.opensaml.xml.NamespaceManager;
 import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.XMLObjectProviderRegistrySupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IDIndex.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IDIndex.java?rev=2959&r1=2958&r2=2959&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IDIndex.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IDIndex.java Sat Mar 24 15:15:31 2012
@@ -21,7 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import net.jcip.annotations.NotThreadSafe;
+import javax.annotation.concurrent.NotThreadSafe;
+
 import net.shibboleth.utilities.java.support.collection.LazyMap;
 
 import org.opensaml.xml.XMLObject;

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexedXMLObjectChildrenList.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexedXMLObjectChildrenList.java?rev=2959&r1=2958&r2=2959&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexedXMLObjectChildrenList.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexedXMLObjectChildrenList.java Sat Mar 24 15:15:31 2012
@@ -22,9 +22,9 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.concurrent.NotThreadSafe;
 import javax.xml.namespace.QName;
 
-import net.jcip.annotations.NotThreadSafe;
 import net.shibboleth.utilities.java.support.collection.LazyList;
 import net.shibboleth.utilities.java.support.collection.LazyMap;
 

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexingObjectStore.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexingObjectStore.java?rev=2959&r1=2958&r2=2959&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexingObjectStore.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/util/IndexingObjectStore.java Sat Mar 24 15:15:31 2012
@@ -22,7 +22,8 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import net.jcip.annotations.ThreadSafe;
+import javax.annotation.concurrent.ThreadSafe;
+
 import net.shibboleth.utilities.java.support.collection.LazyMap;
 
 /**

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/SOAPClient.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/client/SOAPClient.java?rev=2959&r1=2958&r2=2959&view=diff

[... 93 lines stripped ...]