Address review comments

opencast-backend/annotation-impl/src/test/java/org/opencast/annotation/endpoint/TestRestService.java

@@ -26,8 +26,10 @@
 import org.opencastproject.security.api.AuthorizationService;
 import org.opencastproject.security.api.DefaultOrganization;
 import org.opencastproject.security.api.SecurityService;
+import org.opencastproject.security.api.UnauthorizedException;
 import org.opencastproject.security.api.User;
 import org.opencastproject.security.util.SecurityUtil;
+import org.opencastproject.util.NotFoundException;
 
 import org.easymock.EasyMock;
 import org.junit.Ignore;
@@ -44,7 +46,7 @@ public class TestRestService extends AbstractExtendedAnnotationsRestService {
   // Haven't found out who's responsible forf this but that's the way it is.
   public static final ExtendedAnnotationServiceJpaImpl extendedAnnotationService =
           new ExtendedAnnotationServiceJpaImpl();
-  static  {
+  static {
     extendedAnnotationService.setSearchService(getSearchService());
     extendedAnnotationService.setSecurityService(getSecurityService());
     extendedAnnotationService.setAuthorizationService(getAuthorizationService());
@@ -90,7 +92,7 @@ private static SearchService getSearchService() {
     SearchService searchService = EasyMock.createNiceMock(SearchService.class);
     try {
       EasyMock.expect(searchService.get(EasyMock.anyObject(String.class))).andReturn(mediaPackage).anyTimes();
-    } catch (Exception e) {
+    } catch (UnauthorizedException | NotFoundException e) {
       // Do nothing. We just have to pretend to handle checked exceptions somehow to appease the compiler.
     }
     EasyMock.replay(searchService);

pom.xml

@@ -67,7 +67,7 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <opencast.build.version>16-SNAPSHOT</opencast.build.version>
+    <opencast.build.version>16.0</opencast.build.version>
     <opencast.deploy.version>;version=16.0</opencast.deploy.version>
   </properties>