You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/06/01 19:50:57 UTC
svn commit: r1682962 - in
/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model:
Artifact.java ItemList.java package-info.java
Author: cziegeler
Date: Mon Jun 1 17:50:56 2015
New Revision: 1682962
URL: http://svn.apache.org/r1682962
Log:
SLING-4768 : Sort entries alphabetical in written model
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Artifact.java
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ItemList.java
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Artifact.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Artifact.java?rev=1682962&r1=1682961&r2=1682962&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Artifact.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Artifact.java Mon Jun 1 17:50:56 2015
@@ -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 Commentabl
}
@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());
}
/**
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ItemList.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ItemList.java?rev=1682962&r1=1682961&r2=1682962&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ItemList.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ItemList.java Mon Jun 1 17:50:56 2015
@@ -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> {
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java?rev=1682962&r1=1682961&r2=1682962&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/package-info.java Mon Jun 1 17:50:56 2015
@@ -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;