[sling-org-apache-sling-provisioning-model] 08/19: SLING-4768 : Sort entries alphabetical in written model

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git

commit fba2533c89160c0c86c719d7670b88e980f7844d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jun 1 17:50:56 2015 +0000

    SLING-4768 : Sort entries alphabetical in written model
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1682962 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/provisioning/model/Artifact.java     | 6 +++---
 src/main/java/org/apache/sling/provisioning/model/ItemList.java     | 2 +-
 src/main/java/org/apache/sling/provisioning/model/package-info.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/provisioning/model/Artifact.java b/src/main/java/org/apache/sling/provisioning/model/Artifact.java
index 4478b8f..9649671 100644
--- a/src/main/java/org/apache/sling/provisioning/model/Artifact.java
+++ b/src/main/java/org/apache/sling/provisioning/model/Artifact.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * In addition, the classifier and type can be specified as well. If no type is specified, "jar" is assumed.
  * An artifact can have any metadata.
  */
-public class Artifact extends Commentable implements Comparable<Artifact> {
+public class Artifact extends Commentable implements Comparable {
 
     /** The required group id. */
     private final String groupId;
@@ -144,10 +144,10 @@ public class Artifact extends Commentable implements Comparable<Artifact> {
     }
 
     @Override
-    public int compareTo(final Artifact o) {
+    public int compareTo(final Object o) {
         if(o == null) return 1;
         if(!(o instanceof Artifact)) return 1;
-        return toMvnUrl().compareTo(o.toMvnUrl());
+        return toMvnUrl().compareTo(((Artifact)o).toMvnUrl());
     }
 
     /**
diff --git a/src/main/java/org/apache/sling/provisioning/model/ItemList.java b/src/main/java/org/apache/sling/provisioning/model/ItemList.java
index bc7a559..c021b4b 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ItemList.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ItemList.java
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * Helper class to hold a list of items.
  */
-public class ItemList<T extends Comparable<T>>
+public class ItemList<T extends Comparable>
     extends Commentable
     implements Iterable<T> {
 
diff --git a/src/main/java/org/apache/sling/provisioning/model/package-info.java b/src/main/java/org/apache/sling/provisioning/model/package-info.java
index 7e587ef..552f509 100644
--- a/src/main/java/org/apache/sling/provisioning/model/package-info.java
+++ b/src/main/java/org/apache/sling/provisioning/model/package-info.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-@Version("1.1.0")
+@Version("1.2.0")
 package org.apache.sling.provisioning.model;
 
 import aQute.bnd.annotation.Version;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.