Merge pull request #13 from exadel-inc/develop

[Tech] Minor maintenance changes
exadel-inc · Mar 29, 2024 · 2c92998 · 2c92998
2 parents d28f7ab + 75c5b52
commit 2c92998
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -78,7 +78,7 @@
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
                     </plugin>
                 </plugins>
             </build>

diff --git a/core/src/main/java/com/exadel/etoolbox/anydiff/comparison/DiffTask.java b/core/src/main/java/com/exadel/etoolbox/anydiff/comparison/DiffTask.java
@@ -228,7 +228,7 @@ private static List<DiffRow> truncateContext(List<DiffRow> rows) {
 
     /**
      * Creates a builder for constructing a new {@code DiffTask} object
-     * @return {@link DiffTask.Builder} instance
+     * @return {@code DiffTask.Builder} instance
      */
     public static Builder builder() {
         return new InitializingBuilder();

diff --git a/core/src/main/java/com/exadel/etoolbox/anydiff/comparison/TaskParameters.java b/core/src/main/java/com/exadel/etoolbox/anydiff/comparison/TaskParameters.java
@@ -84,6 +84,7 @@ public boolean handleErrorPages() {
 
     /**
      * Gets the width of a content column in the side-by-side comparison log
+     * @return Integer value
      */
     public int getColumnWidth() {
         return columnWidth != null && columnWidth >= MIN_COLUMN_WIDTH ? columnWidth : Constants.DEFAULT_COLUMN_WIDTH;

diff --git a/core/src/main/java/com/exadel/etoolbox/anydiff/diff/FragmentHolder.java b/core/src/main/java/com/exadel/etoolbox/anydiff/diff/FragmentHolder.java
@@ -55,6 +55,7 @@ default List<Fragment> getFragments() {
     /**
      * Accepts the fragment, that is, silences it so that it no longer leads to the {@link AnyDiff} reporting a
      * mismatch. However, the fragment is still included in the {@link Diff} and can be displayed to the user
+     * @param value {@code Fragment} object to accept
      */
     void accept(Fragment value);
 

diff --git a/core/src/main/java/com/exadel/etoolbox/anydiff/util/ContentUtil.java b/core/src/main/java/com/exadel/etoolbox/anydiff/util/ContentUtil.java
@@ -95,6 +95,7 @@ public static String extractLabel(String value) {
     /**
      * Extracts the optional label from the given string
      * @param value Source string
+     * @param fallback The value to return if the label is missing
      * @return The label. If missing from the source string, the {@code fallback} value is returned
      */
     public static String extractLabel(String value, String fallback) {

diff --git a/pom.xml b/pom.xml
@@ -171,7 +171,16 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.0.1</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -185,10 +194,6 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
@@ -229,27 +234,17 @@
                                 </execution>
                             </executions>
                         </plugin>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-source-plugin</artifactId>
-                            <version>3.0.1</version>
-                            <executions>
-                                <execution>
-                                    <id>attach-sources</id>
-                                    <phase>package</phase>
-                                    <goals>
-                                        <goal>jar-no-fork</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
                     </plugins>
                 </pluginManagement>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>