Skip to content
Snippets Groups Projects
Commit f21a3bf9 authored by vkovtun's avatar vkovtun
Browse files

SSDM-13359: Removed duplicate screening javadocs.

parent 3c1b0401
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -62,7 +62,6 @@ configurations.create('blast_tar') ...@@ -62,7 +62,6 @@ configurations.create('blast_tar')
configurations.create('libOpenbisCommonJavadoc') configurations.create('libOpenbisCommonJavadoc')
configurations.create('serverOriginalDataStoreJavadoc') configurations.create('serverOriginalDataStoreJavadoc')
configurations.create('serverApplicationServerJavadoc') configurations.create('serverApplicationServerJavadoc')
configurations.create('serverScreeningJavadoc')
def jettyVersion = '9.4.44' def jettyVersion = '9.4.44'
def jettyDistributionVersion = '9.4.44.v20210927' def jettyDistributionVersion = '9.4.44.v20210927'
...@@ -126,7 +125,6 @@ dependencies { ...@@ -126,7 +125,6 @@ dependencies {
libOpenbisCommonJavadoc project(':lib-openbis-common') libOpenbisCommonJavadoc project(':lib-openbis-common')
serverOriginalDataStoreJavadoc project(':server-original-data-store') serverOriginalDataStoreJavadoc project(':server-original-data-store')
serverApplicationServerJavadoc project(':server-application-server') serverApplicationServerJavadoc project(':server-application-server')
serverScreeningJavadoc project(':server-screening')
} }
sourceSets { sourceSets {
...@@ -515,22 +513,9 @@ task serverApplicationServerJavadocZip(type: Zip, dependsOn: serverApplicationSe ...@@ -515,22 +513,9 @@ task serverApplicationServerJavadocZip(type: Zip, dependsOn: serverApplicationSe
from serverApplicationServerJavadoc.destinationDir from serverApplicationServerJavadoc.destinationDir
} }
task serverScreeningJavadoc(type: Javadoc) {
source project(':server-screening').files('source/java').getAsFileTree().matching {
include "**/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/**/*.java"
}
classpath = configurations.serverScreeningJavadoc
}
task serverScreeningJavadocZip(type: Zip, dependsOn: serverScreeningJavadoc) {
archiveName 'javadoc-server-screening.zip'
from serverScreeningJavadoc.destinationDir
}
task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, screeningApiZip, pybisZip, obisZip, task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, screeningApiZip, pybisZip, obisZip,
dropboxJavaDocZip, dynamicApiJavadocZip, libOpenbisCommonJavadocZip, dropboxJavaDocZip, dynamicApiJavadocZip, libOpenbisCommonJavadocZip,
serverOriginalDataStoreJavadocZip, serverApplicationServerJavadocZip, serverOriginalDataStoreJavadocZip, serverApplicationServerJavadocZip]) {
serverScreeningJavadocZip]) {
baseName 'openBIS-clients-and-APIs' baseName 'openBIS-clients-and-APIs'
from dssClientZip.archivePath from dssClientZip.archivePath
from queryApiZip.archivePath from queryApiZip.archivePath
...@@ -543,7 +528,6 @@ task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, ...@@ -543,7 +528,6 @@ task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip,
from libOpenbisCommonJavadocZip.archivePath from libOpenbisCommonJavadocZip.archivePath
from serverOriginalDataStoreJavadocZip.archivePath from serverOriginalDataStoreJavadocZip.archivePath
from serverApplicationServerJavadocZip.archivePath from serverApplicationServerJavadocZip.archivePath
from serverScreeningJavadocZip.archivePath
from('dist/client/readme.txt') from('dist/client/readme.txt')
rename { filename -> rename { filename ->
if (filename.startsWith('pybis-')) { if (filename.startsWith('pybis-')) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment