Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

B2ihealthcare 7.x #518

Closed
wants to merge 9 commits into from
Closed

B2ihealthcare 7.x #518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb1de71
Merge pull request #1 from b2ihealthcare/7.x
mattecasu Jan 14, 2020
d2847ad
[CHR-1066] - snowowlFork to Artifactory (#2)
ivelina-yordanova Feb 10, 2020
415c2da
[chr-1066] - Update (#4)
ivelina-yordanova Feb 10, 2020
3d244bc
[CHR-1516] - dockerizing and adding languages and ES config
ivelina-yordanova Mar 3, 2020
1f42cf6
[CHR-1516] - add curl (#6)
ivelina-yordanova Mar 3, 2020
4848126
[CHR-1516] - merge from master B2ihealthcare 7.x (#8)
ivelina-yordanova Mar 4, 2020
1551dcf
[CHR-1516]- revert deploy pom bit, change lang hierarchy (#9)
ivelina-yordanova Mar 4, 2020
ad4f0a2
chr-1516 - fix versioning (#10)
ivelina-yordanova Mar 4, 2020
fed73a5
resolve conflicts
ivelina-yordanova Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[CHR-1516]- revert deploy pom bit, change lang hierarchy (#9) 
* chr-1516- revert accidentally overridden pom bit

* chr-1516- change lang config
  • Loading branch information
@ivelina-yordanova
ivelina-yordanova committed Mar 4, 2020
commit 1551dcf29622831810cbfadf887a1018d01d875a
8 changes: 1 addition & 7 deletions core/com.b2international.snowowl.core.rest.tests/src/configuration/snowowl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,10 @@ snomed:
languages:
-
code: en
refSetIds: ["900000000000509007", "900000000000508004"]
refSetIds: ["900000000000509007", "900000000000508004", "999001261000000100", "999000671000001103"]
-
code: en-us
refSetIds: ["900000000000509007"]
-
code: en-gb
refSetIds: ["900000000000508004"]
-
code: en-x-999001261000000100
refSetIds: ["999001261000000100"]
-
code: en-x-999000671000001103
refSetIds: ["999000671000001103"]
8 changes: 1 addition & 7 deletions docker/config/snowowl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,13 @@ snomed:
languages:
-
code: en
refSetIds: ["900000000000509007", "900000000000508004"]
refSetIds: ["900000000000509007", "900000000000508004", "999001261000000100", "999000671000001103"]
-
code: en-us
refSetIds: ["900000000000509007"]
-
code: en-gb
refSetIds: ["900000000000508004"]
-
code: en-x-999001261000000100
refSetIds: ["999001261000000100"]
-
code: en-x-999000671000001103
refSetIds: ["999000671000001103"]

monitoring:
enabled: true
Expand Down
8 changes: 1 addition & 7 deletions fhir/com.b2international.snowowl.fhir.rest.tests/src/configuration/snowowl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,10 @@ snomed:
languages:
-
code: en
refSetIds: ["900000000000509007", "900000000000508004"]
refSetIds: ["900000000000509007", "900000000000508004", "999001261000000100", "999000671000001103"]
-
code: en-us
refSetIds: ["900000000000509007"]
-
code: en-gb
refSetIds: ["900000000000508004"]
-
code: en-x-999001261000000100
refSetIds: ["999001261000000100"]
-
code: en-x-999000671000001103
refSetIds: ["999000671000001103"]
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,19 +917,19 @@

<distributionManagement>
<repository>
<id>${maven.repository.id}</id>
<url>${nexus.releases.url}</url>
<id>artifactory-releases</id>
<url>https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases</url>
</repository>
<snapshotRepository>
<id>${maven.repository.id}</id>
<url>${nexus.snapshots.url}</url>
<id>artifactory-snapshots</id>
<url>https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots</url>
</snapshotRepository>
</distributionManagement>

<scm>
<url>https://github.com/b2ihealthcare/snow-owl</url>
<connection>scm:git:ssh:https://github.com/b2ihealthcare/snow-owl.git</connection>
<developerConnection>scm:git:[email protected]:b2ihealthcare/snow-owl.git</developerConnection>
<url>https://github.com/babylonhealth/snow-owl</url>
<connection>scm:git:ssh:https://github.com/babylonhealth/snow-owl.git</connection>
<developerConnection>scm:git:[email protected]:babylonhealth/snow-owl.git</developerConnection>
</scm>

</project>
8 changes: 1 addition & 7 deletions releng/com.b2international.snowowl.server.update/assembly/common/configuration/snowowl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,13 @@ snomed:
languages:
-
code: en
refSetIds: ["900000000000509007", "900000000000508004"]
refSetIds: ["900000000000509007", "900000000000508004", "999001261000000100", "999000671000001103"]
-
code: en-us
refSetIds: ["900000000000509007"]
-
code: en-gb
refSetIds: ["900000000000508004"]
-
code: en-x-999001261000000100
refSetIds: ["999001261000000100"]
-
code: en-x-999000671000001103
refSetIds: ["999000671000001103"]

# Request execution metrics (response-time, jvm, gc, etc.)
#monitoring:
Expand Down
8 changes: 1 addition & 7 deletions snomed/com.b2international.snowowl.snomed.core.rest.tests/src/configuration/snowowl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,13 @@ snomed:
languages:
-
code: en
refSetIds: ["900000000000509007", "900000000000508004"]
refSetIds: ["900000000000509007", "900000000000508004", "999001261000000100", "999000671000001103"]
-
code: en-us
refSetIds: ["900000000000509007"]
-
code: en-gb
refSetIds: ["900000000000508004"]
-
code: en-x-999001261000000100
refSetIds: ["999001261000000100"]
-
code: en-x-999000671000001103
refSetIds: ["999000671000001103"]
# Disable concrete domains, we are going to import the required concepts to an extension
concreteDomainSupport: false
maxReasonerCount: 1
Expand Down