Skip to content

Commit

Permalink
Merge branch 'release/6.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
markdaugherty committed Dec 12, 2018
2 parents c17f625 + 61037de commit 434fa94
Show file tree
Hide file tree
Showing 379 changed files with 16,684 additions and 14,334 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017 ICF Olson
Copyright 2018 ICF Olson

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cq-component-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.citytechinc.cq.cq-component-plugin</groupId>
<artifactId>cq-component-plugin</artifactId>
<version>5.3.0</version>
<version>6.0.0</version>
</parent>

<artifactId>cq-component-annotations</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
@Retention(RetentionPolicy.CLASS)
@Target({ ElementType.FIELD, ElementType.METHOD })
public @interface AspectRatio {
/**
* The text to display for the aspect ratio
*
* @return String
*/
String text();

/**
* The width part of the aspect ratio
*
* @return int
*/
int width();
/**
* The text to display for the aspect ratio
*
* @return String
*/
String text();

/**
* The height part of the aspect ratio
*
* @return int
*/
int height();
/**
* The width part of the aspect ratio
*
* @return int
*/
int width();

/**
* The height part of the aspect ratio
*
* @return int
*/
int height();
}
Loading

0 comments on commit 434fa94

Please sign in to comment.