Skip to content

Commit

Permalink
Miscellaneous updates (#925)
Browse files Browse the repository at this point in the history
* Update maven build to use revelc prefixed property name for formatting
  profiles in the parent POM
* Drop the sonatype deploy snapshot configuration (not needed and not
  safe to use personal individual credentials on a shared repository
  this way - personal secrets still need to be deleted from the GitHub
  repository); discussed on #889
* Re-drop autogenerated CHANGELOG file and related README in favor of
  adding a link to the milestone or full changeset in the GitHub
  release notes; discussion on #844
* Bump snapshot version to 2.25.0 and update the compatible Eclipse
  version in the site documentation
* Add missing scm section (revelc/revelc#12)
* Drop site-specific distributionManagement section and related
  scmpublish plugin settings (those can be run manually entirely from
  the command-line with command-line parameters, if needed, but it
  shouldn't be necessary if the GitHub plugin defined in the site-deploy
  phase of the site lifecyle is used, as defined in the parent POM);
  discussed on #905
* Revert to using stable versions of maven site plugin and Fluido skin,
  defined in the parent POM, rather than override here (when these get
  stable releases, the parent POM can be updated, and then the site
  descriptor will need to be updated, but for now, these can use the
  latest stable versions)
* Add dependencyConvergence rule to the build, and exclude conflicting
  transitive dependencies, in order to affix them to specific versions
  (some of this might not be needed once some of the other plugins start
  doing dependency convergence also, like xml-formatter and jsdt-core)
* Make sure slf4j-api is marked as provided (address concerns from #846)
  It would be easier if we could converge on what maven-core or
  maven-plugin-api uses, but those dependencies are opaque to us, so we
  just have to assume it's provided and compatible with what we're
  using; slf4j has a high degree of compatibility, though, so this
  shouldn't be much of a concern
* Drop plexus-xml dependency (we don't use it, and the one that comes
  with plexus-resources is fine with Maven 3); see comment on #851
* Upload build logs on GitHub Actions failure

Try to make the build windows-friendly

* Treat test files as binaries, so git won't mangle the line endings
* Make sortpom-maven-plugin ignore line endings when verifying
* Commit correct CRLF line endings for AnyClassCRLF.java and someFile.xml
  • Loading branch information
ctubbsii committed Jul 26, 2024
1 parent 90cab2d commit e1199e8
Show file tree
Hide file tree
Showing 12 changed files with 168 additions and 1,489 deletions.
5 changes: 1 addition & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
* text=auto

# Declare files with fixed line ending for tests.
src/test/resources/**/*LF.* text eol=lf
src/test/resources/**/*CR.* text eol=cr
# This line MUST be after the *LF.* line as *LF.* also matches *CRLF.* files
src/test/resources/**/*CRLF.* text eol=crlf
src/test/resources/**/* binary diff

# Custom for Visual Studio
*.cs diff=csharp
Expand Down
7 changes: 0 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ updates:
maven:
patterns:
- "*"
ignore:
- dependency-name: org.codehaus.plexus:plexus-xml
versions:
- ">=4.0.0"
- dependency-name: org.slf4j:slf4j-simple
version:
- ">=2.0.0"
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ jobs:
- name: Download Maven Wrapper
run: mvn wrapper:wrapper "-Dmaven=3.9.8"
- name: Build with Maven
run: ./mvnw -B -V -e "-Dstyle.color=always" verify -DskipFormat -DverifyFormat
run: ./mvnw -B -V -e "-Dstyle.color=always" verify "-Drevelc.skipFormat" "-Drevelc.verifyFormat"
env:
MAVEN_OPTS: -Djansi.force=true
- name: View IT build log on failure
uses: actions/upload-artifact@v4
if: ${{ failure() }}
run: cat target/it/cache/build.log
with:
name: build-logs-java-${{ matrix.java }}-os-${{ matrix.os }}
path: |
target/its/**/build.log
if-no-files-found: ignore

40 changes: 0 additions & 40 deletions .github/workflows/sonatype.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions .mvn/settings.xml

This file was deleted.

Loading

0 comments on commit e1199e8

Please sign in to comment.