Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jun 22, 2016 · d7bf2b0 · d7bf2b0
2 parents 02a7e34 + af7350c
commit d7bf2b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3214,4 +3214,5 @@ LockoutStatusPanel.undoButtonLabel=Undo
 LockoutStatusPanel.unlockButtonLabel=Unlock
 LockoutStatusPanel.changesSaving=(will be applied after Save button click)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskEdit.saveTask=Save task (GUI)
-operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
+operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
+operation.com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstances.stopProcessInstance=Stop process instance
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3166,4 +3166,5 @@ LockoutStatusPanel.undoButtonLabel=Undo
 LockoutStatusPanel.unlockButtonLabel=Unlock
 LockoutStatusPanel.changesSaving=(changes will be applied after Save button click)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskEdit.saveTask=Save task (GUI)
-operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
+operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
+operation.com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstances.stopProcessInstance=Stop process instance
diff --git a/tools/repo-ninja/pom.xml b/tools/repo-ninja/pom.xml
@@ -96,6 +96,11 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+        <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>