This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch spotless-take3
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/spotless-take3 by this push:
new b55cbf211 spotless -- take 3, further refinements
b55cbf211 is described below
commit b55cbf211c1b0eb5f26bac2d8e4747e31ebf3020
Author: tallison <[email protected]>
AuthorDate: Tue Nov 25 16:51:27 2025 -0500
spotless -- take 3, further refinements
---
.github/workflows/main-jdk17-build.yml | 2 +-
.github/workflows/main-jdk21-build.yml | 2 +-
.github/workflows/main-jdk25-build.yml | 2 +-
tika-parent/google-style-eclipse.xml | 6 +++---
tika-parent/pom.xml | 3 ++-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/main-jdk17-build.yml
b/.github/workflows/main-jdk17-build.yml
index 5a0b18edd..3bf620562 100644
--- a/.github/workflows/main-jdk17-build.yml
+++ b/.github/workflows/main-jdk17-build.yml
@@ -38,4 +38,4 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn clean test install javadoc:aggregate
+ run: mvn clean test install javadoc:aggregate -Pci
diff --git a/.github/workflows/main-jdk21-build.yml
b/.github/workflows/main-jdk21-build.yml
index 10fb27dbb..da0182453 100644
--- a/.github/workflows/main-jdk21-build.yml
+++ b/.github/workflows/main-jdk21-build.yml
@@ -36,4 +36,4 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn clean test install javadoc:aggregate
+ run: mvn clean test install javadoc:aggregate -Pci
diff --git a/.github/workflows/main-jdk25-build.yml
b/.github/workflows/main-jdk25-build.yml
index ad43404d7..8d6f03576 100644
--- a/.github/workflows/main-jdk25-build.yml
+++ b/.github/workflows/main-jdk25-build.yml
@@ -36,4 +36,4 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn clean test install javadoc:aggregate
+ run: mvn clean test install javadoc:aggregate -Pci
diff --git a/tika-parent/google-style-eclipse.xml
b/tika-parent/google-style-eclipse.xml
index d55c00cc2..a5b6dde1f 100644
--- a/tika-parent/google-style-eclipse.xml
+++ b/tika-parent/google-style-eclipse.xml
@@ -9,14 +9,14 @@
<setting
id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments"
value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments"
value="false"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments"
value="false"/>
- <!--<setting
id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="33"/>
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
value="33"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
value="next_line"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_parenthesized_expression"
value="17"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_return_statement"
value="17"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length"
value="100"/>
- original features from the file as downloaded
+ <!-- original features from the file as downloaded -->
<setting
id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag"
value="@formatter:off"/>
@@ -338,6 +338,6 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement"
value="16"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
value="false"/>
- <setting
id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line"
value="false"/>-->
+ <setting
id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line"
value="false"/>
</profile>
</profiles>
\ No newline at end of file
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 441235b18..8a32dcd04 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -1455,6 +1455,7 @@
<artifactId>spotless-maven-plugin</artifactId>
<version>3.1.0</version>
<configuration>
+ <ratchetFrom>origin/main</ratchetFrom>
<!--<java>
<googleJavaFormat/>
</java> -->
@@ -1477,7 +1478,7 @@
<removeUnusedImports/>
<importOrder>
- <order></order>
+ <order>java,javax,org,com</order>
</importOrder>
<formatAnnotations/>
</java>
