Skip to content

Commit

Permalink
Switch to Java 17 source level, bumped dependency-plugin
Browse files Browse the repository at this point in the history 
Maven dependency plugin needed to be bumped to 3.3.0 for fixes
for java 17 dependency analysis.

Added scope to several dependencies, since dependency-plugin:analyze-only
now also checks for incorrect classification of compile vs test.
  • Loading branch information
@tonydamage
tonydamage committed May 30, 2023
1 parent 92c8f7c commit dfbfba7
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 4 deletions.
3 changes: 2 additions & 1 deletion gui/admin-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -748,13 +748,14 @@
</resource>
<!-- ICF LOGGING CONFIGURATION -->
<resource>
<targetPath>../midpoint/META-INF/services</targetPath>
<targetPath>META-INF/services</targetPath>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<includes>
<include>**/org.identityconnectors.common.logging</include>
</includes>
</resource>

<resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
Expand Down
1 change: 1 addition & 0 deletions infra/test-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
4 changes: 3 additions & 1 deletion model/model-intest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<dependency>
<groupId>com.evolveum.prism</groupId>
<artifactId>prism-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
Expand Down Expand Up @@ -352,9 +353,10 @@
<artifactId>spring-aop</artifactId>
<scope>test</scope>
</dependency>
<dependency> <!-- not sure why this must be in compile scope -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
Expand Down
20 changes: 18 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<!-- Encoding for both sources and resources -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- JDK level also affects midPoint Studio, which depends on JDK used by minimum supported IDEA version. -->
<project.source.version>11</project.source.version>
<project.source.version>17</project.source.version>
<project.build.locale>en_US</project.build.locale>
<ansi.color>true</ansi.color>
<verbose.jaxb2>false</verbose.jaxb2>
Expand Down Expand Up @@ -1753,7 +1753,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
Expand Down Expand Up @@ -1814,6 +1814,22 @@
<ignoredUsedUndeclaredDependency>org.danekja:jdk-serializable-functional</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.apache.tomcat.embed:tomcat-embed-core</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
<ignoredNonTestScopedDependencies>
<ignoredNonTestScopedDependency>com.evolveum.midpoint.*:*</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.slf4j:slf4j-api</ignoredNonTestScopedDependency>
<!-- Since generated code depends on prism-impl, it needs sometime to be runtime/compile
but report can not detect this uses (and if you change scope, it can not compile target project -->
<ignoredNonTestScopedDependency>com.evolveum.prism:prism-impl</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>com.evolveum.commons:concepts</ignoredNonTestScopedDependency>

<!-- Testing dependencies are not troubling us from. -->
<ignoredUsedUndeclaredDependency>org.testng:testng</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.assertj:assertj-core</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.javasimon:javasimon-core</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>jakarta.annotation:jakarta.annotation-api</ignoredUsedUndeclaredDependency>

</ignoredNonTestScopedDependencies>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 4 additions & 0 deletions repo/repo-sql-impl-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<groupId>com.evolveum.midpoint.repo</groupId>
<artifactId>audit-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
Expand Down Expand Up @@ -82,6 +83,7 @@
<dependency>
<groupId>com.evolveum.midpoint.infra</groupId>
<artifactId>test-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand All @@ -98,6 +100,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -117,6 +120,7 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-ant</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions repo/security-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand Down
5 changes: 5 additions & 0 deletions testing/conntest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
<dependency>
<groupId>com.evolveum.commons</groupId>
<artifactId>util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
<artifactId>prism-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
Expand Down Expand Up @@ -121,15 +123,18 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
</dependency>

<!-- TEST dependency -->
Expand Down
7 changes: 7 additions & 0 deletions testing/longtest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
<dependency>
<groupId>com.evolveum.commons</groupId>
<artifactId>util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
<artifactId>prism-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
Expand Down Expand Up @@ -110,6 +112,7 @@
<groupId>com.evolveum.icf</groupId>
<artifactId>dummy-resource</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.repo</groupId>
Expand All @@ -120,18 +123,22 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj</artifactId>
<scope>test</scope>
</dependency>

<!-- TEST dependency -->
Expand Down
10 changes: 10 additions & 0 deletions testing/rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
<dependency>
<groupId>com.evolveum.commons</groupId>
<artifactId>util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
<artifactId>prism-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
Expand Down Expand Up @@ -116,6 +118,7 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-commons-fileupload</artifactId>
<version>${wicket.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -133,10 +136,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down Expand Up @@ -237,6 +242,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down Expand Up @@ -276,6 +282,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
Expand All @@ -286,14 +293,17 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down
12 changes: 12 additions & 0 deletions testing/story/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
<dependency>
<groupId>com.evolveum.commons</groupId>
<artifactId>util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.prism</groupId>
<artifactId>prism-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -147,6 +149,7 @@
<groupId>com.evolveum.icf</groupId>
<artifactId>dummy-resource</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolveum.midpoint.provisioning</groupId>
Expand All @@ -157,38 +160,47 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<scope>test</scope>
</dependency>

<!-- TEST dependency -->
Expand Down

0 comments on commit dfbfba7

Please sign in to comment.