Skip to content

Commit e3be0df

Browse files
committed
Merge branch 'cassandra-5.0' into trunk
2 parents c52ecb1 + 7d10bed commit e3be0df

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

.build/build-resolver.xml

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

6576
<macrodef name="resolve">

build.properties.default

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
#
1919
# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
2020
#
21-
artifact.remoteRepository.central: https://repo1.maven.org/maven2
22-
artifact.remoteRepository.apache: https://repo.maven.apache.org/maven2
23-
21+
artifact.remoteRepository.central: https://repo1.maven.org/maven2
22+
artifact.remoteRepository.apache: https://repo.maven.apache.org/maven2
23+
artifact.remoteRepository.apacheSnapshot: https://repository.apache.org/content/repositories/snapshots

0 commit comments

Comments
 (0)