Permalink
Browse files

cleanup mvn borkage

  • Loading branch information...
2 parents c48e560 + 9540a56 commit 04c933b52403b968ec1f58daa3ae136e3506fd48 @lindner lindner committed Oct 8, 2010
View
@@ -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>
@@ -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 {
+}
@@ -47,7 +47,9 @@
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;
View
@@ -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>
@@ -86,7 +86,8 @@
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;
/**
@@ -20,7 +20,10 @@
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;
@@ -23,7 +23,8 @@
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
@@ -29,7 +29,9 @@
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;
@@ -32,7 +32,8 @@
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;
View
10 pom.xml
@@ -1088,7 +1088,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -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>

0 comments on commit 04c933b

Please sign in to comment.