-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MNG-7407 Introduce a ModelVersionProcessor component to make CI Friends
Versions pluggable
- Loading branch information
Christoph Läubrich
committed
Feb 13, 2022
1 parent
6f14196
commit 5f9cfa1
Showing
7 changed files
with
156 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...lder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package org.apache.maven.model.interpolation; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| import javax.inject.Named; | ||
| import javax.inject.Singleton; | ||
|
|
||
| import org.apache.maven.model.building.ModelBuildingRequest; | ||
|
|
||
| /** | ||
| * Maven default implementation of the {@link ModelVersionProcessor} to support | ||
| * <a href="https://maven.apache.org/maven-ci-friendly.html">CI Friendly Versions</a> | ||
| */ | ||
| @Named | ||
| @Singleton | ||
| public class DefaultModelVersionProcessor | ||
| implements ModelVersionProcessor | ||
| { | ||
|
|
||
| private static final String SHA1_PROPERTY = "sha1"; | ||
|
|
||
| private static final String CHANGELIST_PROPERTY = "changelist"; | ||
|
|
||
| private static final String REVISION_PROPERTY = "revision"; | ||
|
|
||
| @Override | ||
| public boolean isValidProperty( String property ) | ||
| { | ||
| return REVISION_PROPERTY.equals( property ) || CHANGELIST_PROPERTY.equals( property ) | ||
| || SHA1_PROPERTY.equals( property ); | ||
| } | ||
|
|
||
| @Override | ||
| public void overwriteModelProperties( Properties modelProperties, ModelBuildingRequest request ) | ||
| { | ||
| if ( request.getUserProperties().containsKey( REVISION_PROPERTY ) ) | ||
| { | ||
| modelProperties.put( REVISION_PROPERTY, request.getUserProperties().get( REVISION_PROPERTY ) ); | ||
| } | ||
| if ( request.getUserProperties().containsKey( CHANGELIST_PROPERTY ) ) | ||
| { | ||
| modelProperties.put( CHANGELIST_PROPERTY, request.getUserProperties().get( CHANGELIST_PROPERTY ) ); | ||
| } | ||
| if ( request.getUserProperties().containsKey( SHA1_PROPERTY ) ) | ||
| { | ||
| modelProperties.put( SHA1_PROPERTY, request.getUserProperties().get( SHA1_PROPERTY ) ); | ||
| } | ||
|
|
||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...del-builder/src/main/java/org/apache/maven/model/interpolation/ModelVersionProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package org.apache.maven.model.interpolation; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| import org.apache.maven.model.building.ModelBuildingRequest; | ||
|
|
||
| /** | ||
| * Allows a fixed set of properties that are valid inside a version and that could be overwritten for example on the | ||
| * commandline | ||
| */ | ||
| public interface ModelVersionProcessor | ||
| { | ||
|
|
||
| /** | ||
| * @param property the property to check | ||
| * @return <code>true</code> if this is a valid property for this processor | ||
| */ | ||
| boolean isValidProperty( String property ); | ||
|
|
||
| /** | ||
| * This method is responsible for examining the request and possibly overwrite of the valid properties in the model | ||
| * | ||
| * @param modelProperties | ||
| * @param request | ||
| */ | ||
| void overwriteModelProperties( Properties modelProperties, ModelBuildingRequest request ); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters