Move Include to package-info

yahoo · Feb 20, 2021 · c4b29bf · c4b29bf
1 parent 317bd43
commit c4b29bf
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 15 deletions.
diff --git a/elide-core/src/test/java/example/packageshareable/ContainerWithPackageShare.java b/elide-core/src/test/java/example/packageshareable/ContainerWithPackageShare.java
@@ -5,8 +5,6 @@
  */
 package example.packageshareable;
 
-import com.yahoo.elide.annotation.Include;
-
 import java.util.Collection;
 
 import javax.persistence.Entity;
@@ -20,7 +18,6 @@
  * Container for ShareableWithPackageShare and UnshareableWithEntityUnshare.
  */
 @Entity
-@Include(rootLevel = true)
 public class ContainerWithPackageShare {
     private long id;
     private Collection<UnshareableWithEntityUnshare> unshareableWithEntityUnshares;

diff --git a/elide-core/src/test/java/example/packageshareable/ShareableWithPackageShare.java b/elide-core/src/test/java/example/packageshareable/ShareableWithPackageShare.java
@@ -5,8 +5,6 @@
  */
 package example.packageshareable;
 
-import com.yahoo.elide.annotation.Include;
-
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -18,7 +16,6 @@
  * Package level shareable bean.
  */
 @Entity
-@Include(rootLevel = true)
 public class ShareableWithPackageShare {
     private long id;
     private ContainerWithPackageShare container;

diff --git a/elide-core/src/test/java/example/packageshareable/UnshareableWithEntityUnshare.java b/elide-core/src/test/java/example/packageshareable/UnshareableWithEntityUnshare.java
@@ -5,7 +5,6 @@
  */
 package example.packageshareable;
 
-import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.SharePermission;
 
 import javax.persistence.Entity;
@@ -20,7 +19,6 @@
  */
 @Entity
 @SharePermission(sharable = false)
-@Include(rootLevel = true)
 public class UnshareableWithEntityUnshare {
     private long id;
     private ContainerWithPackageShare container;

diff --git a/elide-core/src/test/java/example/packageshareable/package-info.java b/elide-core/src/test/java/example/packageshareable/package-info.java
@@ -4,6 +4,8 @@
  * See LICENSE file in project root for terms.
  */
 @SharePermission
+@Include(rootLevel = true)
 package example.packageshareable;
 
+import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.SharePermission;
diff --git a/elide-example-models/src/main/java/com/yahoo/elide/models/generics/Employee.java b/elide-example-models/src/main/java/com/yahoo/elide/models/generics/Employee.java
@@ -6,14 +6,11 @@
 
 package com.yahoo.elide.models.generics;
 
-import com.yahoo.elide.annotation.Include;
-
 import javax.persistence.Entity;
 
 /**
  * Helper class to test parameterized subclass/superclass hierarchies.
  */
-@Include(rootLevel = true)
 @Entity
 public class Employee extends Peon<Manager> {
 }
diff --git a/elide-example-models/src/main/java/com/yahoo/elide/models/generics/Manager.java b/elide-example-models/src/main/java/com/yahoo/elide/models/generics/Manager.java
@@ -6,14 +6,11 @@
 
 package com.yahoo.elide.models.generics;
 
-import com.yahoo.elide.annotation.Include;
-
 import javax.persistence.Entity;
 
 /**
  * Tests a parameterized superclass.
  */
-@Include(rootLevel = true)
 @Entity
 public class Manager extends Overlord<Employee> {
 }
diff --git a/elide-example-models/src/main/java/com/yahoo/elide/models/generics/package-info.java b/elide-example-models/src/main/java/com/yahoo/elide/models/generics/package-info.java
@@ -4,7 +4,9 @@
  * See LICENSE file in project root for terms.
  */
 
+@Include(rootLevel = true)
 @SharePermission
 package com.yahoo.elide.models.generics;
 
+import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.SharePermission;
diff --git a/pom.xml b/pom.xml
@@ -501,7 +501,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>5.3.2</version>
+                <version>6.1.1</version>
                 <configuration>
                     <failBuildOnCVSS>7</failBuildOnCVSS>
                     <skipSystemScope>true</skipSystemScope>