fixed merged conflicts in CHANGELOG.md

2026-02-01 12:19:14 +01:00 · 2020-05-20 09:14:09 +02:00
parent d316cf51c8 3a92aae21c
commit 033c5168a9
10 changed files with 39 additions and 55 deletions
--- 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
--- a/11
+++ b/11
@@ -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
--- 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
--- a/pom.xml
+++ b/pom.xml
@@ -105,9 +105,9 @@
  <repositories>

    <repository>
-      <id>maven.scm-manager.org</id>
-      <name>scm-manager release repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
+      <id>packages.scm-manager.org</id>
+      <name>scm-manager public repository</name>
+      <url>https://packages.scm-manager.org/repository/public/</url>
    </repository>

  </repositories>
@@ -115,9 +115,9 @@
  <pluginRepositories>

    <pluginRepository>
-      <id>maven.scm-manager.org</id>
-      <name>scm-manager release repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
+      <id>packages.scm-manager.org</id>
+      <name>scm-manager public repository</name>
+      <url>https://packages.scm-manager.org/repository/public/</url>
      <snapshots>
        <enabled>true</enabled>
      </snapshots>
@@ -885,15 +885,15 @@
  <distributionManagement>

    <repository>
-      <id>maven.scm-manager.org</id>
+      <id>packages.scm-manager.org</id>
      <name>scm-manager release repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/repositories/releases</url>
+      <url>https://packages.scm-manager.org/repository/releases/</url>
    </repository>

    <snapshotRepository>
-      <id>maven.scm-manager.org</id>
+      <id>packages.scm-manager.org</id>
      <name>scm-manager snapshot repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/repositories/snapshots</url>
+      <url>https://packages.scm-manager.org/repository/snapshots/</url>
    </snapshotRepository>

  </distributionManagement>
@@ -912,7 +912,7 @@
    <jaxrs.version>2.1.1</jaxrs.version>
    <resteasy.version>4.5.3.Final</resteasy.version>
    <jersey-client.version>1.19.4</jersey-client.version>
-    <jackson.version>2.10.3</jackson.version>
+    <jackson.version>2.11.0</jackson.version>
    <guice.version>4.2.3</guice.version>
    <jaxb.version>2.3.1</jaxb.version>
    <hibernate-validator.version>6.1.4.Final</hibernate-validator.version>
@@ -926,7 +926,7 @@

    <!-- security libraries -->
    <ssp.version>1.2.0</ssp.version>
-    <shiro.version>1.5.2</shiro.version>
+    <shiro.version>1.5.3</shiro.version>

    <!-- repository libraries -->
    <jgit.version>5.6.1.202002131546-r-scm1</jgit.version>
--- 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<T> extends FileBasedStore<T> implements DataStore<T>
      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),
--- a/scm-plugins/scm-git-plugin/pom.xml
+++ b/scm-plugins/scm-git-plugin/pom.xml
@@ -103,16 +103,4 @@
    </plugins>
  </build>

-  <!-- for jgit -->
-
-  <repositories>
-
-    <repository>
-      <id>maven.scm-manager.org</id>
-      <name>scm-manager release repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
-    </repository>
-
-  </repositories>
-
 </project>
--- 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<Props> {
            cd {repository.name}
            <br />
            echo "# {repository.name}
-            " > README.md
+            " &gt; README.md
            <br />
            git add README.md
            <br />
--- a/scm-plugins/scm-hg-plugin/pom.xml
+++ b/scm-plugins/scm-hg-plugin/pom.xml
@@ -85,14 +85,4 @@
    </plugins>
  </build>

-  <repositories>
-
-    <repository>
-      <id>maven.scm-manager.org</id>
-      <name>scm-manager release repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
-    </repository>
-
-  </repositories>
-
 </project>
--- 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<Props> {
            <br />
            cd {repository.name}
            <br />
-            echo "[paths]" > .hg/hgrc
+            echo "[paths]" &gt; .hg/hgrc
            <br />
            echo "default = {href}
-            " > .hg/hgrc
+            " &gt; .hg/hgrc
            <br />
            echo "# {repository.name}
-            " > README.md
+            " &gt; README.md
            <br />
            hg add README.md
            <br />
--- a/scm-plugins/scm-svn-plugin/pom.xml
+++ b/scm-plugins/scm-svn-plugin/pom.xml
@@ -98,12 +98,6 @@
      <url>https://maven.tmatesoft.com/content/repositories/releases</url>
    </repository>

-    <repository>
-      <id>maven.scm-manager.org</id>
-      <name>scm-manager release repository</name>
-      <url>http://maven.scm-manager.org/nexus/content/groups/public</url>
-    </repository>
-
  </repositories>

 </project>