removed unused imports, removed duplicated dependency, removed scope from...

removed unused imports, removed duplicated dependency, removed scope from parent pom, updated deprecated use of Asserts

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/CompleteConverterTest.java

@@ -38,7 +38,6 @@ public class CompleteConverterTest extends AbstractConverterTest {
     assertNotNull(flowElement);
     assertTrue(flowElement instanceof UserTask);
     assertEquals("userTask1", flowElement.getId());
-    UserTask userTask = (UserTask) flowElement;
     
     flowElement = model.getMainProcess().getFlowElement("catchsignal");
     assertNotNull(flowElement);

modules/activiti-cdi/pom.xml

@@ -60,7 +60,6 @@
         <dependency>
           <groupId>org.jboss.arquillian.container</groupId>
           <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-          <version>1.0.0.CR3</version>
           <scope>test</scope>
         </dependency>
         <dependency>
@@ -120,7 +119,6 @@
     <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>
       <artifactId>arquillian-junit-container</artifactId>
-      <version>1.0.0.CR7</version>
       <scope>test</scope>
     </dependency>
     <dependency>

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/JobQueryTest.java

@@ -392,9 +392,9 @@ public class JobQueryTest extends PluggableActivitiTestCase {
     verifyQueryResults(query, 1);
     
     Job failedJob = query.singleResult();
-    Assert.assertNotNull(failedJob);
+    assertNotNull(failedJob);
     assertEquals(processInstance.getId(), failedJob.getProcessInstanceId());
-    Assert.assertNotNull(failedJob.getExceptionMessage());
+    assertNotNull(failedJob.getExceptionMessage());
     assertTextPresent(EXCEPTION_MESSAGE, failedJob.getExceptionMessage());
   }
 

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/RepositoryServiceTest.java

@@ -29,8 +29,6 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.impl.RepositoryServiceImpl;
-import org.activiti.engine.impl.cmd.DeleteDeploymentCmd;
-import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.impl.util.ClockUtil;
 import org.activiti.engine.repository.Model;

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/BoundaryErrorEventTest.java

@@ -22,7 +22,6 @@ import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.impl.history.HistoryLevel;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.impl.util.CollectionUtil;
-import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.test.Deployment;
 

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerEventTest.java

@@ -115,7 +115,7 @@ public class BoundaryTimerEventTest extends PluggableActivitiTestCase {
   
   @Deployment
   public void testRepeatingTimerWithCancelActivity() {
-    ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("repeatingTimerAndCallActivity");
+    runtimeService.startProcessInstanceByKey("repeatingTimerAndCallActivity");
     assertEquals(1, managementService.createJobQuery().count());
     assertEquals(1, taskService.createTaskQuery().count());
     

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerNonInterruptingEventTest.java

@@ -228,8 +228,6 @@ public class BoundaryTimerNonInterruptingEventTest extends PluggableActivitiTest
    */
   public void testReceiveTaskWithBoundaryTimer(){
     // Set the clock fixed
-    Date startTime = new Date();
-    
     HashMap<String, Object> variables = new HashMap<String, Object>();
     variables.put("timeCycle", "R/PT1H");
     

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/ParallelGatewayTest.java

@@ -110,7 +110,7 @@ public class ParallelGatewayTest extends PluggableActivitiTestCase {
    */
   @Deployment
   public void testReceyclingExecutionWithCallActivity() {
-    String processInstanceId = runtimeService.startProcessInstanceByKey("parent-process").getId();
+    runtimeService.startProcessInstanceByKey("parent-process");
     
     // After process start we have two tasks, one from the parent and one from the sub process
     TaskQuery query = taskService.createTaskQuery().orderByTaskName().asc(); 

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/java/EventJavaTest.java

@@ -15,8 +15,6 @@ package org.activiti.engine.test.bpmn.java;
 
 import java.io.ByteArrayInputStream;
 
-import javax.xml.stream.XMLInputFactory;
-
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.ActivitiListener;
 import org.activiti.bpmn.model.BpmnModel;
@@ -69,7 +67,6 @@ public class EventJavaTest extends PluggableActivitiTestCase {
     
     byte[] xml = new BpmnXMLConverter().convertToXML(bpmnModel);
     
-    XMLInputFactory xif = XMLInputFactory.newInstance();
     new BpmnXMLConverter().validateModel(new InputStreamSource(new ByteArrayInputStream(xml)));
     
     Deployment deployment = repositoryService.createDeployment().name("test").addString("test.bpmn20.xml", new String(xml)).deploy();

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/multiinstance/MultiInstanceTest.java

@@ -24,13 +24,7 @@ import java.util.Map;
 import org.activiti.engine.history.HistoricActivityInstance;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
-import org.activiti.engine.impl.context.Context;
 import org.activiti.engine.impl.history.HistoryLevel;
-import org.activiti.engine.impl.interceptor.Command;
-import org.activiti.engine.impl.interceptor.CommandContext;
-import org.activiti.engine.impl.interceptor.CommandExecutor;
-import org.activiti.engine.impl.persistence.entity.IdentityLinkEntity;
-import org.activiti.engine.impl.persistence.entity.IdentityLinkEntityManager;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.impl.util.ClockUtil;
 import org.activiti.engine.impl.util.CollectionUtil;

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/parse/BpmnParseTest.java

@@ -16,7 +16,6 @@ package org.activiti.engine.test.bpmn.parse;
 import java.util.List;
 
 import org.activiti.engine.ActivitiException;
-import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.context.Context;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
@@ -24,7 +23,6 @@ import org.activiti.engine.impl.interceptor.CommandExecutor;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
-import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
 import org.activiti.engine.impl.pvm.process.TransitionImpl;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.impl.test.TestHelper;

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/servicetask/RepeatingServiceTaskTest.java

@@ -14,9 +14,6 @@
 package org.activiti.engine.test.bpmn.servicetask;
 
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
-import org.activiti.engine.impl.util.CollectionUtil;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.test.Deployment;
 
 
 /**

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java

@@ -88,7 +88,7 @@ public class ScriptTaskTest extends PluggableActivitiTestCase {
     }
   }
   
-  protected void verifyExceptionInStacktrace(Exception rootExcepton, Class expectedExceptionClass) {
+  protected void verifyExceptionInStacktrace(Exception rootExcepton, Class<?> expectedExceptionClass) {
     Throwable expectedException = rootExcepton;
     boolean found = false;
     while (!found && expectedException != null) {

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/shell/ShellTaskTest.java

@@ -3,7 +3,6 @@ package org.activiti.examples.bpmn.shell;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.test.Deployment;
-import org.junit.Assume;
 import org.junit.Test;
 
 public class ShellTaskTest extends PluggableActivitiTestCase {

modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/CycleBusinessCalendarTest.java

@@ -13,14 +13,13 @@
 
 package org.activiti.standalone.calendar;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import org.activiti.engine.impl.calendar.CycleBusinessCalendar;
-import org.activiti.engine.impl.calendar.DurationBusinessCalendar;
 import org.activiti.engine.impl.test.PvmTestCase;
 import org.activiti.engine.impl.util.ClockUtil;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class CycleBusinessCalendarTest extends PvmTestCase {
 
   public void testSimpleCron() throws Exception {

modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/DurationHelperTest.java

@@ -14,15 +14,16 @@
 
 package org.activiti.standalone.calendar;
 
-import org.activiti.engine.impl.calendar.DurationHelper;
-import org.activiti.engine.impl.util.ClockUtil;
-import org.junit.Test;
+import static groovy.util.GroovyTestCase.assertEquals;
+import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static groovy.util.GroovyTestCase.assertEquals;
-import static junit.framework.Assert.assertNull;
+import org.activiti.engine.impl.calendar.DurationHelper;
+import org.activiti.engine.impl.util.ClockUtil;
+import org.junit.Test;
 
 public class DurationHelperTest {
 

modules/activiti-engine/src/test/java/org/activiti/standalone/history/FullHistoryTest.java

@@ -23,8 +23,6 @@ import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import junit.framework.Assert;
-
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.history.HistoricActivityInstance;
@@ -915,7 +913,7 @@ public class FullHistoryTest extends ResourceActivitiTestCase {
     assertEquals(2, details.size());
     
     // Should have 2 different historic activity instance ID's, with the same activityId
-    Assert.assertNotSame(details.get(0).getActivityInstanceId(), details.get(1).getActivityInstanceId());
+    assertNotSame(details.get(0).getActivityInstanceId(), details.get(1).getActivityInstanceId());
     
     HistoricActivityInstance historicActInst1 = historyService.createHistoricActivityInstanceQuery()
       .activityInstanceId(details.get(0).getActivityInstanceId())

modules/activiti-engine/src/test/java/org/activiti/standalone/idgenerator/UuidGeneratorTest.java

@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.activiti.engine.impl.test.ResourceActivitiTestCase;
 import org.activiti.engine.task.Task;

modules/activiti-engine/src/test/java/org/activiti/standalone/jpa/JPAVariableTest.java

@@ -24,8 +24,6 @@ import java.util.Map;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import junit.framework.Assert;
-
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.ProcessEngine;
@@ -223,27 +221,27 @@ public class JPAVariableTest extends AbstractActivitiTestCase {
     
     // Read entity with @Id on field
     Object fieldAccessResult = runtimeService.getVariable(processInstance.getId(), "simpleEntityFieldAccess");
-    Assert.assertTrue(fieldAccessResult instanceof FieldAccessJPAEntity);
-    Assert.assertEquals(1L, ((FieldAccessJPAEntity)fieldAccessResult).getId().longValue());
-    Assert.assertEquals("value1", ((FieldAccessJPAEntity)fieldAccessResult).getValue());
+    assertTrue(fieldAccessResult instanceof FieldAccessJPAEntity);
+    assertEquals(1L, ((FieldAccessJPAEntity)fieldAccessResult).getId().longValue());
+    assertEquals("value1", ((FieldAccessJPAEntity)fieldAccessResult).getValue());
     
     // Read entity with @Id on property
     Object propertyAccessResult = runtimeService.getVariable(processInstance.getId(), "simpleEntityPropertyAccess");
-    Assert.assertTrue(propertyAccessResult instanceof PropertyAccessJPAEntity);
-    Assert.assertEquals(1L, ((PropertyAccessJPAEntity)propertyAccessResult).getId().longValue());
-    Assert.assertEquals("value2", ((PropertyAccessJPAEntity)propertyAccessResult).getValue());
+    assertTrue(propertyAccessResult instanceof PropertyAccessJPAEntity);
+    assertEquals(1L, ((PropertyAccessJPAEntity)propertyAccessResult).getId().longValue());
+    assertEquals("value2", ((PropertyAccessJPAEntity)propertyAccessResult).getValue());
     
     // Read entity with @Id on field of mapped superclass 
     Object subclassFieldResult = runtimeService.getVariable(processInstance.getId(), "subclassFieldAccess");
-    Assert.assertTrue(subclassFieldResult instanceof SubclassFieldAccessJPAEntity);
-    Assert.assertEquals(1L, ((SubclassFieldAccessJPAEntity)subclassFieldResult).getId().longValue());
-    Assert.assertEquals("value3", ((SubclassFieldAccessJPAEntity)subclassFieldResult).getValue());
+    assertTrue(subclassFieldResult instanceof SubclassFieldAccessJPAEntity);
+    assertEquals(1L, ((SubclassFieldAccessJPAEntity)subclassFieldResult).getId().longValue());
+    assertEquals("value3", ((SubclassFieldAccessJPAEntity)subclassFieldResult).getValue());
     
     // Read entity with @Id on property of mapped superclass 
     Object subclassPropertyResult = runtimeService.getVariable(processInstance.getId(), "subclassPropertyAccess");
-    Assert.assertTrue(subclassPropertyResult instanceof SubclassPropertyAccessJPAEntity);
-    Assert.assertEquals(1L, ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getId().longValue());
-    Assert.assertEquals("value4", ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getValue());
+    assertTrue(subclassPropertyResult instanceof SubclassPropertyAccessJPAEntity);
+    assertEquals(1L, ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getId().longValue());
+    assertEquals("value4", ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getValue());
     
     // -----------------------------------------------------------------------------
     // Test updating JPA-entity to null-value and back again
@@ -258,8 +256,8 @@ public class JPAVariableTest extends AbstractActivitiTestCase {
     runtimeService.setVariable(processInstance.getId(), "simpleEntityFieldAccess", simpleEntityFieldAccess);
     currentValue = runtimeService.getVariable(processInstance.getId(), "simpleEntityFieldAccess");
     assertNotNull(currentValue);
-    Assert.assertTrue(currentValue instanceof FieldAccessJPAEntity);
-    Assert.assertEquals(1L, ((FieldAccessJPAEntity)currentValue).getId().longValue());
+    assertTrue(currentValue instanceof FieldAccessJPAEntity);
+    assertEquals(1L, ((FieldAccessJPAEntity)currentValue).getId().longValue());
     
     
     // -----------------------------------------------------------------------------

modules/activiti-explorer/pom.xml

@@ -73,6 +73,7 @@
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <!-- Database -->

modules/activiti-osgi/src/main/java/org/activiti/osgi/BarDeploymentListener.java

@@ -16,6 +16,7 @@ import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
 import static org.osgi.framework.Constants.BUNDLE_VERSION;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
@@ -42,11 +43,12 @@ public class BarDeploymentListener implements ArtifactUrlTransformer {
     }
 
     public boolean canHandle(File artifact) {
-        try {
+        JarFile jar = null;
+    	try {
             if (!artifact.getName().endsWith(".bar")) {
                 return false;
             }
-            JarFile jar = new JarFile(artifact);
+            jar = new JarFile(artifact);
             // Only handle non OSGi bundles
             Manifest m = jar.getManifest();
             if (m!= null && m.getMainAttributes().getValue(
@@ -58,6 +60,14 @@ public class BarDeploymentListener implements ArtifactUrlTransformer {
             return true;
         } catch (Exception e) {
             return false;
+        } finally {
+        	if(jar != null) {
+        		try {
+					jar.close();
+				} catch (IOException e) {
+					LOGGER.error("Unable to close jar", e);
+				}
+        	}
         }
     }
 

modules/activiti-webapp-angular/pom.xml

@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.12.1</version>
+		<version>5.13-SNAPSHOT</version>
 	</parent>
 
 	<build>

pom.xml

@@ -115,7 +115,6 @@
         <groupId>com.oracle.jdbc</groupId>
         <artifactId>ojdbc5</artifactId>
         <version>11.2.0.1.0</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
@@ -141,7 +140,6 @@
         <groupId>javax.persistence</groupId>
         <artifactId>persistence-api</artifactId>
         <version>1.0</version>
-        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>javax.xml.bind</groupId>
@@ -157,19 +155,11 @@
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
         <version>5.1.21</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>1.2.4</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.ibm.db2.jcc</groupId>
         <artifactId>db2jcc4</artifactId>
         <version>10.1</version>
-        <scope>test</scope>
       </dependency> 
       <dependency>
         <groupId>org.activiti</groupId>
@@ -283,7 +273,6 @@
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
         <version>1.2.2</version>
-        <scope>test</scope>
         <exclusions>
           <exclusion>
             <artifactId>commons-logging</artifactId>
@@ -330,19 +319,16 @@
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
         <version>1.8.2</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>4.2.0</version>
-        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
         <version>4.2.0</version>
-        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -425,7 +411,6 @@
         <groupId>org.subethamail</groupId>
         <artifactId>subethasmtp-wiser</artifactId>
         <version>1.2</version>
-        <scope>test</scope>
         <exclusions>
           <exclusion>
             <artifactId>commons-logging</artifactId>
@@ -437,7 +422,6 @@
         <groupId>postgresql</groupId>
         <artifactId>postgresql</artifactId>
         <version>9.0-802.jdbc4</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>wsdl4j</groupId>
@@ -515,7 +499,6 @@
         <groupId>com.google.gwt</groupId>
         <artifactId>gwt-user</artifactId>
         <version>2.3.0</version>
-        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>com.google.gwt</groupId>
@@ -526,7 +509,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring</artifactId>
-        <version>2.10.0</version>
+        <version>2.11.0</version>
       </dependency>
       <!-- Mule integration -->
       <dependency>
@@ -543,7 +526,7 @@
       <dependency>
         <groupId>net.sourceforge.jtds</groupId>
         <artifactId>jtds</artifactId>
-        <version>1.2.5</version>
+        <version>1.3.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>