Skip to content

Commit 4f46d57

Browse files
gbondarchuk9gbondarchuk9
committed
1. Switch to Java 11
2. Upgrade dependencies 3. Fix dependency issues
1 parent cb9aa1f commit 4f46d57

File tree

9 files changed

+52
-73
lines changed

9 files changed

+52
-73
lines changed

‎easy-abac-demo/pom.xml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>2.3.0.RELEASE</version>
10+
<version>2.4.1</version>
1111
<relativePath/>
1212
</parent>
1313

1414
<groupId>com.exadel.security</groupId>
1515
<artifactId>easy-abac-demo</artifactId>
16-
<version>1.2</version>
16+
<version>1.3</version>
1717

1818
<name>easy-abac-demo</name>
1919
<description>easy-abac implementation example</description>
2020

2121
<properties>
22-
<java.version>1.8</java.version>
22+
<java.version>11</java.version>
2323
</properties>
2424

2525
<dependencies>
@@ -51,20 +51,4 @@
5151
</dependency>
5252
</dependencies>
5353

54-
<!--<build>-->
55-
<!--<plugins>-->
56-
<!--<plugin>-->
57-
<!--<groupId>org.springframework.boot</groupId>-->
58-
<!--<artifactId>spring-boot-maven-plugin</artifactId>-->
59-
<!--</plugin>-->
60-
<!--<plugin>-->
61-
<!--<groupId>org.sonatype.plugins</groupId>-->
62-
<!--<artifactId>nexus-staging-maven-plugin</artifactId>-->
63-
<!--<configuration>-->
64-
<!--<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>-->
65-
<!--</configuration>-->
66-
<!--</plugin>-->
67-
<!--</plugins>-->
68-
<!--</build>-->
69-
7054
</project>

‎easy-abac/abac-annotation-processing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<relativePath>../..</relativePath>
1010
<groupId>com.exadel.security</groupId>
1111
<artifactId>abac-root</artifactId>
12-
<version>1.2</version>
12+
<version>1.3</version>
1313
</parent>
1414

1515
<artifactId>abac-annotation-processing</artifactId>

‎easy-abac/abac-annotation-processing/src/main/java/com/exadel/easyabac/processor/AccessAnnotationProcessor.java‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,29 @@
1616

1717
package com.exadel.easyabac.processor;
1818

19-
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.getAnnotationParameterMirror;
20-
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.isAnnotationPresent;
21-
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.isAnnotationPresentOnAnyMethodParameter;
22-
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.isAnnotationPresentOnMethodOrEnclosingClass;
23-
import static com.google.common.collect.ImmutableSet.of;
24-
25-
import com.google.auto.service.AutoService;
26-
2719
import com.exadel.easyabac.model.annotation.Access;
2820
import com.exadel.easyabac.model.annotation.PublicResource;
2921
import com.exadel.easyabac.processor.base.AbstractAnnotationProcessor;
3022
import com.exadel.easyabac.processor.utils.AnnotationProcessingUtils;
3123
import com.exadel.easyabac.processor.utils.ElementUtils;
32-
24+
import com.google.auto.service.AutoService;
3325
import org.apache.commons.lang3.tuple.Pair;
3426

35-
import java.lang.annotation.Annotation;
36-
import java.util.Collection;
37-
import java.util.List;
38-
import java.util.Set;
39-
import java.util.stream.Collectors;
40-
4127
import javax.annotation.processing.Processor;
4228
import javax.annotation.processing.RoundEnvironment;
4329
import javax.lang.model.element.Element;
4430
import javax.lang.model.element.ExecutableElement;
4531
import javax.lang.model.element.Name;
4632
import javax.lang.model.element.TypeElement;
4733
import javax.lang.model.type.TypeMirror;
34+
import java.lang.annotation.Annotation;
35+
import java.util.Collection;
36+
import java.util.List;
37+
import java.util.Set;
38+
import java.util.stream.Collectors;
39+
40+
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.*;
41+
import static com.google.common.collect.ImmutableSet.of;
4842

