updated versions

changed the order of the Lombok-Annotations due to projectlombok/lombok#1703
coolstuffsoftware · Jul 3, 2018 · 6f12a85 · 6f12a85
1 parent 3d56b78
commit 6f12a85
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,13 +59,13 @@
  <maven.compiler.target>${java.version}</maven.compiler.target>
 
  <!-- Dependency Versions -->
- <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
+ <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
  <commons-lang3.version>3.7</commons-lang3.version>
- <guava.version>24.1-jre</guava.version>
+ <guava.version>25.1-jre</guava.version>
  <commons-io.version>2.6</commons-io.version>
  <commons-collections4.version>4.1</commons-collections4.version>
  <sardine.version>5.8</sardine.version>
- <xmlunit.version>2.5.1</xmlunit.version>
+ <xmlunit.version>2.6.0</xmlunit.version>
  <lombok-plugin.version>1.16.20.0</lombok-plugin.version>
  <velocity.version>1.7</velocity.version>
  <velocity-tools.version>2.0</velocity-tools.version>

diff --git a/src/main/java/software/coolstuff/springframework/owncloud/model/OwncloudUserDetails.java b/src/main/java/software/coolstuff/springframework/owncloud/model/OwncloudUserDetails.java
@@ -39,8 +39,8 @@
  * @see UserDetails
  * @since 1.0.0
  */
-@Data
 @NoArgsConstructor
+@Data
 @EqualsAndHashCode(of = "username")
 @ToString(exclude = "password")
 public class OwncloudUserDetails implements UserDetails {

diff --git a/src/main/java/software/coolstuff/springframework/owncloud/service/impl/rest/Ocs.java b/src/main/java/software/coolstuff/springframework/owncloud/service/impl/rest/Ocs.java
@@ -33,9 +33,9 @@
 @lombok.Data
 public abstract class Ocs {
 
- @lombok.Data
  @NoArgsConstructor
  @AllArgsConstructor(access = AccessLevel.PRIVATE)
+ @lombok.Data
  @Builder
  public static class Meta {
  private String status;
@@ -45,10 +45,10 @@ public static class Meta {
 
  private Meta meta;
 
+ @NoArgsConstructor
  @lombok.Data
  @EqualsAndHashCode(callSuper = true)
  @ToString(callSuper = true)
- @NoArgsConstructor
  @XmlRootElement(name = "ocs")
  public static class Void extends Ocs {
  private String data;
@@ -59,20 +59,20 @@ private Void(Meta meta) {
  }
  }
 
+ @NoArgsConstructor
  @lombok.Data
  @EqualsAndHashCode(callSuper = true)
  @ToString(callSuper = true)
- @NoArgsConstructor
  @XmlRootElement(name = "ocs")
  public static class Users extends Ocs {
 
- @lombok.Data
  @NoArgsConstructor
+ @lombok.Data
  public static class Data {
 
- @lombok.Data
  @NoArgsConstructor
  @AllArgsConstructor(access = AccessLevel.PACKAGE)
+ @lombok.Data
  public static class Element {
  private String element;
  }
@@ -98,22 +98,22 @@ private Users(Meta meta, @Singular("user") List<String> users) {
  }
  }
 
+ @NoArgsConstructor
  @lombok.Data
  @EqualsAndHashCode(callSuper = true)
  @ToString(callSuper = true)
- @NoArgsConstructor
  @XmlRootElement(name = "ocs")
  public static class User extends Ocs {
 
- @lombok.Data
  @NoArgsConstructor
  @AllArgsConstructor(access = AccessLevel.PRIVATE)
+ @lombok.Data
  @Builder
  public static class Data {
 
- @lombok.Data
  @NoArgsConstructor
  @AllArgsConstructor(access = AccessLevel.PRIVATE)
+ @lombok.Data
  @Builder
  public static class Quota {
  private Long free;
@@ -138,20 +138,20 @@ private User(Meta meta, Data data) {
  }
  }
 
+ @NoArgsConstructor
  @lombok.Data
  @EqualsAndHashCode(callSuper = true)
  @ToString(callSuper = true)
- @NoArgsConstructor
  @XmlRootElement(name = "ocs")
  public static class Groups extends Ocs {
 
- @lombok.Data
  @NoArgsConstructor
+ @lombok.Data
  public static class Data {
 
- @lombok.Data
  @NoArgsConstructor
  @AllArgsConstructor(access = AccessLevel.PACKAGE)
+ @lombok.Data
  @Builder
  public static class Group {
  private String group;