From 6084ddcaf165c8ec8a8483bf3d17e8eb1d4ffffc Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 18 May 2020 03:36:40 +0200 Subject: [PATCH 1/6] fix: upgrade com.fasterxml.jackson.core:jackson-databind from 2.10.3 to 2.11.0 Snyk has created this PR to upgrade com.fasterxml.jackson.core:jackson-databind from 2.10.3 to 2.11.0. See this package in NPM: https://www.npmjs.com/package/com.fasterxml.jackson.core:jackson-databind See this project in Snyk: https://app.snyk.io/org/scm-manager/project/e67572ee-5940-4f2b-93b0-dced62d7ed85?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 088a910159..f36487867c 100644 --- a/pom.xml +++ b/pom.xml @@ -912,7 +912,7 @@ 2.1.1 4.5.3.Final 1.19.4 - 2.10.3 + 2.11.0 4.2.3 2.3.1 6.1.4.Final From e63889ec8b8682a86831918f8c92c1fa8fe83c08 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 18 May 2020 13:46:04 +0200 Subject: [PATCH 2/6] use packages.scm-manager.org instead of maven.scm-manager.org --- Jenkinsfile | 11 +++++++++-- pom.xml | 20 ++++++++++---------- scm-plugins/scm-git-plugin/pom.xml | 12 ------------ scm-plugins/scm-hg-plugin/pom.xml | 10 ---------- scm-plugins/scm-svn-plugin/pom.xml | 6 ------ 5 files changed, 19 insertions(+), 40 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c6415c158c..7b0e8e9f08 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ // switch back to a stable tag, after pr 22 is mreged an the next version is released // see https://github.com/cloudogu/ces-build-lib/pull/22 -@Library('github.com/cloudogu/ces-build-lib@develop') +@Library('github.com/cloudogu/ces-build-lib@7a14da6') import com.cloudogu.ces.cesbuildlib.* node('docker') { @@ -108,7 +108,14 @@ node('docker') { sh "rm -rf scm-server/target/appassembler" // deploy java artifacts - mvn.useRepositoryCredentials([id: 'maven.scm-manager.org', url: 'https://maven.scm-manager.org/nexus', credentialsId: 'maven.scm-manager.org', type: 'Nexus2']) + mvn.useDeploymentRepository([ + id: 'packages.scm-manager.org', + url: 'https://packages.scm-manager.org', + credentialsId: 'maven.scm-manager.org', + snapshotRepository: '/repository/snapshots/', + releaseRepository: '/repository/releases/', + type: 'Configurable' + ]) mvn.deployToNexusRepository() // deploy frontend bits diff --git a/pom.xml b/pom.xml index f36487867c..a8b0ea528e 100644 --- a/pom.xml +++ b/pom.xml @@ -105,9 +105,9 @@ - maven.scm-manager.org - scm-manager release repository - http://maven.scm-manager.org/nexus/content/groups/public + packages.scm-manager.org + scm-manager public repository + https://packages.scm-manager.org/repository/public/ @@ -115,9 +115,9 @@ - maven.scm-manager.org - scm-manager release repository - http://maven.scm-manager.org/nexus/content/groups/public + packages.scm-manager.org + scm-manager public repository + https://packages.scm-manager.org/repository/public/ true @@ -885,15 +885,15 @@ - maven.scm-manager.org + packages.scm-manager.org scm-manager release repository - http://maven.scm-manager.org/nexus/content/repositories/releases + https://packages.scm-manager.org/repository/releases/ - maven.scm-manager.org + packages.scm-manager.org scm-manager snapshot repository - http://maven.scm-manager.org/nexus/content/repositories/snapshots + https://packages.scm-manager.org/repository/snapshots/ diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 6a3e2235cc..fbfd5ff62f 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -103,16 +103,4 @@ - - - - - - maven.scm-manager.org - scm-manager release repository - http://maven.scm-manager.org/nexus/content/groups/public - - - - diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 3be2a979be..4457eb202f 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -85,14 +85,4 @@ - - - - maven.scm-manager.org - scm-manager release repository - http://maven.scm-manager.org/nexus/content/groups/public - - - - diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 0a75769180..b8a011ef85 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -98,12 +98,6 @@ https://maven.tmatesoft.com/content/repositories/releases - - maven.scm-manager.org - scm-manager release repository - http://maven.scm-manager.org/nexus/content/groups/public - - From 31ffed43b7d79aa0d17e90a0a697318af5674184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 18 May 2020 13:55:59 +0200 Subject: [PATCH 3/6] Support copy and renamed modifications for hg --- CHANGELOG.md | 1 + .../src/main/java/sonia/scm/store/JAXBDataStore.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afafc0d4e6..711639ae90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Handle obscure line breaks in diff viewer ([#1129](https://github.com/scm-manager/scm-manager/pull/1129)) - Validate subversion client checksum ([#1113](https://github.com/scm-manager/scm-manager/issues/1113)) - Fix plugin manage permission ([#1135](https://github.com/scm-manager/scm-manager/pull/1135)) +- Missing copy on write in the data store ([#1155](https://github.com/scm-manager/scm-manager/pull/1155)) ## [2.0.0-rc7] - 2020-04-09 ### Added diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java index a4181c5c8d..036fe27f9c 100644 --- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java +++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.store; //~--- non-JDK imports -------------------------------------------------------- @@ -84,7 +84,10 @@ public class JAXBDataStore extends FileBasedStore implements DataStore Marshaller marshaller = context.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); - marshaller.marshal(item, file); + CopyOnWrite.withTemporaryFile( + temp -> marshaller.marshal(item, temp.toFile()), + file.toPath() + ); } catch (JAXBException ex) { throw new StoreException("could not write object with id ".concat(id), From 15c82dd4655706b6ea80cd1183c01168948953ce Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 18 May 2020 16:05:01 +0200 Subject: [PATCH 4/6] update installation docs to use rc8 from packages.scm-manager.org --- docs/en/installation/linux.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/installation/linux.md b/docs/en/installation/linux.md index ced1276e7f..d1cd4a93a8 100644 --- a/docs/en/installation/linux.md +++ b/docs/en/installation/linux.md @@ -12,18 +12,18 @@ If you want to use [Mercurial](https://www.mercurial-scm.org/), ensure it is ins ## Installation -Download [scm-server-2.0.0-rc5-app.tar.gz](https://maven.scm-manager.org/nexus/service/local/repositories/releases/content/sonia/scm/scm-server/2.0.0-rc5/scm-server-2.0.0-rc5-app.tar.gz) -and verify the checksum (sha1: 3b2dff3fda0c46362c518be37edd4e77bccc88bb). +Download [scm-server-2.0.0-rc8-app.tar.gz](https://packages.scm-manager.org/repository/releases/content/sonia/scm/scm-server/2.0.0-rc8/scm-server-2.0.0-rc8-app.tar.gz) +and verify the checksum (sha1: 8bf465525d5a8c5907d1f74096af1783bc0b2fa7). ```bash -wget https://maven.scm-manager.org/nexus/service/local/repositories/releases/content/sonia/scm/scm-server/2.0.0-rc5/scm-server-2.0.0-rc5-app.tar.gz -echo "3b2dff3fda0c46362c518be37edd4e77bccc88bb *scm-server-2.0.0-rc5-app.tar.gz" | sha1sum -c - +wget https://packages.scm-manager.org/repository/releases/content/sonia/scm/scm-server/2.0.0-rc8/scm-server-2.0.0-rc8-app.tar.gz +echo "8bf465525d5a8c5907d1f74096af1783bc0b2fa7 *scm-server-2.0.0-rc8-app.tar.gz" | sha1sum -c - ``` Extract the archive: ```bash -tar xvfz scm-server-2.0.0-rc5-app.tar.gz -C /opt +tar xvfz scm-server-2.0.0-rc8-app.tar.gz -C /opt ``` ## Start From 1eeca18ee895d3aa2bba4219a3e76ce786aaaeb9 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 19 May 2020 00:16:08 +0200 Subject: [PATCH 5/6] fix: upgrade org.apache.shiro:shiro-core from 1.5.2 to 1.5.3 Snyk has created this PR to upgrade org.apache.shiro:shiro-core from 1.5.2 to 1.5.3. See this package in NPM: https://www.npmjs.com/package/org.apache.shiro:shiro-core See this project in Snyk: https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?utm_source=github&utm_medium=upgrade-pr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8b0ea528e..b1e63cdadc 100644 --- a/pom.xml +++ b/pom.xml @@ -926,7 +926,7 @@ 1.2.0 - 1.5.2 + 1.5.3 5.6.1.202002131546-r-scm1 From 3a92aae21c15d75219b524d0066e7b5da2e41f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 19 May 2020 09:54:05 +0200 Subject: [PATCH 6/6] Escape > in html --- scm-plugins/scm-git-plugin/src/main/js/CloneInformation.tsx | 2 +- .../scm-hg-plugin/src/main/js/ProtocolInformation.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/js/CloneInformation.tsx b/scm-plugins/scm-git-plugin/src/main/js/CloneInformation.tsx index 439e4e1b50..c3b1c5b36f 100644 --- a/scm-plugins/scm-git-plugin/src/main/js/CloneInformation.tsx +++ b/scm-plugins/scm-git-plugin/src/main/js/CloneInformation.tsx @@ -48,7 +48,7 @@ class CloneInformation extends React.Component { cd {repository.name}
echo "# {repository.name} - " > README.md + " > README.md
git add README.md
diff --git a/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.tsx b/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.tsx index 9906947403..1a23cf5428 100644 --- a/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.tsx +++ b/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.tsx @@ -50,13 +50,13 @@ class ProtocolInformation extends React.Component {
cd {repository.name}
- echo "[paths]" > .hg/hgrc + echo "[paths]" > .hg/hgrc
echo "default = {href} - " > .hg/hgrc + " > .hg/hgrc
echo "# {repository.name} - " > README.md + " > README.md
hg add README.md