Skip to content

Commit 899465a

Browse files
committed
[MNG-7117] add support for blocked mirror
1 parent fa79cb2 commit 899465a

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ else if ( request.isUpdateSnapshots() )
177177
DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
178178
for ( Mirror mirror : request.getMirrors() )
179179
{
180-
mirrorSelector.add( mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirror.getMirrorOf(),
181-
mirror.getMirrorOfLayouts() );
180+
mirrorSelector.add( mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirror.isBlocked(),
181+
mirror.getMirrorOf(), mirror.getMirrorOfLayouts() );
182182
}
183183
session.setMirrorSelector( mirrorSelector );
184184

maven-settings/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ under the License.
4646
<groupId>org.codehaus.modello</groupId>
4747
<artifactId>modello-maven-plugin</artifactId>
4848
<configuration>
49-
<version>1.1.0</version>
49+
<version>1.2.0</version>
5050
<models>
5151
<model>src/main/mdo/settings.mdo</model>
5252
</models>

maven-settings/src/main/mdo/settings.mdo

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,15 @@
633633
of the mirror to repositories with a matching layout (apart from a matching id). Since Maven 3.
634634
</description>
635635
</field>
636+
<field>
637+
<name>blocked</name>
638+
<version>1.2.0+</version>
639+
<type>boolean</type>
640+
<defaultValue>false</defaultValue>
641+
<description>
642+
Whether this mirror should be blocked from any download request but fail the download process, explaining why.
643+
</description>
644+
</field>
636645
</fields>
637646
<codeSegments>
638647
<codeSegment>
@@ -648,6 +657,10 @@
648657
sb.append( ",mirrorOf=" ).append( mirrorOf );
649658
sb.append( ",url=" ).append( this.url );
650659
sb.append( ",name=" ).append( this.name );
660+
if ( isBlocked() )
661+
{
662+
sb.append( ",blocked" );
663+
}
651664
sb.append( "]" );
652665
return sb.toString();
653666
}

0 commit comments

Comments
 (0)