release-please 13.7.1 → 13.9.0

package/CHANGELOG.md

@@ -4,6 +4,33 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [13.9.0](https://github.com/googleapis/release-please/compare/v13.8.1...v13.9.0) (2022-04-12)
+
+
+### Features
+
+* added java strategy ([#1333](https://github.com/googleapis/release-please/issues/1333)) ([25f9c85](https://github.com/googleapis/release-please/commit/25f9c85a8472208a83dfd5cc4014c84adc3c771f))
+
+### [13.8.1](https://github.com/googleapis/release-please/compare/v13.8.0...v13.8.1) (2022-04-11)
+
+
+### Bug Fixes
+
+* Restore v12 changelog formatting for ruby-yoshi ([#1361](https://github.com/googleapis/release-please/issues/1361)) ([ff87c7d](https://github.com/googleapis/release-please/commit/ff87c7df00b652512641454ead34bb2cede2f67e))
+
+## [13.8.0](https://github.com/googleapis/release-please/compare/v13.7.1...v13.8.0) (2022-03-31)
+
+
+### Features
+
+* add dotnet-yoshi strategy ([#1346](https://github.com/googleapis/release-please/issues/1346)) ([3086e51](https://github.com/googleapis/release-please/commit/3086e5148e596751a2c2b82c28a7b3d3c1b960f2))
+* allow configuring tag without "v" ([3086e51](https://github.com/googleapis/release-please/commit/3086e5148e596751a2c2b82c28a7b3d3c1b960f2))
+
+
+### Bug Fixes
+
+* **php-yoshi:** correctly ignore non-client directories ([#1358](https://github.com/googleapis/release-please/issues/1358)) ([58647dd](https://github.com/googleapis/release-please/commit/58647dd22d994ba670e762a2cef6b99b4b234af8)), closes [#1356](https://github.com/googleapis/release-please/issues/1356)
+
 ### [13.7.1](https://github.com/googleapis/release-please/compare/v13.7.0...v13.7.1) (2022-03-30)
 
 

package/README.md

@@ -32,9 +32,10 @@ When the Release PR is merged, release-please takes the following steps:
 You can tell where the Release PR is its lifecycle by the status label on the
 PR itself:
 
-- `autorelease:pending` is the initial state of the Release PR before it is merged
-- `autorelease:tagged` means that the Release PR has been merged and the release has been tagged in GitHub
-- `autorelease:published` means that a GitHub release has been published based on the Release PR (_release-please does not automatically add this tag, but we recommend it as a convention for publication tooling_).
+- `autorelease: pending` is the initial state of the Release PR before it is merged
+- `autorelease: tagged` means that the Release PR has been merged and the release has been tagged in GitHub
+- `autorelease: snapshot` is special state for snapshot version bumps
+- `autorelease: published` means that a GitHub release has been published based on the Release PR (_release-please does not automatically add this tag, but we recommend it as a convention for publication tooling_).
 
 ## How should I write my commits?
 
@@ -112,7 +113,7 @@ commit message instead of the merged commit message.
 ## Release Please bot does not create a release PR. Why?
 
 Release Please creates a release pull request after it sees the default branch
-contains "releaseable units" since the last release.
+contains "releasable units" since the last release.
 A releasable unit is a commit to the branch with one of the following
 prefixes: "feat" and "fix". (A "chore" commit is not a releasable unit.)
 
@@ -123,13 +124,15 @@ Some languages have their specific releasable unit configuration. For example,
 
 Release Please automates releases for the following flavors of repositories:
 
-| release type            | description
-|-------------------|---------------------------------------------------------|
+| release type        | description |
+|---------------------|---------------------------------------------------------|
 | `dart`              | A repository with a pubspec.yaml and a CHANGELOG.md |
 | `elixir`            | A repository with a mix.exs and a CHANGELOG.md |
 | `go`                | A repository with a CHANGELOG.md |
 | `helm`              | A repository with a Chart.yaml and a CHANGELOG.md |
+| `java`              | [A strategy that generates SNAPSHOT version after each release](docs/java.md) |
 | `krm-blueprint`     | [A kpt package, with 1 or more KRM files and a CHANGELOG.md](https://github.com/GoogleCloudPlatform/blueprints/tree/main/catalog/project) |
+| `maven`             | [Strategy for Maven projects, generates SNAPSHOT version after each release and updates `pom.xml` automatically](docs/java.md) |
 | `node`              | [A Node.js repository, with a package.json and CHANGELOG.md](https://github.com/yargs/yargs) |
 | `ocaml`             | [An OCaml repository, containing 1 or more opam or esy files and a CHANGELOG.md](https://github.com/grain-lang/binaryen.ml) |
 | `php`               | A repository with a composer.json and a CHANGELOG.md |

package/build/src/bin/release-please.d.ts

@@ -41,6 +41,7 @@ interface ReleaseArgs {
     draft?: boolean;
     prerelease?: boolean;
     releaseLabel?: string;
+    snapshotLabel?: string;
     label?: string;
 }
 interface PullRequestArgs {

package/build/src/bin/release-please.js

@@ -91,6 +91,11 @@ function releaseOptions(yargs) {
         describe: 'set a pull request label other than "autorelease: tagged"',
         default: 'autorelease: tagged',
         type: 'string',
+    })
+        .option('snapshot-label', {
+        describe: 'set a java snapshot pull request label other than "autorelease: snapshot"',
+        default: 'autorelease: snapshot',
+        type: 'string',
     });
 }
 function pullRequestOptions(yargs) {
@@ -238,6 +243,11 @@ function manifestOptions(yargs) {
 }
 function taggingOptions(yargs) {
     return yargs
+        .option('include-v-in-tags', {
+        describe: 'include "v" in tag versions',
+        type: 'boolean',
+        default: true,
+    })
         .option('monorepo-tags', {
         describe: 'include library name in tags and release branches',
         type: 'boolean',
@@ -275,6 +285,7 @@ const createReleasePullRequestCommand = {
                 extraFiles: argv.extraFiles,
                 versionFile: argv.versionFile,
                 includeComponentInTag: argv.monorepoTags,
+                includeVInTag: argv.includeVInTags,
             }, extractManifestOptions(argv), argv.path);
         }
         else {
@@ -324,6 +335,7 @@ const createReleaseCommand = {
                 draft: argv.draft,
                 prerelease: argv.prerelease,
                 includeComponentInTag: argv.monorepoTags,
+                includeVInTag: argv.includeVInTags,
             }, extractManifestOptions(argv), argv.path);
         }
         else {
@@ -498,6 +510,9 @@ function extractManifestOptions(argv) {
     if ('releaseLabel' in argv && argv.releaseLabel) {
         manifestOptions.releaseLabels = argv.releaseLabel.split(',');
     }
+    if ('snapshotLabel' in argv && argv.snapshotLabel) {
+        manifestOptions.snapshotLabels = argv.snapshotLabel.split(',');
+    }
     if ('signoff' in argv && argv.signoff) {
         manifestOptions.signoff = argv.signoff;
     }

package/build/src/factory.d.ts

@@ -3,7 +3,7 @@ import { GitHub } from './github';
 import { ReleaserConfig, PluginType, RepositoryConfig } from './manifest';
 import { ManifestPlugin } from './plugin';
 import { ChangelogNotes, ChangelogSection } from './changelog-notes';
-declare const allReleaseTypes: readonly ["dart", "elixir", "go", "go-yoshi", "helm", "java-backport", "java-bom", "java-lts", "java-yoshi", "krm-blueprint", "node", "ocaml", "php", "php-yoshi", "python", "ruby", "ruby-yoshi", "rust", "simple", "terraform-module"];
+declare const allReleaseTypes: readonly ["dart", "dotnet-yoshi", "elixir", "go", "go-yoshi", "helm", "java", "java-backport", "java-bom", "java-lts", "java-yoshi", "krm-blueprint", "maven", "node", "ocaml", "php", "php-yoshi", "python", "ruby", "ruby-yoshi", "rust", "simple", "terraform-module"];
 export declare type ReleaseType = typeof allReleaseTypes[number];
 export declare function getReleaserTypes(): readonly ReleaseType[];
 export declare function getVersioningStrategyTypes(): readonly VersioningStrategyType[];

package/build/src/factory.js

@@ -40,21 +40,27 @@ const cargo_workspace_1 = require("./plugins/cargo-workspace");
 const github_1 = require("./changelog-notes/github");
 const default_2 = require("./changelog-notes/default");
 const linked_versions_1 = require("./plugins/linked-versions");
+const dotnet_yoshi_1 = require("./strategies/dotnet-yoshi");
+const java_1 = require("./strategies/java");
+const maven_1 = require("./strategies/maven");
 // Factory shared by GitHub Action and CLI for creating Release PRs
 // and GitHub Releases:
 // add any new releasers you create to this type as well as the `releasers`
 // object below.
 const allReleaseTypes = [
     'dart',
+    'dotnet-yoshi',
     'elixir',
     'go',
     'go-yoshi',
     'helm',
+    'java',
     'java-backport',
     'java-bom',
     'java-lts',
     'java-yoshi',
     'krm-blueprint',
+    'maven',
     'node',
     'ocaml',
     'php',
@@ -67,9 +73,9 @@ const allReleaseTypes = [
     'terraform-module',
 ];
 const releasers = {
+    'dotnet-yoshi': options => new dotnet_yoshi_1.DotnetYoshi(options),
     go: options => new go_1.Go(options),
     'go-yoshi': options => new go_yoshi_1.GoYoshi(options),
-    'java-yoshi': options => new java_yoshi_1.JavaYoshi(options),
     'krm-blueprint': options => new krm_blueprint_1.KRMBlueprint(options),
     node: options => new node_1.Node(options),
     ocaml: options => new ocaml_1.OCaml(options),
@@ -139,6 +145,24 @@ async function buildStrategy(options) {
                 versionFile: options.versionFile,
             });
         }
+        case 'java': {
+            return new java_1.Java({
+                ...strategyOptions,
+                snapshotLabels: options.snapshotLabels,
+            });
+        }
+        case 'maven': {
+            return new maven_1.Maven({
+                ...strategyOptions,
+                snapshotLabels: options.snapshotLabels,
+            });
+        }
+        case 'java-yoshi': {
+            return new java_yoshi_1.JavaYoshi({
+                ...strategyOptions,
+                snapshotLabels: options.snapshotLabels,
+            });
+        }
         case 'java-backport': {
             return new java_yoshi_1.JavaYoshi({
                 ...strategyOptions,

package/build/src/manifest.d.ts

@@ -15,7 +15,11 @@ declare type ExtraXmlFile = {
     path: string;
     xpath: string;
 };
-export declare type ExtraFile = string | ExtraJsonFile | ExtraXmlFile;
+declare type ExtraPomFile = {
+    type: 'pom';
+    path: string;
+};
+export declare type ExtraFile = string | ExtraJsonFile | ExtraXmlFile | ExtraPomFile;
 /**
  * These are configurations provided to each strategy per-path.
  */
@@ -32,6 +36,7 @@ export interface ReleaserConfig {
     component?: string;
     packageName?: string;
     includeComponentInTag?: boolean;
+    includeVInTag?: boolean;
     pullRequestTitlePattern?: string;
     tagSeparator?: string;
     changelogSections?: ChangelogSection[];
@@ -39,6 +44,7 @@ export interface ReleaserConfig {
     changelogType?: ChangelogNotesType;
     versionFile?: string;
     extraFiles?: ExtraFile[];
+    snapshotLabels?: string[];
 }
 export interface CandidateReleasePullRequest {
     path: string;
@@ -64,11 +70,13 @@ interface ReleaserConfigJson {
     label?: string;
     'release-label'?: string;
     'include-component-in-tag'?: boolean;
+    'include-v-in-tag'?: boolean;
     'changelog-type'?: ChangelogNotesType;
     'pull-request-title-pattern'?: string;
     'tag-separator'?: string;
     'version-file'?: string;
     'extra-files'?: string[];
+    'snapshot-label'?: string;
 }
 export interface ManifestOptions {
     bootstrapSha?: string;
@@ -81,6 +89,7 @@ export interface ManifestOptions {
     manifestPath?: string;
     labels?: string[];
     releaseLabels?: string[];
+    snapshotLabels?: string[];
     draft?: boolean;
     prerelease?: boolean;
     draftPullRequest?: boolean;
@@ -115,6 +124,11 @@ export declare type RepositoryConfig = Record<string, ReleaserConfig>;
 export declare const DEFAULT_RELEASE_PLEASE_CONFIG = "release-please-config.json";
 export declare const DEFAULT_RELEASE_PLEASE_MANIFEST = ".release-please-manifest.json";
 export declare const ROOT_PROJECT_PATH = ".";
+export declare const DEFAULT_COMPONENT_NAME = "";
+export declare const DEFAULT_LABELS: string[];
+export declare const DEFAULT_RELEASE_LABELS: string[];
+export declare const DEFAULT_SNAPSHOT_LABELS: string[];
+export declare const SNOOZE_LABEL = "autorelease: snooze";
 export declare const MANIFEST_PULL_REQUEST_TITLE_PATTERN = "chore: release ${branch}";
 interface CreatedRelease extends GitHubRelease {
     path: string;
@@ -134,6 +148,7 @@ export declare class Manifest {
     private signoffUser?;
     private labels;
     private releaseLabels;
+    private snapshotLabels;
     private plugins;
     private _strategiesByPath?;
     private _pathsByComponent?;

package/build/src/manifest.js

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Manifest = exports.MANIFEST_PULL_REQUEST_TITLE_PATTERN = exports.ROOT_PROJECT_PATH = exports.DEFAULT_RELEASE_PLEASE_MANIFEST = exports.DEFAULT_RELEASE_PLEASE_CONFIG = void 0;
+exports.Manifest = exports.MANIFEST_PULL_REQUEST_TITLE_PATTERN = exports.SNOOZE_LABEL = exports.DEFAULT_SNAPSHOT_LABELS = exports.DEFAULT_RELEASE_LABELS = exports.DEFAULT_LABELS = exports.DEFAULT_COMPONENT_NAME = exports.ROOT_PROJECT_PATH = exports.DEFAULT_RELEASE_PLEASE_MANIFEST = exports.DEFAULT_RELEASE_PLEASE_CONFIG = void 0;
 const version_1 = require("./version");
 const logger_1 = require("./util/logger");
 const commit_split_1 = require("./util/commit-split");
@@ -28,10 +28,11 @@ const errors_1 = require("./errors");
 exports.DEFAULT_RELEASE_PLEASE_CONFIG = 'release-please-config.json';
 exports.DEFAULT_RELEASE_PLEASE_MANIFEST = '.release-please-manifest.json';
 exports.ROOT_PROJECT_PATH = '.';
-const DEFAULT_COMPONENT_NAME = '';
-const DEFAULT_LABELS = ['autorelease: pending'];
-const DEFAULT_RELEASE_LABELS = ['autorelease: tagged'];
-const SNOOZE_LABEL = 'autorelease: snooze';
+exports.DEFAULT_COMPONENT_NAME = '';
+exports.DEFAULT_LABELS = ['autorelease: pending'];
+exports.DEFAULT_RELEASE_LABELS = ['autorelease: tagged'];
+exports.DEFAULT_SNAPSHOT_LABELS = ['autorelease: snapshot'];
+exports.SNOOZE_LABEL = 'autorelease: snooze';
 exports.MANIFEST_PULL_REQUEST_TITLE_PATTERN = 'chore: release ${branch}';
 class Manifest {
     /**
@@ -73,8 +74,10 @@ class Manifest {
         this.fork = (manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.fork) || false;
         this.signoffUser = manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.signoff;
         this.releaseLabels =
-            (manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.releaseLabels) || DEFAULT_RELEASE_LABELS;
-        this.labels = (manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.labels) || DEFAULT_LABELS;
+            (manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.releaseLabels) || exports.DEFAULT_RELEASE_LABELS;
+        this.labels = (manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.labels) || exports.DEFAULT_LABELS;
+        this.snapshotLabels =
+            (manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.snapshotLabels) || exports.DEFAULT_SNAPSHOT_LABELS;
         this.bootstrapSha = manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.bootstrapSha;
         this.lastReleaseSha = manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.lastReleaseSha;
         this.draft = manifestOptions === null || manifestOptions === void 0 ? void 0 : manifestOptions.draft;
@@ -135,7 +138,7 @@ class Manifest {
         });
         const component = await strategy.getComponent();
         const releasedVersions = {};
-        const latestVersion = await latestReleaseVersion(github, targetBranch, config.includeComponentInTag ? component : '', config.pullRequestTitlePattern);
+        const latestVersion = await latestReleaseVersion(github, targetBranch, version => isPublishedVersion(strategy, version), config.includeComponentInTag ? component : '', config.pullRequestTitlePattern);
         if (latestVersion) {
             releasedVersions[path] = latestVersion;
         }
@@ -173,7 +176,7 @@ class Manifest {
                 logger_1.logger.warn(`Unable to parse release name: ${release.name}`);
                 continue;
             }
-            const component = tagName.component || DEFAULT_COMPONENT_NAME;
+            const component = tagName.component || exports.DEFAULT_COMPONENT_NAME;
             const path = pathsByComponent[component];
             if (!path) {
                 logger_1.logger.warn(`Found release tag with component '${component}', but not configured in manifest`);
@@ -321,7 +324,9 @@ class Manifest {
             const latestRelease = releasesByPath[path];
             const releasePullRequest = await strategy.buildReleasePullRequest(pathCommits, latestRelease, (_a = config.draftPullRequest) !== null && _a !== void 0 ? _a : this.draftPullRequest, this.labels);
             if (releasePullRequest) {
-                if (releasePullRequest.version) {
+                // Update manifest, but only for valid release version - this will skip SNAPSHOT from java strategy
+                if (releasePullRequest.version &&
+                    isPublishedVersion(strategy, releasePullRequest.version)) {
                     const versionsMap = new Map();
                     versionsMap.set(path, releasePullRequest.version);
                     releasePullRequest.updates.push({
@@ -360,7 +365,7 @@ class Manifest {
                 continue;
             }
             const component = await strategiesByPath[path].getComponent();
-            const expectedTag = new tag_name_1.TagName(expectedVersion, component, this.repositoryConfig[path].tagSeparator);
+            const expectedTag = new tag_name_1.TagName(expectedVersion, component, this.repositoryConfig[path].tagSeparator, this.repositoryConfig[path].includeVInTag);
             logger_1.logger.debug(`looking for tagName: ${expectedTag.toString()}`);
             const foundTag = allTags[expectedTag.toString()];
             if (foundTag) {
@@ -415,7 +420,8 @@ class Manifest {
         const openPullRequests = [];
         const generator = this.github.pullRequestIterator(this.targetBranch, 'OPEN');
         for await (const openPullRequest of generator) {
-            if (hasAllLabels(this.labels, openPullRequest.labels) &&
+            if ((hasAllLabels(this.labels, openPullRequest.labels) ||
+                hasAllLabels(this.snapshotLabels, openPullRequest.labels)) &&
                 branch_name_1.BranchName.parse(openPullRequest.headBranchName) &&
                 pull_request_body_1.PullRequestBody.parse(openPullRequest.body)) {
                 openPullRequests.push(openPullRequest);
@@ -429,7 +435,7 @@ class Manifest {
         const snoozedPullRequests = [];
         const closedGenerator = this.github.pullRequestIterator(this.targetBranch, 'CLOSED');
         for await (const closedPullRequest of closedGenerator) {
-            if (hasAllLabels([SNOOZE_LABEL], closedPullRequest.labels) &&
+            if (hasAllLabels([exports.SNOOZE_LABEL], closedPullRequest.labels) &&
                 branch_name_1.BranchName.parse(closedPullRequest.headBranchName) &&
                 pull_request_body_1.PullRequestBody.parse(closedPullRequest.body)) {
                 snoozedPullRequests.push(closedPullRequest);
@@ -480,7 +486,7 @@ class Manifest {
             signoffUser: this.signoffUser,
         });
         // TODO: consider leaving the snooze label
-        await this.github.removeIssueLabels([SNOOZE_LABEL], snoozed.number);
+        await this.github.removeIssueLabels([exports.SNOOZE_LABEL], snoozed.number);
         return updatedPullRequest;
     }
     async *findMergedReleasePullRequests() {
@@ -671,6 +677,7 @@ function extractReleaserConfig(config) {
         versionFile: config['version-file'],
         extraFiles: config['extra-files'],
         includeComponentInTag: config['include-component-in-tag'],
+        includeVInTag: config['include-v-in-tag'],
         changelogType: config['changelog-type'],
         pullRequestTitlePattern: config['pull-request-title-pattern'],
         tagSeparator: config['tag-separator'],
@@ -693,6 +700,7 @@ async function parseConfig(github, configFile, branch) {
     }
     const configLabel = config['label'];
     const configReleaseLabel = config['release-label'];
+    const configSnapshotLabel = config['snapshot-label'];
     const manifestOptions = {
         bootstrapSha: config['bootstrap-sha'],
         lastReleaseSha: config['last-release-sha'],
@@ -702,6 +710,7 @@ async function parseConfig(github, configFile, branch) {
         plugins: config['plugins'],
         labels: configLabel === undefined ? undefined : [configLabel],
         releaseLabels: configReleaseLabel === undefined ? undefined : [configReleaseLabel],
+        snapshotLabels: configSnapshotLabel === undefined ? undefined : [configSnapshotLabel],
     };
     return { config: repositoryConfig, options: manifestOptions };
 }
@@ -720,16 +729,22 @@ async function parseReleasedVersions(github, manifestFile, branch) {
     }
     return releasedVersions;
 }
+function isPublishedVersion(strategy, version) {
+    return strategy.isPublishedVersion
+        ? strategy.isPublishedVersion(version)
+        : true;
+}
 /**
  * Find the most recent matching release tag on the branch we're
  * configured for.
  *
- * @param {string} prefix - Limit the release to a specific component.
- * @param {boolean} preRelease - Whether or not to return pre-release
- *   versions. Defaults to false.
+ * @param github GitHub client instance.
+ * @param {string} targetBranch Name of the scanned branch.
+ * @param releaseFilter Validator function for release version. Used to filter-out SNAPSHOT releases for Java strategy.
+ * @param {string} prefix Limit the release to a specific component.
+ * @param pullRequestTitlePattern Configured PR title pattern.
  */
-async function latestReleaseVersion(github, targetBranch, prefix, pullRequestTitlePattern) {
-    var _a;
+async function latestReleaseVersion(github, targetBranch, releaseFilter, prefix, pullRequestTitlePattern) {
     const branchPrefix = prefix
         ? prefix.endsWith('-')
             ? prefix.replace(/-$/, '')
@@ -764,11 +779,7 @@ async function latestReleaseVersion(github, targetBranch, prefix, pullRequestTit
             continue;
         }
         const version = pullRequestTitle.getVersion();
-        if ((_a = version === null || version === void 0 ? void 0 : version.preRelease) === null || _a === void 0 ? void 0 : _a.includes('SNAPSHOT')) {
-            // FIXME, don't hardcode this
-            continue;
-        }
-        if (version) {
+        if (version && releaseFilter(version)) {
             logger_1.logger.debug(`Found latest release pull request: ${mergedPullRequest.number} version: ${version}`);
             candidateReleaseVersions.push(version);
             break;
@@ -818,7 +829,7 @@ async function latestReleaseVersion(github, targetBranch, prefix, pullRequestTit
     return candidateTagVersion.sort((a, b) => b.compare(a))[0];
 }
 function mergeReleaserConfig(defaultConfig, pathConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     return {
         releaseType: (_b = (_a = pathConfig.releaseType) !== null && _a !== void 0 ? _a : defaultConfig.releaseType) !== null && _b !== void 0 ? _b : 'node',
         bumpMinorPreMajor: (_c = pathConfig.bumpMinorPreMajor) !== null && _c !== void 0 ? _c : defaultConfig.bumpMinorPreMajor,
@@ -834,8 +845,9 @@ function mergeReleaserConfig(defaultConfig, pathConfig) {
         versionFile: (_o = pathConfig.versionFile) !== null && _o !== void 0 ? _o : defaultConfig.versionFile,
         extraFiles: (_p = pathConfig.extraFiles) !== null && _p !== void 0 ? _p : defaultConfig.extraFiles,
         includeComponentInTag: (_q = pathConfig.includeComponentInTag) !== null && _q !== void 0 ? _q : defaultConfig.includeComponentInTag,
-        tagSeparator: (_r = pathConfig.tagSeparator) !== null && _r !== void 0 ? _r : defaultConfig.tagSeparator,
-        pullRequestTitlePattern: (_s = pathConfig.pullRequestTitlePattern) !== null && _s !== void 0 ? _s : defaultConfig.pullRequestTitlePattern,
+        includeVInTag: (_r = pathConfig.includeVInTag) !== null && _r !== void 0 ? _r : defaultConfig.includeVInTag,
+        tagSeparator: (_s = pathConfig.tagSeparator) !== null && _s !== void 0 ? _s : defaultConfig.tagSeparator,
+        pullRequestTitlePattern: (_t = pathConfig.pullRequestTitlePattern) !== null && _t !== void 0 ? _t : defaultConfig.pullRequestTitlePattern,
     };
 }
 /**

package/build/src/strategies/base.d.ts

@@ -37,6 +37,7 @@ export interface BaseStrategyOptions {
     releaseAs?: string;
     changelogNotes?: ChangelogNotes;
     includeComponentInTag?: boolean;
+    includeVInTag?: boolean;
     pullRequestTitlePattern?: string;
     extraFiles?: ExtraFile[];
 }
@@ -57,7 +58,8 @@ export declare abstract class BaseStrategy implements Strategy {
     private skipGitHubRelease;
     private releaseAs?;
     protected includeComponentInTag: boolean;
-    private pullRequestTitlePattern?;
+    protected includeVInTag: boolean;
+    readonly pullRequestTitlePattern?: string;
     readonly extraFiles: ExtraFile[];
     readonly changelogNotes: ChangelogNotes;
     protected changelogSections?: ChangelogSection[];
@@ -96,9 +98,9 @@ export declare abstract class BaseStrategy implements Strategy {
      *   open a pull request.
      */
     buildReleasePullRequest(commits: Commit[], latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest | undefined>;
-    private extraFileUpdates;
+    protected extraFileUpdates(version: Version, versionsMap: VersionsMap): Update[];
     protected changelogEmpty(changelogEntry: string): boolean;
-    protected updateVersionsMap(versionsMap: VersionsMap, conventionalCommits: ConventionalCommit[]): Promise<VersionsMap>;
+    protected updateVersionsMap(versionsMap: VersionsMap, conventionalCommits: ConventionalCommit[], _newVersion: Version): Promise<VersionsMap>;
     protected buildNewVersion(conventionalCommits: ConventionalCommit[], latestRelease?: Release): Promise<Version>;
     protected buildVersionsMap(_conventionalCommits: ConventionalCommit[]): Promise<VersionsMap>;
     protected parsePullRequestBody(pullRequestBody: string): Promise<PullRequestBody | undefined>;

package/build/src/strategies/base.js

@@ -28,6 +28,7 @@ const composite_1 = require("../updaters/composite");
 const generic_1 = require("../updaters/generic");
 const generic_json_1 = require("../updaters/generic-json");
 const generic_xml_1 = require("../updaters/generic-xml");
+const pom_xml_1 = require("../updaters/java/pom-xml");
 const DEFAULT_CHANGELOG_PATH = 'CHANGELOG.md';
 /**
  * A strategy is responsible for determining which files are
@@ -35,7 +36,7 @@ const DEFAULT_CHANGELOG_PATH = 'CHANGELOG.md';
  */
 class BaseStrategy {
     constructor(options) {
-        var _a;
+        var _a, _b;
         this.path = options.path || manifest_1.ROOT_PROJECT_PATH;
         this.github = options.github;
         this.packageName = options.packageName;
@@ -53,6 +54,7 @@ class BaseStrategy {
         this.changelogNotes =
             options.changelogNotes || new default_2.DefaultChangelogNotes(options);
         this.includeComponentInTag = (_a = options.includeComponentInTag) !== null && _a !== void 0 ? _a : true;
+        this.includeVInTag = (_b = options.includeVInTag) !== null && _b !== void 0 ? _b : true;
         this.pullRequestTitlePattern = options.pullRequestTitlePattern;
         this.extraFiles = options.extraFiles || [];
     }
@@ -133,10 +135,10 @@ class BaseStrategy {
             return undefined;
         }
         const newVersion = await this.buildNewVersion(conventionalCommits, latestRelease);
-        const versionsMap = await this.updateVersionsMap(await this.buildVersionsMap(conventionalCommits), conventionalCommits);
+        const versionsMap = await this.updateVersionsMap(await this.buildVersionsMap(conventionalCommits), conventionalCommits, newVersion);
         const component = await this.getComponent();
         logger_1.logger.debug('component:', component);
-        const newVersionTag = new tag_name_1.TagName(newVersion, this.includeComponentInTag ? component : undefined, this.tagSeparator);
+        const newVersionTag = new tag_name_1.TagName(newVersion, this.includeComponentInTag ? component : undefined, this.tagSeparator, this.includeVInTag);
         logger_1.logger.debug('pull request title pattern:', this.pullRequestTitlePattern);
         const pullRequestTitle = pull_request_title_1.PullRequestTitle.ofComponentTargetBranchVersion(component || '', this.targetBranch, newVersion, this.pullRequestTitlePattern);
         const branchName = component
@@ -153,7 +155,7 @@ class BaseStrategy {
             versionsMap,
             latestVersion: latestRelease === null || latestRelease === void 0 ? void 0 : latestRelease.tag.version,
         });
-        const updatesWithExtras = composite_1.mergeUpdates(updates.concat(...this.extraFileUpdates(newVersion)));
+        const updatesWithExtras = composite_1.mergeUpdates(updates.concat(...this.extraFileUpdates(newVersion, versionsMap)));
         const pullRequestBody = await this.buildPullRequestBody(component, newVersion, releaseNotesBody, conventionalCommits, latestRelease);
         return {
             title: pullRequestTitle,
@@ -165,7 +167,7 @@ class BaseStrategy {
             draft: draft !== null && draft !== void 0 ? draft : false,
         };
     }
-    extraFileUpdates(version) {
+    extraFileUpdates(version, versionsMap) {
         return this.extraFiles.map(extraFile => {
             if (typeof extraFile === 'object') {
                 switch (extraFile.type) {
@@ -181,6 +183,12 @@ class BaseStrategy {
                             createIfMissing: false,
                             updater: new generic_xml_1.GenericXml(extraFile.xpath, version),
                         };
+                    case 'pom':
+                        return {
+                            path: this.addPath(extraFile.path),
+                            createIfMissing: false,
+                            updater: new pom_xml_1.PomXml(version),
+                        };
                     default:
                         throw new Error(`unsupported extraFile type: ${extraFile.type}`);
                 }
@@ -188,14 +196,14 @@ class BaseStrategy {
             return {
                 path: this.addPath(extraFile),
                 createIfMissing: false,
-                updater: new generic_1.Generic({ version }),
+                updater: new generic_1.Generic({ version, versionsMap }),
             };
         });
     }
     changelogEmpty(changelogEntry) {
         return changelogEntry.split('\n').length <= 1;
     }
-    async updateVersionsMap(versionsMap, conventionalCommits) {
+    async updateVersionsMap(versionsMap, conventionalCommits, _newVersion) {
         for (const versionKey of versionsMap.keys()) {
             const version = versionsMap.get(versionKey);
             if (!version) {
@@ -288,7 +296,7 @@ class BaseStrategy {
             logger_1.logger.error('Pull request should have included version');
             return;
         }
-        const tag = new tag_name_1.TagName(version, this.includeComponentInTag ? component : undefined, this.tagSeparator);
+        const tag = new tag_name_1.TagName(version, this.includeComponentInTag ? component : undefined, this.tagSeparator, this.includeVInTag);
         const releaseName = component && this.includeComponentInTag
             ? `${component}: v${version.toString()}`
             : `v${version.toString()}`;

package/build/src/strategies/dotnet-yoshi.d.ts

@@ -0,0 +1,12 @@
+import { BaseStrategy, BuildUpdatesOptions, BaseStrategyOptions } from './base';
+import { Update } from '../update';
+import { ConventionalCommit } from '../commit';
+import { Version } from '../version';
+import { TagName } from '../util/tag-name';
+import { Release } from '../release';
+export declare class DotnetYoshi extends BaseStrategy {
+    constructor(options: BaseStrategyOptions);
+    protected buildReleaseNotes(conventionalCommits: ConventionalCommit[], newVersion: Version, newVersionTag: TagName, latestRelease?: Release): Promise<string>;
+    private getApi;
+    protected buildUpdates(options: BuildUpdatesOptions): Promise<Update[]>;
+}