Merge pull request #646 from hazendaz/main

Bring dependency and plugins up to date
revelc · Jul 24, 2022 · 28802f9 · 28802f9
2 parents 1539e27 + a73998c
commit 28802f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -116,9 +116,6 @@
   <properties>
     <maven-fluido-skin.version>1.11.1</maven-fluido-skin.version>
 
-    <!-- because of https://issues.apache.org/jira/browse/MCOMPILER-485 -->
-    <maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
-
     <!-- all 3 are needed, because some plugins might use the source/target variables -->
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.source>11</maven.compiler.source>
@@ -144,7 +141,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0-M1</version>
+        <version>5.9.0-RC1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -248,7 +245,7 @@
         <!-- transitive dependency of org.eclipse.jdt.core resolved here to avoid version range -->
         <groupId>org.osgi</groupId>
         <artifactId>osgi.annotation</artifactId>
-        <version>8.0.1</version>
+        <version>8.1.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -279,7 +276,7 @@
     <dependency>
       <groupId>net.revelc.code.formatter</groupId>
       <artifactId>jsdt-core</artifactId>
-      <version>3.1.0</version>
+      <version>3.2.0</version>
     </dependency>
     <dependency>
       <groupId>net.revelc.code.formatter</groupId>
@@ -351,27 +348,13 @@
     </dependency>
   </dependencies>
 
-  <!-- TODO: Allow pull from snapshots while on jsoup snapshot, remove once finalized -->
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>oss.sonatype.org-snapshot</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>com.github.ekryd.sortpom</groupId>
           <artifactId>sortpom-maven-plugin</artifactId>
-          <version>3.1.3</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>com.github.github</groupId>
@@ -386,7 +369,7 @@
         <plugin>
           <groupId>net.revelc.code.formatter</groupId>
           <artifactId>formatter-maven-plugin</artifactId>
-          <version>2.18.0</version>
+          <version>2.19.0</version>
           <configuration>
             <configFile>${project.basedir}/src/main/resources/formatter-maven-plugin/eclipse/java.xml</configFile>
             <configJsFile>${project.basedir}/src/main/resources/formatter-maven-plugin/eclipse/javascript.xml</configJsFile>
@@ -421,13 +404,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <!-- skip over 3.2.0 due to https://issues.apache.org/jira/browse/MDEP-753 -->
           <version>3.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M2</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -442,7 +424,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>3.0.0-M1</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -472,7 +454,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/net/revelc/code/formatter/jsoup/JsoupBasedFormatter.java b/src/main/java/net/revelc/code/formatter/jsoup/JsoupBasedFormatter.java
@@ -77,7 +77,7 @@ public String doFormat(String code, final LineEnding ending) {
         formattedCode = REMOVE_TRAILING_PATTERN.matcher(formattedCode).replaceAll("");
 
         // XXX: Jsoup results in mixed line ending content needing normalized until jsoup
-        // provides line ending support.  Internally Jsoup simply uses new line only and
+        // provides line ending support. Internally Jsoup simply uses new line only and
         // mixture comes from lines that did not require additional formatting.
         String[] lines = formattedCode.split("\\r?\\n");
         formattedCode = String.join(ending.getChars(), lines);