Skip to content

Commit

Permalink
Merge branch 'main' into release/4.0.x
Browse files Browse the repository at this point in the history
* main:
  Issue #409: Update dependencies
  Issue #422: Exclude release-related marker files from source distributions
  • Loading branch information
reckart committed Nov 22, 2024
2 parents 6beb33c + 3661d2f commit 79c9de4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
# The internal repo form for these is always lf,
# The eol=lf means on check-out do nothing, and on check-in, if the file has crlf, convert to lf
*.sh text eol=lf

marker-file-enabling-auto-staging export-ignore
marker-file-enabling-release-notes export-ignore
7 changes: 7 additions & 0 deletions src/main/assembly/src.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ under the License.
<exclude>**/checkpoint_synchPoint.xml</exclude>
<exclude>**/checkpoint_synchPoint.xml.prev</exclude>

<!--
- Marker files enabling release-supporting profiles that expect a git repository and/or svn to be available
- and are therefore not suitable for use when building from the source archive.
-->
<exclude>**/marker-file-enabling-auto-staging</exclude>
<exclude>**/marker-file-enabling-release-notes</exclude>

<!--
File that seems to be temporarily placed into the CWD during the build but no idea where
it comes from.
Expand Down
2 changes: 1 addition & 1 deletion uimaj-parent-internal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<bytebuddy-version>1.15.10</bytebuddy-version>
<commons-csv-version>1.12.0</commons-csv-version>
<commons-collections4-version>4.4</commons-collections4-version>
<commons-io-version>2.17.0</commons-io-version>
<commons-io-version>2.18.0</commons-io-version>
<commons-lang3-version>3.17.0</commons-lang3-version>
<commons-math3-version>3.6.1</commons-math3-version>
<jackson-version>2.18.1</jackson-version>
Expand Down

0 comments on commit 79c9de4

Please sign in to comment.