Merge pull request #357 from xenit-eu/DEVEM-514

DEVEM-514 fix publishing and remove JetBrains dependencies

Author: thijslemmens

alfresco-dynamic-extensions-repo/build.gradle

@@ -32,8 +32,7 @@ subprojects {
         ampLib "com.springsource.util:com.springsource.util.osgi:${project.ext.springOsgiUtilVersion}"
         // The core asm library is already included in Alfresco distributions, so we just add asm-commons.
         ampLib("asm:asm-commons:3.1") { transitive = false }
-
-        ampLib "org.jetbrains:annotations:$jetbrains_annotations_version"
+        ampLib "javax.validation:validation-api:$javax_annotations_version"
 
         ampLib "biz.aQute.bnd:biz.aQute.bnd:${project.ext.bndVersion}"
 

alfresco-integration/build.gradle

@@ -16,8 +16,7 @@ dependencies {
     compileOnly("org.alfresco:alfresco-repository") { transitive = false }
 
     compileOnly "org.slf4j:slf4j-api"
-    compileOnly "org.jetbrains:annotations:$jetbrains_annotations_version"
-
+    compileOnly "javax.validation:validation-api:$javax_annotations_version"
     implementation "org.osgi:org.osgi.core:${project.ext.osgiVersion}"
     api "javax.servlet:servlet-api:${project.ext.servletVersion}"
 

alfresco-integration/src/main/java/com/github/dynamicextensionsalfresco/BeanNames.java

@@ -1,12 +1,10 @@
 package com.github.dynamicextensionsalfresco;
 
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Contains constants for bean names used by the bundle Spring application contexts.
- * 
+ *
  * @author Laurens Fridael
- * 
+ *
  */
 public enum BeanNames {
 

alfresco-integration/src/main/java/com/github/dynamicextensionsalfresco/osgi/BundleDependencies.java

@@ -4,11 +4,12 @@
 import com.springsource.util.osgi.manifest.BundleManifestFactory;
 import com.springsource.util.osgi.manifest.ExportedPackage;
 import com.springsource.util.osgi.manifest.ImportedPackage;
+import org.osgi.framework.Bundle;
+
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.jetbrains.annotations.NotNull;
-import org.osgi.framework.Bundle;
 
 /**
  * Sort a list of bundles by their dependency graph. Bundles without or satisfied dependencies come first.

alfresco-integration/src/test/java/com/github/dynamicextensionsalfresco/models/ModelRegistrarTest.java

@@ -2,16 +2,18 @@
 
 import org.alfresco.repo.dictionary.DictionaryDAO;
 import org.alfresco.repo.dictionary.M2Model;
-import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * {@link ModelRegistrar} unit test.

annotations-runtime/build.gradle

@@ -38,9 +38,7 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:2.0.1'
     api 'com.google.collections:google-collections:1.0'
-
-    compileOnly "org.jetbrains:annotations:$jetbrains_annotations_version"
-
+    compileOnly "javax.validation:validation-api:$javax_annotations_version"
     compileOnly "com.fasterxml.jackson.core:jackson-databind"
 
     implementation "javax.annotation:javax.annotation-api:${javaxAnnotationApiVersion}"

annotations-runtime/src/main/java/com/github/dynamicextensionsalfresco/actions/ActionMethodMapping.java

@@ -1,18 +1,19 @@
 package com.github.dynamicextensionsalfresco.actions;
 
 import com.github.dynamicextensionsalfresco.actions.annotations.ActionMethod;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
 import org.alfresco.repo.action.executer.ActionExecuter;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.rule.RuleServiceException;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.util.ReflectionUtils;
 
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+
 /**
  * Represents a mapping from {@link ActionExecuter#execute} to an {@link ActionMethod} -annotated method.
  *

annotations-runtime/src/main/java/com/github/dynamicextensionsalfresco/actions/ParameterMapping.java

@@ -2,7 +2,8 @@
 
 import com.github.dynamicextensionsalfresco.actions.annotations.ActionMethod;
 import org.alfresco.service.cmr.action.ParameterDefinition;
-import org.jetbrains.annotations.NotNull;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * Represents a mapping of an Action parameter to a parameter of an {@link ActionMethod}-annotated method.

annotations-runtime/src/main/java/com/github/dynamicextensionsalfresco/metrics/SpringTimer.java

@@ -2,12 +2,13 @@
 
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.transaction.TransactionListener;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.StopWatch;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * {@link Timer} based on Spring's {@link StopWatch} collects data during a transaction and logs to log4j after commit
  * at TRACE level

annotations-runtime/src/main/java/com/github/dynamicextensionsalfresco/policy/BehaviourProxy.java

@@ -1,19 +1,20 @@
 package com.github.dynamicextensionsalfresco.policy;
 
 import com.github.dynamicextensionsalfresco.metrics.Timer;
+import org.alfresco.repo.policy.Behaviour;
+import org.alfresco.repo.policy.Policy;
+import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import org.alfresco.repo.policy.Behaviour;
-import org.alfresco.repo.policy.Policy;
-import org.alfresco.repo.policy.PolicyComponent;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Proxy that allows a {@link Behaviour} to be garbage-collected.