Skip to content
Snippets Groups Projects
Commit 2b638a3a authored by Adam Laskowski's avatar Adam Laskowski
Browse files

ssdm-13365: renamed commonbase into lib-commonbase. Fixed omitted 'common' renames

parent 37acf522
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Showing
with 21 additions and 21 deletions
evaluationDependsOn(':commonbase') evaluationDependsOn(':lib-commonbase')
evaluationDependsOn(':lib-common') evaluationDependsOn(':lib-common')
apply from: '../build/javaproject.gradle' apply from: '../build/javaproject.gradle'
...@@ -6,7 +6,7 @@ apply from: '../build/javaproject.gradle' ...@@ -6,7 +6,7 @@ apply from: '../build/javaproject.gradle'
dependencies { dependencies {
api project(':lib-common') api project(':lib-common')
testImplementation project(path: ':commonbase', configuration: 'tests'), testImplementation project(path: ':lib-commonbase', configuration: 'tests'),
project(path: ':lib-common', configuration: 'tests'), project(path: ':lib-common', configuration: 'tests'),
'fjelmer:classycle:1.4.2', 'fjelmer:classycle:1.4.2',
'testng:testng:6.8-CISD' 'testng:testng:6.8-CISD'
......
includeFlat 'commonbase', 'lib-common' includeFlat 'lib-commonbase', 'lib-common'
...@@ -26,8 +26,8 @@ git push -u origin $1 ...@@ -26,8 +26,8 @@ git push -u origin $1
# fix dependency versions # fix dependency versions
GRADLE_PROJECTS="\ GRADLE_PROJECTS="\
authentication \ authentication \
commonbase \ lib-commonbase \
common \ lib-common \
server-original-data-store \ server-original-data-store \
dbmigration \ dbmigration \
installation \ installation \
......
evaluationDependsOn(':commonbase') evaluationDependsOn(':lib-commonbase')
evaluationDependsOn(':lib-common') evaluationDependsOn(':lib-common')
evaluationDependsOn(':openbis_api') evaluationDependsOn(':openbis_api')
evaluationDependsOn(':lib-openbis-common') evaluationDependsOn(':lib-openbis-common')
......
includeFlat 'commonbase', 'lib-common', 'openbis_api', 'lib-openbis-common', 'authentication', 'dbmigration', 'server-application-server', includeFlat 'lib-commonbase', 'lib-common', 'openbis_api', 'lib-openbis-common', 'authentication', 'dbmigration', 'server-application-server',
'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'installation', 'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'installation',
'image_readers', 'test-ui-core', 'test-api-openbis-javascript', 'server-external-data-store', 'openbis_ng_ui', 'image_readers', 'test-ui-core', 'test-api-openbis-javascript', 'server-external-data-store', 'openbis_ng_ui',
'microservice-server-template' 'microservice-server-template'
\ No newline at end of file
evaluationDependsOn(':commonbase') evaluationDependsOn(':lib-commonbase')
evaluationDependsOn(':lib-common') evaluationDependsOn(':lib-common')
apply from: '../build/javaproject.gradle' apply from: '../build/javaproject.gradle'
...@@ -10,7 +10,7 @@ dependencies { ...@@ -10,7 +10,7 @@ dependencies {
'h2database:h2:1.1.115', 'h2database:h2:1.1.115',
'postgresql:postgresql:42.5.0' 'postgresql:postgresql:42.5.0'
testImplementation project(path: ':commonbase', configuration: 'tests'), testImplementation project(path: ':lib-commonbase', configuration: 'tests'),
project(path: ':lib-common', configuration: 'tests'), project(path: ':lib-common', configuration: 'tests'),
'fjelmer:classycle:1.4.2', 'fjelmer:classycle:1.4.2',
'testng:testng:6.8-CISD', 'testng:testng:6.8-CISD',
......
includeFlat 'commonbase', 'lib-common' includeFlat 'lib-commonbase', 'lib-common'
evaluationDependsOn(':commonbase') evaluationDependsOn(':lib-commonbase')
evaluationDependsOn(':lib-common') evaluationDependsOn(':lib-common')
apply from: '../build/javaproject.gradle' apply from: '../build/javaproject.gradle'
...@@ -10,7 +10,7 @@ dependencies { ...@@ -10,7 +10,7 @@ dependencies {
'slf4j:slf4j:1.6.2', 'slf4j:slf4j:1.6.2',
'slf4j:slf4j-log4j12:1.6.2' 'slf4j:slf4j-log4j12:1.6.2'
testImplementation project(path: ':commonbase', configuration: 'tests'), testImplementation project(path: ':lib-commonbase', configuration: 'tests'),
project(path: ':lib-common', configuration: 'tests'), project(path: ':lib-common', configuration: 'tests'),
'fjelmer:classycle:1.4.2', 'fjelmer:classycle:1.4.2',
'testng:testng:6.8-CISD' 'testng:testng:6.8-CISD'
......
includeFlat 'commonbase', 'lib-common' includeFlat 'lib-commonbase', 'lib-common'
evaluationDependsOn(':commonbase') evaluationDependsOn(':lib-commonbase')
evaluationDependsOn(':lib-common') evaluationDependsOn(':lib-common')
evaluationDependsOn(':openbis_api') evaluationDependsOn(':openbis_api')
evaluationDependsOn(':lib-openbis-common') evaluationDependsOn(':lib-openbis-common')
...@@ -33,7 +33,7 @@ dependencies { ...@@ -33,7 +33,7 @@ dependencies {
api 'izpack:izpack:5.0-beta9-SNAPSHOT-2022-03-22' api 'izpack:izpack:5.0-beta9-SNAPSHOT-2022-03-22'
testImplementation project(path: ':commonbase', configuration: 'tests'), testImplementation project(path: ':lib-commonbase', configuration: 'tests'),
project(path: ':lib-common', configuration: 'tests'), project(path: ':lib-common', configuration: 'tests'),
'fjelmer:classycle:1.4.2', 'fjelmer:classycle:1.4.2',
'testng:testng:6.8-CISD' 'testng:testng:6.8-CISD'
...@@ -166,7 +166,7 @@ task createInstallerJar(type: Jar, dependsOn: [compileInstaller, jar]) { ...@@ -166,7 +166,7 @@ task createInstallerJar(type: Jar, dependsOn: [compileInstaller, jar]) {
from zipTree(new File(izPackJar)) from zipTree(new File(izPackJar))
from zipTree(jar.archivePath) from zipTree(jar.archivePath)
from zipTree(project(':lib-common').jar.archivePath) from zipTree(project(':lib-common').jar.archivePath)
from zipTree(project(':commonbase').jar.archivePath) from zipTree(project(':lib-commonbase').jar.archivePath)
for (f in configurations.archives.files) { for (f in configurations.archives.files) {
from zipTree(f) from zipTree(f)
} }
......
includeFlat 'commonbase', 'lib-common', includeFlat 'lib-commonbase', 'lib-common',
'openbis_api', 'lib-openbis-common', 'authentication', 'dbmigration', 'server-application-server', 'openbis_api', 'lib-openbis-common', 'authentication', 'dbmigration', 'server-application-server',
'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'server-external-data-store', 'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'server-external-data-store',
'openbis_ng_ui', 'microservice-server-template' 'openbis_ng_ui', 'microservice-server-template'
evaluationDependsOn(':commonbase') evaluationDependsOn(':lib-commonbase')
apply from: '../build/javaproject.gradle' apply from: '../build/javaproject.gradle'
dependencies { dependencies {
api project(':commonbase'), api project(':lib-commonbase'),
'springframework:spring-webmvc:5.0.1.RELEASE', 'springframework:spring-webmvc:5.0.1.RELEASE',
'springframework:spring-aop:5.0.1.RELEASE', 'springframework:spring-aop:5.0.1.RELEASE',
'javax:servlet-api:3.1.0', 'javax:servlet-api:3.1.0',
...@@ -26,7 +26,7 @@ dependencies { ...@@ -26,7 +26,7 @@ dependencies {
'eclipse:jetty-client:9.4.44.v20210927', 'eclipse:jetty-client:9.4.44.v20210927',
'apache:commons-csv:1.2' 'apache:commons-csv:1.2'
testImplementation project(path: ':commonbase', configuration: 'tests'), testImplementation project(path: ':lib-commonbase', configuration: 'tests'),
'fjelmer:classycle:1.4.2', 'fjelmer:classycle:1.4.2',
'testng:testng:6.8-CISD' 'testng:testng:6.8-CISD'
} }
......
includeFlat 'commonbase' includeFlat 'lib-commonbase'
\ No newline at end of file \ No newline at end of file
File moved
File moved
File moved
File moved
File moved
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