release-please 14.10.0 → 14.10.2

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [14.10.2](https://github.com/googleapis/release-please/compare/v14.10.1...v14.10.2) (2022-10-04)
+
+
+### Bug Fixes
+
+* **maven-workspace:** Preserve original pom.xml updater when bumping dependencies ([#1680](https://github.com/googleapis/release-please/issues/1680)) ([5d955c6](https://github.com/googleapis/release-please/commit/5d955c6e0c5896d2aedea08c5c0f12ac35972757))
+
+## [14.10.1](https://github.com/googleapis/release-please/compare/v14.10.0...v14.10.1) (2022-10-03)
+
+
+### Bug Fixes
+
+* Put config schema on correct file ([#1678](https://github.com/googleapis/release-please/issues/1678)) ([6edc50b](https://github.com/googleapis/release-please/commit/6edc50b5599180b7ffa83a623559d328527e9274))
+
 ## [14.10.0](https://github.com/googleapis/release-please/compare/v14.9.0...v14.10.0) (2022-09-30)
 
 

package/README.md

@@ -121,8 +121,8 @@ prefixes: "feat", "fix", and "deps".
 Some languages have their specific releasable unit configuration. For example,
 "docs" is a prefix for releasable units in Java and Python.
 
-If you think Release Please missed to create a release PR after a pull request
-with with releasable unit has been merged, please re-run `release-please`. If you are using
+If you think Release Please missed creating a release PR after a pull request
+with a releasable unit has been merged, please re-run `release-please`. If you are using
 the GitHub application, add `release-please:force-run` label to the merged pull request. If
 you are using the action, look for the failed invocation and retry the workflow run.
 Release Please will process the pull request immediately to find releasable units.
@@ -171,7 +171,7 @@ for installation and configuration instructions.
 ## Bootstrapping your Repository
 
 Release Please looks at commits since your last release tag. It may or may not be able to find
-your previous releases. The easiest way to on-board your repository is to
+your previous releases. The easiest way to onboard your repository is to
 [bootstrap a manifest config](/docs/cli.md#bootstrapping).
 
 ## Customizing Release Please

package/build/src/plugins/maven-workspace.js

@@ -26,6 +26,7 @@ const pull_request_title_1 = require("../util/pull-request-title");
 const pull_request_body_1 = require("../util/pull-request-body");
 const branch_name_1 = require("../util/branch-name");
 const logger_1 = require("../util/logger");
+const composite_1 = require("../updaters/composite");
 const JAVA_RELEASE_TYPES = new Set(['java', 'java-bom', 'java-yoshi', 'maven']);
 const XPATH_PROJECT_GROUP = '/*[local-name()="project"]/*[local-name()="groupId"]';
 const XPATH_PROJECT_ARTIFACT = '/*[local-name()="project"]/*[local-name()="artifactId"]';
@@ -149,7 +150,7 @@ class MavenWorkspace extends workspace_1.WorkspacePlugin {
         existingCandidate.pullRequest.updates =
             existingCandidate.pullRequest.updates.map(update => {
                 if (update.path === (0, workspace_1.addPath)(existingCandidate.path, 'pom.xml')) {
-                    update.updater = updater;
+                    update.updater = new composite_1.CompositeUpdater(update.updater, updater);
                 }
                 else if (update.updater instanceof changelog_1.Changelog) {
                     if (dependencyNotes) {

package/build/src/updaters/release-please-config.js

@@ -15,12 +15,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleasePleaseConfig = void 0;
 const json_stringify_1 = require("../util/json-stringify");
+const SCHEMA_URL = 'https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json';
 class ReleasePleaseConfig {
     constructor(path, config) {
         this.path = path;
         this.config = config;
     }
     updateContent(content) {
+        var _a;
         let parsed;
         if (content) {
             parsed = JSON.parse(content);
@@ -28,6 +30,7 @@ class ReleasePleaseConfig {
         else {
             parsed = { packages: {} };
         }
+        parsed['$schema'] = (_a = parsed['$schema']) !== null && _a !== void 0 ? _a : SCHEMA_URL;
         parsed.packages[this.path] = releaserConfigToJsonConfig(this.config);
         if (content) {
             return (0, json_stringify_1.jsonStringify)(parsed, content);

package/build/src/updaters/release-please-manifest.js

@@ -16,14 +16,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleasePleaseManifest = void 0;
 const json_stringify_1 = require("../util/json-stringify");
 const default_1 = require("./default");
-const SCHEMA_URL = 'https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json;';
 class ReleasePleaseManifest extends default_1.DefaultUpdater {
     updateContent(content) {
         const parsed = content ? JSON.parse(content) : {};
         for (const [path, version] of this.versionsMap) {
             parsed[path] = version.toString();
         }
-        parsed['$schema'] = SCHEMA_URL;
         if (content) {
             return (0, json_stringify_1.jsonStringify)(parsed, content);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "14.10.0",
+  "version": "14.10.2",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -63,7 +63,7 @@
     "gts": "^3.1.0",
     "mocha": "^9.2.2",
     "nock": "^13.0.0",
-    "sinon": "14.0.0",
+    "sinon": "14.0.1",
     "snap-shot-it": "^7.0.0"
   },
   "dependencies": {