Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Josh McKenzie 2024-09-16 15:52:38 -04:00
commit e3be0df784
2 changed files with 16 additions and 5 deletions

View File

@ -58,8 +58,19 @@
<resolver:remoterepos id="all">
<remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
<remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
<!-- Snapshots are not allowed, but for feature branches they may be needed, so uncomment the below to allow snapshots to work -->
<remoterepo id="resolver-apache-snapshot" url="https://repository.apache.org/content/repositories/snapshots" releases="false" snapshots="true" updates="always" checksums="fail" />
<!-- Snapshot artifacts must not exist in nor be downloaded by any Cassandra release artifact.
Please validate that all artifacts included in parent-pom-template.xml are release
artifacts before committing.
To build with a snapshot dependency, ensure build.properties or build.properties.default
contain the correct resolution for "artifact.remoteRepository.apacheSnapshot" and uncomment
the following line.
You may also need to add an exclusion for "resolver-apache-snapshot" to your mirrors in ~/.m2/settings.xml
or ~/.ant/settings.xml (maven ant resolver supersedes) as mirrors will, by default, catch and override
all dependency resolution regardless of it being a -SNAPSHOT lib or not.
-->
<!-- <remoterepo id="resolver-apache-snapshot" url="${artifact.remoteRepository.apacheSnapshot}" releases="false" snapshots="true" updates="always" checksums="fail" /> -->
</resolver:remoterepos>
<macrodef name="resolve">

View File

@ -18,6 +18,6 @@
#
# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
#
artifact.remoteRepository.central: https://repo1.maven.org/maven2
artifact.remoteRepository.apache: https://repo.maven.apache.org/maven2
artifact.remoteRepository.central: https://repo1.maven.org/maven2
artifact.remoteRepository.apache: https://repo.maven.apache.org/maven2
artifact.remoteRepository.apacheSnapshot: https://repository.apache.org/content/repositories/snapshots