svn commit: r1836184 - in /jackrabbit/oak/trunk/oak-pojosr: pom.xml src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java

[re...@apache.org]

Author: reschke
Date: Wed Jul 18 14:48:36 2018
New Revision: 1836184

URL: http://svn.apache.org/viewvc?rev=1836184&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-pojosr

Modified:
    jackrabbit/oak/trunk/oak-pojosr/pom.xml
    jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java

Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1836184&r1=1836183&r2=1836184&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Wed Jul 18 14:48:36 2018
@@ -141,10 +141,10 @@
       <version>1.0.4</version>
     </dependency>
 
-    <!-- Findbugs annotations -->
+    <!-- Nullability annotations -->
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
     </dependency>
 
 

Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java?rev=1836184&r1=1836183&r2=1836184&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java Wed Jul 18 14:48:36 2018
@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -48,6 +46,8 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.security.user.action.AbstractAuthorizableAction;
 import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction;
 import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -159,9 +159,9 @@ public class OakOSGiRepositoryFactoryTes
         @Override
         protected void postProcessRegistry(PojoServiceRegistry registry) {
             registry.registerService(AuthorizableActionProvider.class.getName(), new AuthorizableActionProvider() {
-                @Nonnull
+                @NotNull
                 @Override
-                public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
+                public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) {
                     return Collections.singletonList(new TestAction());
                 }
             }, null);
@@ -184,8 +184,8 @@ public class OakOSGiRepositoryFactoryTes
     private class TestAction extends AbstractAuthorizableAction {
 
         @Override
-        public void onPasswordChange(@Nonnull User user, @Nullable String newPassword,
-                                     @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
+        public void onPasswordChange(@NotNull User user, @Nullable String newPassword,
+                                     @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException {
             OakOSGiRepositoryFactoryTest.this.newPassword = newPassword;
         }
     }