4943
/**
5044
* Annotation processor aimed to check elements annotated with {@code @Access} in conjunction with identifier-annotations.
@@ -56,6 +50,7 @@
5650
* @since 1.0-RC1
5751
*/
5852
@AutoService(Processor.class)
53+
@SuppressWarnings("unused")
5954
public class AccessAnnotationProcessor extends AbstractAnnotationProcessor {
6055

6156
private static final String ID_ANNOTATION_MISSING_ERROR = "Methods annotated with @%s must have any parameter annotated with @%s.";

‎easy-abac/abac-annotation-processing/src/main/java/com/exadel/easyabac/processor/AnnotationValidationProcessor.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,24 @@
1616

1717
package com.exadel.easyabac.processor;
1818

19-
import static com.google.common.collect.ImmutableSet.of;
20-
21-
import com.google.auto.service.AutoService;
22-
2319
import com.exadel.easyabac.model.annotation.Access;
2420
import com.exadel.easyabac.processor.base.AbstractAnnotationProcessor;
2521
import com.exadel.easyabac.processor.utils.ElementUtils;
26-
27-
import java.lang.annotation.Annotation;
28-
import java.util.List;
29-
import java.util.Optional;
30-
import java.util.Set;
31-
import java.util.stream.Collectors;
22+
import com.google.auto.service.AutoService;
3223

3324
import javax.annotation.processing.Processor;
3425
import javax.annotation.processing.RoundEnvironment;
3526
import javax.lang.model.element.Element;
3627
import javax.lang.model.element.ExecutableElement;
3728
import javax.lang.model.element.TypeElement;
3829
import javax.lang.model.type.TypeKind;
30+
import java.lang.annotation.Annotation;
31+
import java.util.List;
32+
import java.util.Optional;
33+
import java.util.Set;
34+
import java.util.stream.Collectors;
35+
36+
import static com.google.common.collect.ImmutableSet.of;
3937

4038
/**
4139
* Annotation processor aimed to validate that annotations marked as {@code Access} have right structure.
@@ -44,6 +42,7 @@
4442
* @since 1.0-RC1
4543
*/
4644
@AutoService(Processor.class)
45+
@SuppressWarnings("unused")
4746
public class AnnotationValidationProcessor extends AbstractAnnotationProcessor {
4847

4948
private static final String METHOD_MISSING_ERROR = "%s() method is missing for @%s";

‎easy-abac/abac-annotation-processing/src/main/java/com/exadel/easyabac/processor/ProtectAccessProcessor.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,27 @@
1717
package com.exadel.easyabac.processor;
1818

1919

20-
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.*;
21-
import static com.google.common.collect.ImmutableSet.of;
22-
23-
import com.google.auto.service.AutoService;
24-
2520
import com.exadel.easyabac.model.annotation.Access;
2621
import com.exadel.easyabac.model.annotation.ProtectedResource;
2722
import com.exadel.easyabac.model.annotation.PublicResource;
2823
import com.exadel.easyabac.processor.base.AbstractAnnotationProcessor;
2924
import com.exadel.easyabac.processor.utils.AnnotationProcessingUtils;
3025
import com.exadel.easyabac.processor.utils.ElementUtils;
31-
32-
import java.lang.annotation.Annotation;
33-
import java.util.Collection;
34-
import java.util.Set;
35-
import java.util.stream.Collectors;
26+
import com.google.auto.service.AutoService;
3627

3728
import javax.annotation.processing.Processor;
3829
import javax.annotation.processing.RoundEnvironment;
3930
import javax.lang.model.element.Element;
4031
import javax.lang.model.element.ExecutableElement;
4132
import javax.lang.model.element.TypeElement;
33+
import java.lang.annotation.Annotation;
34+
import java.util.Collection;
35+
import java.util.Set;
36+
import java.util.stream.Collectors;
37+
38+
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.isAnnotationPresent;
39+
import static com.exadel.easyabac.processor.utils.AnnotationProcessingUtils.isAnnotationPresentOnMethodOrEnclosingClass;
40+
import static com.google.common.collect.ImmutableSet.of;
4241

4342

4443
/**
@@ -50,6 +49,7 @@
5049
* @since 1.0-RC1
5150
*/
5251
@AutoService(Processor.class)
52+
@SuppressWarnings("unused")
5353
public class ProtectAccessProcessor extends AbstractAnnotationProcessor {
5454

5555
private static final String ERROR_MESSAGE = "Class annotated with @" + ProtectedResource.class.getName() +

‎easy-abac/abac-aspect/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<relativePath>../..</relativePath>
1010
<groupId>com.exadel.security</groupId>
1111
<artifactId>abac-root</artifactId>
12-
<version>1.2</version>
12+
<version>1.3</version>
1313
</parent>
1414

1515
<artifactId>abac-aspect</artifactId>

‎easy-abac/abac-model/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<relativePath>../..</relativePath>
1010
<groupId>com.exadel.security</groupId>
1111
<artifactId>abac-root</artifactId>
12-
<version>1.2</version>
12+
<version>1.3</version>
1313
</parent>
1414

1515
<artifactId>abac-model</artifactId>

‎easy-abac/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.exadel.security</groupId>
1010
<artifactId>abac-root</artifactId>
11-
<version>1.2</version>
11+
<version>1.3</version>
1212
</parent>
1313

1414
<artifactId>easy-abac</artifactId>
@@ -20,21 +20,21 @@
2020
<dependency>
2121
<groupId>com.exadel.security</groupId>
2222
<artifactId>abac-model</artifactId>
23-
<version>${version}</version>
23+
<version>${project.version}</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>com.exadel.security</groupId>
2929
<artifactId>abac-annotation-processing</artifactId>
30-
<version>${version}</version>
30+
<version>${project.version}</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.exadel.security</groupId>
3636
<artifactId>abac-aspect</artifactId>
37-
<version>${version}</version>
37+
<version>${project.version}</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>

‎pom.xml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66

77
<groupId>com.exadel.security</groupId>
88
<artifactId>abac-root</artifactId>
9-
<version>1.2</version>
9+
<version>1.3</version>
1010

1111
<properties>
1212
<project.vendor>Exadel</project.vendor>
1313
<project.display-name>Activity Based Security Framework</project.display-name>
1414

15-
<java.version>1.8</java.version>
15+
<java.version>11</java.version>
1616
<project.source-encoding>UTF-8</project.source-encoding>
1717

18-
<org.aspectj.version>1.9.2</org.aspectj.version>
19-
<spring.version>5.2.6.RELEASE</spring.version>
18+
<org.aspectj.version>1.9.6</org.aspectj.version>
19+
<spring.version>5.3.2</spring.version>
2020
<logback.version>1.2.3</logback.version>
2121
<slf4j.version>1.7.25</slf4j.version>
22-
<autoservice.version>1.0-rc5</autoservice.version>
23-
<apache.commons-lang.version>3.9</apache.commons-lang.version>
22+
<autoservice.version>1.0-rc7</autoservice.version>
23+
<apache.commons-lang.version>3.11</apache.commons-lang.version>
2424
<apache.commons-collections.version>4.4</apache.commons-collections.version>
25-
<google.guava.version>28.0-jre</google.guava.version>
25+
<google.guava.version>30.1-jre</google.guava.version>
2626
<junit.version>4.12</junit.version>
2727

28-
<compiler-plugin.version>3.6.1</compiler-plugin.version>
29-
<source-plugin.version>3.2.0</source-plugin.version>
30-
<javadoc-plugin.version>3.1.1</javadoc-plugin.version>
31-
<jar-plugin.version>3.1.2</jar-plugin.version>
28+
<compiler-plugin.version>3.8.1</compiler-plugin.version>
29+
<source-plugin.version>3.2.1</source-plugin.version>
30+
<javadoc-plugin.version>3.2.0</javadoc-plugin.version>
31+
<jar-plugin.version>3.2.0</jar-plugin.version>
3232
<gpg-plugin.version>1.6</gpg-plugin.version>
33-
<nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
33+
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
3434
</properties>
3535

3636
<modules>
@@ -157,6 +157,7 @@
157157
</execution>
158158
</executions>
159159
<configuration>
160+
<source>11</source>
160161
<encoding>${project.source-encoding}</encoding>
161162
</configuration>
162163
</plugin>

0 commit comments

Comments
 (0)