[maven-release-plugin][skip ci] prepare release repo-5439v2-c1

[release][skip tests] repo-5439v2-c1
test releas
2025-09-10 14:11:58 +00:00 · 2021-02-15 08:55:30 +00:00 · 2021-02-15 10:47:54 +02:00 · 2021-02-15 10:01:52 +02:00 · 2021-02-15 10:01:08 +02:00 · 2021-02-15 09:46:14 +02:00
21 changed files with 24 additions and 72 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ stages:
  - name: test
    if: commit_message !~ /\[skip tests\]/
  - name: release
-    if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message !~ /\[no release\]/
+    if: fork = false AND (branch = master OR branch =~ /release\/.*/ OR branch =~/fix\/.*/) AND type != pull_request AND commit_message !~ /\[no release\]/
  - name: update_downstream
    if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message !~ /\[no downstream\]/
  - name: trigger_downstream
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>8.393-SNAPSHOT</version>
+      <version>repo-5439v2-c1</version>
   </parent>

   <dependencies>
--- a/core/src/main/java/org/alfresco/util/cache/AbstractAsynchronouslyRefreshedCache.java
+++ b/core/src/main/java/org/alfresco/util/cache/AbstractAsynchronouslyRefreshedCache.java
@@ -424,6 +424,7 @@ public abstract class AbstractAsynchronouslyRefreshedCache<T>
        @Override
        public Void call()
        {
+            liveLock.writeLock().lock();
            try
            {
                doCall();
@@ -444,6 +445,10 @@ public abstract class AbstractAsynchronouslyRefreshedCache<T>
                }
                return null;
            }
+            finally
+            {
+                liveLock.writeLock().unlock();
+            }
        }

        private void doCall() throws Exception
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <properties>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <profiles>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <properties>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>8.393-SNAPSHOT</version>
+    <version>repo-5439v2-c1</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -116,7 +116,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>HEAD</tag>
+        <tag>repo-5439v2-c1</tag>
    </scm>

    <distributionManagement>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>8.393-SNAPSHOT</version>
+        <version>repo-5439v2-c1</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/cache/DefaultSimpleCache.java
+++ b/repository/src/main/java/org/alfresco/repo/cache/DefaultSimpleCache.java
@@ -150,24 +150,10 @@ public final class DefaultSimpleCache<K extends Serializable, V extends Object>
     * @return <code>true</code> if the put resulted in a change in value, <code>false</code> otherwise.
     */
    public boolean putAndCheckUpdate(K key, V value)
-    {
-        return putAndCheckUpdate(key, value, false);
-    }
-
-    /**
-     * <code>put</code> method that may be used to check for updates in a thread-safe manner.
-     *
-     * @param includeNewCheck if true then we include the new value in the check
-     * @return <code>true</code> if the put resulted in a change in value, 
-     *     or if includeNewCheck is true and the put resulted in a new value, 
-     *     <code>false</code> otherwise.
-     */
-    public boolean putAndCheckUpdate(K key, V value, boolean includeNewCheck)
    {
        AbstractMap.SimpleImmutableEntry<K, V> kvp = new AbstractMap.SimpleImmutableEntry<K, V>(key, value);
        AbstractMap.SimpleImmutableEntry<K, V> priorKVP = cache.asMap().put(key, kvp);
-
-        return (includeNewCheck && priorKVP == null) || (priorKVP != null && (!priorKVP.equals(kvp)));
+        return (priorKVP != null && (!priorKVP.equals(kvp)));
    }
    
    @Override
--- a/repository/src/main/resources/alfresco/tx-cache-context.xml
+++ b/repository/src/main/resources/alfresco/tx-cache-context.xml
@@ -136,7 +136,6 @@
      <property name="tenantAware" value="false" />
      <property name="cacheStats" ref="cacheStatistics"/>
      <property name="cacheStatsEnabled" value="${cache.immutableEntitySharedCache.tx.statsEnabled}"/>
-      <property name="allowEqualsChecks" value="true" />
   </bean>
   
   
--- a/repository/src/test/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java
+++ b/repository/src/test/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java
@@ -131,45 +131,6 @@ public class DefaultSimpleCacheTest extends SimpleCacheTestBase<DefaultSimpleCac
        assertEquals(false, cache.putAndCheckUpdate(104, "104"));
        assertEquals(true, cache.putAndCheckUpdate(104, null));
    }
-
-    @Test
-    public void putAndCheckUpdateIncludeNewCheck()
-    {
-        // Put an initial value
-        cache.put(101, "101");
-        // Update it
-        assertEquals(true, cache.putAndCheckUpdate(101, "99101", true));
-        // Check the value really was updated
-        assertEquals("99101", cache.get(101));
-
-        // Precondition: no value for key 102
-        assertFalse(cache.contains(102));
-        // Put a value - and test the return
-        assertEquals(true, cache.putAndCheckUpdate(102, "102", true));
-        assertEquals("102", cache.get(102));
-
-        cache.put(103, null);
-        assertEquals(true, cache.putAndCheckUpdate(103, "103", true));
-        // Repeat the put, this should not be an update
-        assertEquals(false, cache.putAndCheckUpdate(103, "103", true));
-
-        assertFalse(cache.contains(104));
-        assertEquals(true, cache.putAndCheckUpdate(104, null, true));
-        // Repeat putting null - still not an update, as we had that value a moment ago.
-        assertEquals(false, cache.putAndCheckUpdate(104, null, true));
-        // Now an update
-        assertEquals(true, cache.putAndCheckUpdate(104, "104", true));
-        // Another update
-        assertEquals(true, cache.putAndCheckUpdate(104, "99104", true));
-        // Another update, back to null
-        assertEquals(true, cache.putAndCheckUpdate(104, null, true));
-        // Not an update - still null
-        assertEquals(false, cache.putAndCheckUpdate(104, null, true));
-
-        cache.remove(104);
-        assertEquals(true, cache.putAndCheckUpdate(104, "104", true));
-        assertEquals(true, cache.putAndCheckUpdate(104, null, true));
-    }
    
    // TODO: Timer-based tests are not ideal. An alternative approach is to factor out the CacheBuilder.newBuilder()
    // call to a protected method, override that in this test class to return a mock and use the mock to check
--- a/scripts/travis/maven_release.sh
+++ b/scripts/travis/maven_release.sh
@@ -14,6 +14,7 @@ git config user.email "${GIT_EMAIL}"
 mvn -B \
  -PfullBuild,all-tas-tests \
  "-Darguments=-PfullBuild,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
+  -DreleaseVersion=repo-5439v2-c1 -DdevelopmentVersion=8.393-SNAPSHOT \
  release:clean release:prepare release:perform \
  -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
  -Dusername="${GIT_USERNAME}" \
Author	SHA1	Message	Date
Travis CI User	019ad6da47	[maven-release-plugin][skip ci] prepare release repo-5439v2-c1	2021-02-15 08:55:30 +00:00
cturlica	a17bb830f2	[release][skip tests] repo-5439v2-c1	2021-02-15 10:47:54 +02:00
cturlica	d062140883	test releas	2021-02-15 10:01:52 +02:00
cturlica	993f42c877	clean up default simple cache reverted allowEqualsChecks setting	2021-02-15 10:01:08 +02:00
cturlica	6ba5c3ac35	fixed deadlock	2021-02-15 09:46:14 +02:00
cturlica	a9cf423885	Merge branch 'master' of github.com:Alfresco/alfresco-community-repo into fix/REPO-5439v2	2021-02-15 09:43:29 +02:00
cturlica	047c47def4	M3 - version	2021-02-01 14:08:00 +02:00