Merge pull request #349 from xenit-eu/master

Release Dynamic Extensions v2.1.3
xenit-eu · Apr 12, 2022 · 43425e6 · 43425e6
2 parents 0b3cffb + 5508857
commit 43425e6
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,4 +67,4 @@ jobs:
         env:
           GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PLUGINS_PUBLISH_KEY }}
           GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PLUGINS_PUBLISH_SECRET }}
-        run: ./gradlew publishPlugins -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET
+        run: ./gradlew publishPlugins -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ---
 title: Changelog - Dynamic Extensions for Alfresco
-date: 03 February 2022
+date: 11 April 2022
 report: true
 colorlinks: true
 ---
@@ -21,6 +21,12 @@ Version template:
  -->
 # Dynamic Extensions For Alfresco Changelog
 
+## [2.1.3] - 2022-04-11
+### Added
+* [#344](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/344) Made it possible to configure boot delegation in OSGI framework context
+* [#346](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/346) Added Alfresc 7.1 compatibility
+* [#347](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/347) Added Alfresc 7.2 compatibility
+
 ## [2.1.2] - 2022-02-03
 ### Fixed
 * [#338](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/338) DEVEM-499 Fix @ActionMethod usage on Alfresco 7.0

diff --git a/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-71/module.properties b/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-71/module.properties
@@ -0,0 +1,7 @@
+module.id = ${project.parent.name}
+module.version = ${project.version.replace('-SNAPSHOT','')}
+module.title = Dynamic Extensions for Alfresco ${project.ext.simpleAlfrescoVersion}
+module.description = Dynamic Extensions for Alfresco module package
+
+module.repo.version.min=7.1.0
+module.repo.version.max=7.1.99
diff --git a/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-72/module.properties b/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-72/module.properties
@@ -0,0 +1,7 @@
+module.id = ${project.parent.name}
+module.version = ${project.version.replace('-SNAPSHOT','')}
+module.title = Dynamic Extensions for Alfresco ${project.ext.simpleAlfrescoVersion}
+module.description = Dynamic Extensions for Alfresco module package
+
+module.repo.version.min=7.2.0
+module.repo.version.max=7.2.99
diff --git a/alfresco-dynamic-extensions-repo/build.gradle b/alfresco-dynamic-extensions-repo/build.gradle
@@ -47,7 +47,9 @@ subprojects {
             blueprint(project(":blueprint-integration:blueprint-integration-spring-5"))
         }
 
-        if (project.name.endsWith('-70')) {
+        PrintWriter writer = null;
+        writer.println("project name: "+project.name);
+        if (project.name.matches("alfresco-dynamic-extensions-repo-7\\d*")) {
             ampLib project(':webscripts:webscripts-70')
         } else {
             ampLib project(':webscripts:webscripts-50')

diff --git a/...co-integration/src/main/java/com/github/dynamicextensionsalfresco/osgi/Configuration.java b/...co-integration/src/main/java/com/github/dynamicextensionsalfresco/osgi/Configuration.java
@@ -55,6 +55,17 @@ public File getSystemPackageCache() {
         return this.systemPackageCache;
     }
 
+    public String getBootdelegation() {
+        return bootdelegation;
+    }
+
+    public void setBootdelegation(String bootdelegation) {
+        this.bootdelegation = bootdelegation;
+    }
+
+    private String bootdelegation = null;
+
+
     private static File createTempFile(String child) {
         return new File(System.getProperty(TMP_DIR), child);
     }

diff --git a/...ation/src/main/java/com/github/dynamicextensionsalfresco/osgi/FrameworkConfiguration.java b/...ation/src/main/java/com/github/dynamicextensionsalfresco/osgi/FrameworkConfiguration.java
@@ -50,6 +50,9 @@ public Map<String, String> toMap() {
 			configuration.put(FRAMEWORK_SYSTEMPACKAGES_EXTRA,
 					createSystemPackagesConfiguration(getAdditionalSystemPackages()));
 		}
+		if (getBootdelegation() != null) {
+			configuration.put(FRAMEWORK_BOOTDELEGATION, getBootdelegation());
+		}
 		return configuration;
 	}
 
@@ -87,6 +90,10 @@ public File getStorageDirectory() {
 		return getConfiguration().getStorageDirectory();
 	}
 
+	public String getBootdelegation() {
+		return getConfiguration().getBootdelegation();
+	}
+
 	public boolean isFlushBundleCacheOnFirstInit() {
 		return flushBundleCacheOnFirstInit;
 	}

diff --git a/alfresco-integration/src/main/resources/META-INF/spring/osgi-container/framework-context.xml b/alfresco-integration/src/main/resources/META-INF/spring/osgi-container/framework-context.xml
@@ -12,6 +12,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd">
 		<property name="hotDeployEnabled" value="${osgi.container.hot-deploy:true}" />
 		<property name="repositoryBundlesEnabled" value="${osgi.container.repository-bundles:true}" />
 		<property name="storageDirectory" value="${osgi.container.storage-directory:#{null}}" />
+		<property name="bootdelegation" value="${osgi.container.bootdelegation:#{null}" />
 
 		<!-- DISABLE by default, see: https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/281 -->
 		<property name="systemPackageCacheMode" value="${osgi.container.system-package-cache.mode:DISABLE}" />

diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ def copyPropertyValueIfExists(sourcePropertyName, targetPropertyName) {
 
 allprojects {
     group = 'eu.xenit.de'
-    version = '2.1.2'
+    version = '2.1.3'
 
     boolean isRelease = ci.branch?.startsWith("release")
     if (!isRelease) {

diff --git a/documentation/Configuration.md b/documentation/Configuration.md
@@ -20,12 +20,13 @@ determine the root of the classpath from the location of 'alfresco-global.proper
 
 ## Configuration settings
 
-| Description                                                                   | Default                    | Example |
-------------------------------------------------------------------------------- | :------------------------  | -------------------
-| Allow restart of the container: useful for development                          | true                   | osgi.container.restartable=true/false |
-| Enable starting bundles stored in the repository.                               | true                   | osgi.container.repository-bundles=true/false |
-| Hot-deploy bundles on a running Alfresco If disabled, only classpath bundles and/or optionally repository bundles will be loaded. | true | osgi.container.hot-deploy=true/false |
-| Configures the OSGI framework's storage directory. This can be either a relative or absolute path. Specifying an absolute path is recommended. (absolute or relative path) | tmp (relative to the current working directory) | osgi.container.storage-directory=tmp |
-| Configures the OSGI framework's directory from which to automatically install or uninstall bundles. (absolute or relative path) | dynamic-extensions (relative to the current working directory) | osgi.container.bundle-directory=dynamic-extensions |
-| Web application classpath scanning behaviour <br><br> ENABLE: Use existing cache or create a new cache if a: none exists or b: cache ts < WEB-INF/lib ts. Default setting. <br><br> DISABLE: Disable the cache. Rescans the WEB-INF/lib directory at every startup boot, but does not persist it. <br><br> UPDATE: Force update of the existing cache. | DISABLE | osgi.container.system-package-cache.mode = ENABLE/DISABLE/UPDATE |
+| Description                                                                                                                                                                                                                                                                                                                                            | Default                                                       | Example |
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------| -------------------
+| Allow restart of the container: useful for development                                                                                                                                                                                                                                                                                                 | true                                                          | osgi.container.restartable=true/false |
+| Enable starting bundles stored in the repository.                                                                                                                                                                                                                                                                                                      | true                                                          | osgi.container.repository-bundles=true/false |
+| Hot-deploy bundles on a running Alfresco If disabled, only classpath bundles and/or optionally repository bundles will be loaded.                                                                                                                                                                                                                      | true                                                          | osgi.container.hot-deploy=true/false |
+| Configures the OSGI framework's storage directory. This can be either a relative or absolute path. Specifying an absolute path is recommended. (absolute or relative path)                                                                                                                                                                             | tmp (relative to the current working directory)               | osgi.container.storage-directory=tmp |
+| Configures the OSGI framework's directory from which to automatically install or uninstall bundles. (absolute or relative path)                                                                                                                                                                                                                        | dynamic-extensions (relative to the current working directory) | osgi.container.bundle-directory=dynamic-extensions |
+| Web application classpath scanning behaviour <br><br> ENABLE: Use existing cache or create a new cache if a: none exists or b: cache ts < WEB-INF/lib ts. Default setting. <br><br> DISABLE: Disable the cache. Rescans the WEB-INF/lib directory at every startup boot, but does not persist it. <br><br> UPDATE: Force update of the existing cache. | DISABLE                                                       | osgi.container.system-package-cache.mode = ENABLE/DISABLE/UPDATE |
+| Configure the OSGI framework's bootdelegation. This property is added for supporting [AppDynamics](https://docs.appdynamics.com/21.3/en/application-monitoring/install-app-server-agents/java-agent/install-the-java-agent/agent-installation-by-java-framework/osgi-infrastructure-configuration).                                                    |                                                              | osgi.container.bootdelegation=com.singularity.*|
 
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -6,7 +6,9 @@ ext {
             "60": "6.0.7-ga",
             "61": "6.1.2-ga",
             "62": "6.2.0-ga",
-            "70": "7.0.0"
+            "70": "7.0.0",
+            "71": "7.1.1",
+            "72": "7.2.0"
     ]
 
     springVersions = [
@@ -16,7 +18,9 @@ ext {
             "60": "5.0.4.RELEASE",
             "61": "5.1.3.RELEASE",
             "62": "5.1.8.RELEASE",
-            "70": "5.3.3.RELEASE"
+            "70": "5.3.3.RELEASE",
+            "71": "5.3.9.RELEASE",
+            "72": "5.3.15.RELEASE"
     ]
 
     geminiVersions = [
@@ -26,6 +30,8 @@ ext {
             "60": "3.0.0.M01",
             "61": "3.0.0.M01",
             "62": "3.0.0.M01",
-            "70": "3.0.0.M01"
+            "70": "3.0.0.M01",
+            "71": "3.0.0.M01",
+            "72": "3.0.0.M01"
     ]
 }
diff --git a/integration-tests/alfresco-community-71/overload.gradle b/integration-tests/alfresco-community-71/overload.gradle
@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.1.1'
+    alfrescoBaseWar = 'org.alfresco:content-services-community@war'
+
+    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.1.1'
+
+    postgresImage = 'postgres:13'
+}
diff --git a/integration-tests/alfresco-community-72/overload.gradle b/integration-tests/alfresco-community-72/overload.gradle
@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.2.0'
+    alfrescoBaseWar = 'org.alfresco:content-services-community@war'
+
+    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.2.0'
+
+    postgresImage = 'postgres:13'
+}
diff --git a/integration-tests/alfresco-enterprise-71/overload.gradle b/integration-tests/alfresco-enterprise-71/overload.gradle
@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.1.0'
+    alfrescoBaseWar = 'org.alfresco:content-services@war'
+
+    alfrescoBaseImage = 'hub.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.1.0'
+
+    postgresImage = 'postgres:13'
+}
diff --git a/integration-tests/alfresco-enterprise-72/overload.gradle b/integration-tests/alfresco-enterprise-72/overload.gradle
@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.0'
+    alfrescoBaseWar = 'org.alfresco:content-services@war'
+
+    alfrescoBaseImage = 'hub.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.2.0'
+
+    postgresImage = 'postgres:13'
+}
diff --git a/settings.gradle b/settings.gradle
@@ -23,7 +23,7 @@ include 'gradle-plugin'
 
 include 'polyfill:polyfill-alfresco-50'
 
-def supportedAlfrescoVersions = ["50", "51", "52", "60", "61", "62", "70"]
+def supportedAlfrescoVersions = ["50", "51", "52", "60", "61", "62", "70", "71", "72"]
 def alfrescoDependentModules =
         [
                 'alfresco-dynamic-extensions-repo',