diff --git a/CHANGELOG.md b/CHANGELOG.md
index f085786cde..4361259da9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-##Unreleased
+## Unreleased
+### Fixed
+- Correctly resolve Links in markdown files ([#1152](https://github.com/scm-manager/scm-manager/pull/1152))
## [2.0.0-rc8] - 2020-05-08
### Added
@@ -26,7 +28,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))
-- Correctly resolve Links in markdown files ([#1152](https://github.com/scm-manager/scm-manager/pull/1152))
+- 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/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/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
diff --git a/pom.xml b/pom.xml
index 088a910159..b1e63cdadc 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/
@@ -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
@@ -926,7 +926,7 @@
1.2.0
- 1.5.2
+ 1.5.3
5.6.1.202002131546-r-scm1
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),
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-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/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-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
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
-
-