diff --git a/alfresco-dynamic-extensions-repo/build.gradle b/alfresco-dynamic-extensions-repo/build.gradle index c05b6bd6..701d7b38 100644 --- a/alfresco-dynamic-extensions-repo/build.gradle +++ b/alfresco-dynamic-extensions-repo/build.gradle @@ -89,7 +89,7 @@ subprojects { task amp(type: Zip) { configure ampConfig - baseName = project.name + archiveBaseName = project.name } artifacts { diff --git a/blueprint-integration/build.gradle b/blueprint-integration/build.gradle index 94303f74..3628cb8a 100644 --- a/blueprint-integration/build.gradle +++ b/blueprint-integration/build.gradle @@ -8,22 +8,24 @@ subprojects { Project p -> } jar { - bnd( + bundle { + // We remove version dependencies on some gemini blueprint packages here, + // because they are different for alfresco 5.x and 6.x (see geminiVersion in the root build.gradle) + // This bundle is shared between those versions, and it should always be able to find some version to import. + bnd( 'Bundle-SymbolicName': p.group+'.'+p.name, 'Fragment-Host': 'org.eclipse.gemini.blueprint.extender', 'DynamicImport-Package': '*', 'Export-Package': 'com.github.dynamicextensionsalfresco.blueprint, com.github.dynamicextensionsalfresco.blueprint.*', 'Import-Package': - // We remove version dependencies on some gemini blueprint packages here, - // because they are different for alfresco 5.x and 6.x (see geminiVersion in the root build.gradle) - // This bundle is shared between those versions, and it should always be able to find some version to import. 'org.eclipse.gemini.blueprint.context;version=!,' + 'org.eclipse.gemini.blueprint.context.support;version=!,' + 'org.eclipse.gemini.blueprint.service.exporter.support;version=!,' + 'org.slf4j;version="[1.7.2,2.1)", ' + '*', 'Bundle-DocURL': 'https://github.com/xenit-eu/dynamic-extensions-for-alfresco', - ) + ) + } } p.sourceSets.main.java.srcDirs = [ diff --git a/build.gradle b/build.gradle index bf5ca720..85c45f06 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { plugins { id "be.vbgn.ci-detect" version "0.5.0" - id "biz.aQute.bnd.builder" version "4.2.0" apply false + id "biz.aQute.bnd.builder" version "7.0.0" apply false id "org.sonarqube" version "3.5.0.2730" } @@ -27,7 +27,7 @@ sonarqube { allprojects { group = 'eu.xenit.de' - version = '3.2.0' + version = '3.3.0' boolean isRelease = ci.branch?.startsWith("release") if (!isRelease) { @@ -128,12 +128,12 @@ subprojects { apply plugin: 'jacoco' task sourceJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } diff --git a/control-panel/build.gradle b/control-panel/build.gradle index 80774c8f..865982c3 100644 --- a/control-panel/build.gradle +++ b/control-panel/build.gradle @@ -40,21 +40,23 @@ dependencies { } jar { - bnd( - 'Bundle-Name': "${project.name}", - 'Bundle-SymbolicName': "${project.group}.${project.name}", - 'Alfresco-Dynamic-Extension': 'true', - 'Bundle-Description': 'Control Panel', - 'Alfresco-Spring-Configuration': 'com.github.dynamicextensionsalfresco.controlpanel', - 'Spring-Context': ';publish-context:=false', - 'Import-Package': 'javax.annotation;version=!, ' + - 'org.aopalliance.aop, ' + - 'org.aopalliance.intercept, ' + - 'org.springframework.aop, ' + - 'org.springframework.aop.framework, ' + - 'org.slf4j;version="[1.7.2,2.1)", ' + - '* ' - ) + bundle { + bnd( + 'Bundle-Name': "${project.name}", + 'Bundle-SymbolicName': "${project.group}.${project.name}", + 'Alfresco-Dynamic-Extension': 'true', + 'Bundle-Description': 'Control Panel', + 'Alfresco-Spring-Configuration': 'com.github.dynamicextensionsalfresco.controlpanel', + 'Spring-Context': ';publish-context:=false', + 'Import-Package': 'javax.annotation;version=!, ' + + 'org.aopalliance.aop, ' + + 'org.aopalliance.intercept, ' + + 'org.springframework.aop, ' + + 'org.springframework.aop.framework, ' + + 'org.slf4j;version="[1.7.2,2.1)", ' + + '* ' + ) + } } defaultTasks 'jar' \ No newline at end of file diff --git a/event-bus/build.gradle b/event-bus/build.gradle index b94b6332..c7642b9a 100644 --- a/event-bus/build.gradle +++ b/event-bus/build.gradle @@ -8,9 +8,11 @@ dependencies { } jar { - bnd('Bundle-Description': 'Inter-bundle event bus', - 'Bundle-Activator': 'com.github.dynamicextensionsalfresco.event.impl.Activator', - 'Export-Package': 'com.github.dynamicextensionsalfresco.event.*') + bundle { + bnd('Bundle-Description': 'Inter-bundle event bus', + 'Bundle-Activator': 'com.github.dynamicextensionsalfresco.event.impl.Activator', + 'Export-Package': 'com.github.dynamicextensionsalfresco.event.*') + } } defaultTasks 'jar' \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..068cdb2d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/test-bundle/build.gradle b/integration-tests/test-bundle/build.gradle index 63b8e70c..a95906b5 100644 --- a/integration-tests/test-bundle/build.gradle +++ b/integration-tests/test-bundle/build.gradle @@ -29,13 +29,15 @@ dependencies { } jar { - bnd( - 'Alfresco-Dynamic-Extension': 'true', - 'Bundle-Description': 'Bundle for integration testing purposes', - 'Alfresco-Spring-Configuration': 'eu.xenit.de.testing', - 'DynamicImport-Package': '*', - 'Import-Package': 'org.slf4j;version="[1.7.2,2.1)", ' - +'*' - ) + bundle { + bnd( + 'Alfresco-Dynamic-Extension': 'true', + 'Bundle-Description': 'Bundle for integration testing purposes', + 'Alfresco-Spring-Configuration': 'eu.xenit.de.testing', + 'DynamicImport-Package': '*', + 'Import-Package': 'org.slf4j;version="[1.7.2,2.1)", ' + +'*' + ) + } } diff --git a/settings.gradle b/settings.gradle index 4fa857d7..be21cf91 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ include 'annotations' include 'webscripts' -include 'webscripts:webscripts-50' +//include 'webscripts:webscripts-50' include 'webscripts:webscripts-70' include 'event-bus' @@ -19,7 +19,7 @@ include 'control-panel' include 'gradle-plugin' -def supportedAlfrescoVersions = [ "61", "62", "70", "71", "72", "73", "74"] +def supportedAlfrescoVersions = ["74"] // "61", "62", "70", "71", "72", "73", def alfrescoDependentModules = [ 'alfresco-dynamic-extensions-repo',