Author: lindner
Date: Fri Oct 8 17:57:18 2010
New Revision: 1005930
URL: http://svn.apache.org/viewvc?rev=1005930&view=rev
Log:
Remove jsr305 from build
Added:
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/Nullable.java
Modified:
shindig/branches/2.0.x/java/common/pom.xml
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
shindig/branches/2.0.x/java/gadgets/pom.xml
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/branches/2.0.x/pom.xml
Modified: shindig/branches/2.0.x/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/pom.xml?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/pom.xml (original)
+++ shindig/branches/2.0.x/java/common/pom.xml Fri Oct 8 17:57:18 2010
@@ -150,10 +150,6 @@
<artifactId>oauth</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
- <dependency>
<artifactId>commons-betwixt</artifactId>
<groupId>commons-betwixt</groupId>
</dependency>
Added:
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/Nullable.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/Nullable.java?rev=1005930&view=auto
==============================================================================
---
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/Nullable.java
(added)
+++
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/Nullable.java
Fri Oct 8 17:57:18 2010
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.shindig.common;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+/**
+ * Temporary package for use until we the jsr people release to maven central.
+ * http://code.google.com/p/jsr-305/issues/detail?id=13
+ *
+ * This allows us to remove the jsr305 jar from findbugs which is LGPL and
+ * moved from 'provided' to 'runtime' scope due to use by Guice.
+ */
+
+...@retention(RetentionPolicy.RUNTIME)
+public @interface Nullable {
+}
Modified:
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
(original)
+++
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
Fri Oct 8 17:57:18 2010
@@ -47,7 +47,9 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+// Temporary replacement of javax.annotation.Nullable
+import org.apache.shindig.common.Nullable;
+
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ValueExpression;
Modified: shindig/branches/2.0.x/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/pom.xml?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/pom.xml (original)
+++ shindig/branches/2.0.x/java/gadgets/pom.xml Fri Oct 8 17:57:18 2010
@@ -163,10 +163,6 @@
<artifactId>oauth-provider</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
Fri Oct 8 17:57:18 2010
@@ -86,7 +86,8 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
-import javax.annotation.Nullable;
+// Temporary replacement of javax.annotation.Nullable
+import org.apache.shindig.common.Nullable;
import javax.servlet.http.HttpServletResponse;
/**
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
Fri Oct 8 17:57:18 2010
@@ -20,7 +20,10 @@ package org.apache.shindig.gadgets.http;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
-import javax.annotation.Nullable;
+
+// Temporary replacement of javax.annotation.Nullable
+import org.apache.shindig.common.Nullable;
+
import com.google.inject.name.Named;
import org.apache.shindig.common.util.Utf8UrlCoder;
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
Fri Oct 8 17:57:18 2010
@@ -23,7 +23,8 @@ import org.apache.shindig.gadgets.http.H
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.apache.shindig.gadgets.uri.UriCommon;
-import javax.annotation.Nullable;
+// Temporary replacement of javax.annotation.Nullable
+import org.apache.shindig.common.Nullable;
/**
* Various utility functions used by rewriters
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
Fri Oct 8 17:57:18 2010
@@ -29,7 +29,9 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
-import javax.annotation.Nullable;
+// Temporary replacement of javax.annotation.Nullable
+import org.apache.shindig.common.Nullable;
+
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
Fri Oct 8 17:57:18 2010
@@ -32,7 +32,8 @@ import org.apache.shindig.gadgets.Gadget
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
-import javax.annotation.Nullable;
+// Temporary replacement of javax.annotation.Nullable
+import org.apache.shindig.common.Nullable;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
Modified: shindig/branches/2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/pom.xml?rev=1005930&r1=1005929&r2=1005930&view=diff
==============================================================================
--- shindig/branches/2.0.x/pom.xml (original)
+++ shindig/branches/2.0.x/pom.xml Fri Oct 8 17:57:18 2010
@@ -1429,14 +1429,6 @@
<type>test-jar</type>
</dependency>
- <!-- external dependencies -->
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>1.3.9</version>
- <!-- cannot be provided scope, guice uses @Nullable at runtime -->
- </dependency>
-
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
