You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/02/29 08:44:54 UTC

syncope git commit: Various dep upgrades

Repository: syncope
Updated Branches:
  refs/heads/master 9682d57f4 -> a5ff8debe


Various dep upgrades


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a5ff8deb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a5ff8deb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a5ff8deb

Branch: refs/heads/master
Commit: a5ff8debec7e941c85ad745e187f1ab990b96a5b
Parents: 9682d57
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 29 08:44:48 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 29 08:44:48 2016 +0100

----------------------------------------------------------------------
 client/console/pom.xml                          |  4 ----
 .../client/console/bulk/BulkContent.java        |  4 +---
 .../syncope/common/lib/info/package-info.java   | 23 ++++++++++++++++++++
 pom.xml                                         |  6 ++---
 4 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/a5ff8deb/client/console/pom.xml
----------------------------------------------------------------------
diff --git a/client/console/pom.xml b/client/console/pom.xml
index 52bee43..6817358 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -125,10 +125,6 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
-      <artifactId>highlightjs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
       <artifactId>codemirror</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/a5ff8deb/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java b/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
index 9a3e7d8..9d6bbac 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
@@ -18,8 +18,6 @@
  */
 package org.apache.syncope.client.console.bulk;
 
-import static org.apache.syncope.client.console.panels.MultilevelPanel.SECOND_LEVEL_ID;
-
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -69,7 +67,7 @@ public class BulkContent<T extends Serializable, S> extends MultilevelPanel.Seco
             final Collection<ActionLink.ActionType> actions,
             final BaseRestClient bulkActionExecutor,
             final String keyFieldName) {
-        this(SECOND_LEVEL_ID, null, pageRef, items, columns, actions, bulkActionExecutor, keyFieldName);
+        this(MultilevelPanel.SECOND_LEVEL_ID, null, pageRef, items, columns, actions, bulkActionExecutor, keyFieldName);
     }
 
     public BulkContent(

http://git-wip-us.apache.org/repos/asf/syncope/blob/a5ff8deb/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
new file mode 100644
index 0000000..fccc6f4
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+package org.apache.syncope.common.lib.info;
+
+import javax.xml.bind.annotation.XmlSchema;
+import org.apache.syncope.common.lib.SyncopeConstants;

http://git-wip-us.apache.org/repos/asf/syncope/blob/a5ff8deb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c94d32..2a2683c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,7 +331,7 @@ under the License.
 
     <camel.version>2.16.2</camel.version>	
 
-    <jackson.version>2.7.1</jackson.version>
+    <jackson.version>2.7.2</jackson.version>
 
     <spring.version>4.2.5.RELEASE</spring.version>
     <spring-security.version>4.0.4.RELEASE</spring-security.version>
@@ -350,7 +350,7 @@ under the License.
 
     <activiti.version>5.19.0.2</activiti.version>
 
-    <slf4j.version>1.7.16</slf4j.version>
+    <slf4j.version>1.7.18</slf4j.version>
     <log4j.version>2.5</log4j.version>
     <disruptor.version>3.3.4</disruptor.version>
 
@@ -383,7 +383,7 @@ under the License.
     <bootbox.version>4.4.0</bootbox.version>
     <font-awesome.version>4.5.0</font-awesome.version>
     <ionicons.version>2.0.1</ionicons.version>
-    <highlightjs.version>8.7</highlightjs.version>
+    <highlightjs.version>9.2.0</highlightjs.version>
     <codemirror.version>5.11</codemirror.version>
     <jsplumb.version>2.0.5</jsplumb.version>