Update to jdk17 (#122)

* Fix MavenInvokerTest * Add explicit encoding for the failsafe-plugin to avoid log warnings * Edit description * Update to JDK17 and prepare for new release * Fix IT
ASSERT-KTH · Apr 1, 2022 · 3e15d36 · 3e15d36
1 parent c238589
commit 3e15d36
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 27 deletions.
diff --git a/depclean-core/pom.xml b/depclean-core/pom.xml
@@ -8,12 +8,12 @@
   <parent>
     <groupId>se.kth.castor</groupId>
     <artifactId>depclean-parent-pom</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
 
   <!-- Coordinates -->
   <artifactId>depclean-core</artifactId>
-  <version>2.0.2-SNAPSHOT</version>
+  <version>2.0.2</version>
   <packaging>jar</packaging>
   <description>Core library of DepClean</description>
   <name>depclean-core</name>

diff --git a/depclean-core/src/test/java/se/kth/depclean/core/analysis/ActualUsedClassesTest.java b/depclean-core/src/test/java/se/kth/depclean/core/analysis/ActualUsedClassesTest.java
@@ -13,7 +13,6 @@ void shouldRegisterClasses() {
     final ProjectContext context = createContext();
     final ActualUsedClasses actualUsedClasses = new ActualUsedClasses(context);
     actualUsedClasses.registerClasses(of(COMMONS_IO_CLASS));
-
     assertThat(actualUsedClasses.getRegisteredClasses()).containsExactly(COMMONS_IO_CLASS);
   }
 
@@ -22,8 +21,6 @@ void shouldNotRegisterUnknownClasses() {
     final ProjectContext context = createContext();
     final ActualUsedClasses actualUsedClasses = new ActualUsedClasses(context);
     actualUsedClasses.registerClasses(of(UNKNOWN_CLASS));
-
     assertThat(actualUsedClasses.getRegisteredClasses()).isEmpty();
   }
-
 }
diff --git a/depclean-maven-plugin/pom.xml b/depclean-maven-plugin/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>se.kth.castor</groupId>
     <artifactId>depclean-parent-pom</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.2</version>
   </parent>
 
   <!-- Coordinates -->
   <artifactId>depclean-maven-plugin</artifactId>
-  <version>2.0.2-SNAPSHOT</version>
+  <version>2.0.2</version>
   <packaging>maven-plugin</packaging>
   <name>depclean-maven-plugin</name>
 
@@ -20,17 +20,20 @@
     <sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     <checkstyle.config.location>../checkstyle.xml</checkstyle.config.location>
     <linkXRef>false</linkXRef>
+    <!-- Encoding for the failsafe-plugin -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
 
-  <description>DepClean is a plugin for automatically remove unused dependencies in Maven projects</description>
+  <description>DepClean is automatically removes unused dependencies in Maven projects</description>
 
   <!-- Build options -->
   <dependencies>
     <!-- Project module -->
     <dependency>
       <groupId>se.kth.castor</groupId>
       <artifactId>depclean-core</artifactId>
-      <version>2.0.2-SNAPSHOT</version>
+      <version>2.0.2</version>
     </dependency>
     <!--Maven tools for plugin construction-->
     <dependency>
@@ -218,5 +221,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
diff --git a/depclean-maven-plugin/src/test/java/se/kth/depclean/DepCleanMojoIT.java b/depclean-maven-plugin/src/test/java/se/kth/depclean/DepCleanMojoIT.java
@@ -26,7 +26,7 @@ public class DepCleanMojoIT {
   @MavenTest
   @DisplayName("Test that DepClean runs in an empty Maven project")
   void empty_project(MavenExecutionResult result) {
-    assertThat(result).isFailure(); // should pass
+    assertThat(result).isSuccessful(); // should pass
   }
 
   @MavenTest

diff --git a/...gin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml b/...gin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml b/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...in/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml b/...in/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml
@@ -14,7 +14,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-
     <mapstruct.version>1.4.2.Final</mapstruct.version>
   </properties>
 
@@ -72,7 +71,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml b/...-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml b/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml
@@ -45,7 +45,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml b/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml b/...maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml
@@ -72,7 +72,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...n-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml b/...n-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml b/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml b/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/depclean-maven-plugin/src/test/resources/DepCleanMojoResources/pom-debloated.xml b/depclean-maven-plugin/src/test/resources/DepCleanMojoResources/pom-debloated.xml
@@ -67,7 +67,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.0.2</version>
         <executions>
           <execution>
             <goals>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <!-- Coordinates -->
   <groupId>se.kth.castor</groupId>
   <artifactId>depclean-parent-pom</artifactId>
-  <version>2.0.2-SNAPSHOT</version>
+  <version>2.0.2</version>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
 
@@ -18,13 +18,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- plugins -->
-    <compiler.release>8</compiler.release>
-    <javadoc.source>8</javadoc.source>
+    <compiler.release>17</compiler.release>
+    <javadoc.source>17</javadoc.source>
     <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
     <jacoco.plugin.version>0.8.6</jacoco.plugin.version>
     <coveralls.plugin.version>4.3.0</coveralls.plugin.version>
     <surefire.plugin.version>3.0.0-M3</surefire.plugin.version>
-    <compiler.plugin.version>3.8.1</compiler.plugin.version>
+    <compiler.plugin.version>3.10.1</compiler.plugin.version>
     <!-- dependencies -->
     <lombok.version>1.18.22</lombok.version>
     <slf4j-api.version>2.0.0-alpha1</slf4j-api.version>