From d06f533bb975f41a5e86c990e1bb830b7e7dc923 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 5 Feb 2019 13:23:30 +0100 Subject: [PATCH] Drop OSGi support --- build.gradle | 1 - smack-core/build.gradle | 11 ----------- smack-java7/build.gradle | 12 ------------ smack-omemo-signal/build.gradle | 5 ----- smack-omemo/build.gradle | 6 ------ 5 files changed, 35 deletions(-) diff --git a/build.gradle b/build.gradle index 80589f188..80429322b 100644 --- a/build.gradle +++ b/build.gradle @@ -333,7 +333,6 @@ ${oneLineDesc}.""" evaluationDependsOnChildren() subprojects { apply plugin: 'maven' - apply plugin: 'osgi' apply plugin: 'signing' apply plugin: 'checkstyle' apply plugin: 'org.kordamp.gradle.clirr' diff --git a/smack-core/build.gradle b/smack-core/build.gradle index 93b902b5a..4fcf904ce 100644 --- a/smack-core/build.gradle +++ b/smack-core/build.gradle @@ -1,8 +1,3 @@ -// Note that this is also declared in the main build.gradle for -// subprojects, but since evaluationDependsOnChildren is enabled we -// need to declare it here too -apply plugin: 'osgi' - description = """\ Smack core components.""" @@ -47,9 +42,3 @@ task createVersionResource(type: CreateFileTask) { } compileJava.dependsOn(createVersionResource) - -jar { - manifest { - instruction 'DynamicImport-Package', '*' - } -} diff --git a/smack-java7/build.gradle b/smack-java7/build.gradle index 78a1799e1..52f0197d7 100644 --- a/smack-java7/build.gradle +++ b/smack-java7/build.gradle @@ -1,9 +1,3 @@ -// Although the osgi plugin is already applied by the root project's -// subprojects closure, we need to re-apply it here so that the -// manifest is a OsgiManifest. Possible caused by -// evaluationDependsOnChildren in the root project. -apply plugin: 'osgi' - description = """\ Smack for Java7 (or higher). This is a pseudo-artifact that pulls all the required dependencies to @@ -19,9 +13,3 @@ dependencies { javadoc { enabled = false } - -jar { - manifest { - instruction 'Import-Package', '!sun.security.*, *' - } -} \ No newline at end of file diff --git a/smack-omemo-signal/build.gradle b/smack-omemo-signal/build.gradle index 66ed215bc..e2f21dc54 100644 --- a/smack-omemo-signal/build.gradle +++ b/smack-omemo-signal/build.gradle @@ -1,8 +1,3 @@ -// Although the osgi plugin is already applied by the root project's -// subprojects closure, we need to re-apply it here so that the -// manifest is a OsgiManifest. Possible caused by -// evaluationDependsOnChildren in the root project. -apply plugin: 'osgi' apply plugin: 'checkstyle' apply plugin: 'maven' diff --git a/smack-omemo/build.gradle b/smack-omemo/build.gradle index 553e77855..e4279f74a 100644 --- a/smack-omemo/build.gradle +++ b/smack-omemo/build.gradle @@ -1,9 +1,3 @@ -// Although the osgi plugin is already applied by the root project's -// subprojects closure, we need to re-apply it here so that the -// manifest is a OsgiManifest. Possible caused by -// evaluationDependsOnChildren in the root project. -apply plugin: 'osgi' - dependencies { compile project(":smack-im") compile project(":smack-extensions")