From a084a87aef0e6f81aad124395b48ce1daafd0f4f Mon Sep 17 00:00:00 2001 From: Edwin Lawrance Date: Mon, 4 Mar 2019 15:00:56 +0000 Subject: [PATCH 01/16] Update SDS pom fixes for merge job requirements Change-Id: I47d6b7cf80fc156312977b2a302539b9e691fed8 Issue-ID: AAI-2203 Signed-off-by: Edwin Lawrance --- search-data-service-app/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index c1f2c6a..10e84dd 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -37,6 +37,7 @@ ${basedir}/target + search-data-service https://nexus.onap.org 1.8 ${basedir}/src/main/java-gen @@ -293,7 +294,7 @@ true docker-hub - ${docker.push.registry}/onap/${project.artifactId} + ${docker.push.registry}/onap/${docker.image.name.suffix} ${docker.location} latest -- 2.16.6 From deed66b578b83641f0d22867978b04763156dcac Mon Sep 17 00:00:00 2001 From: Keong Lim Date: Tue, 5 Mar 2019 11:38:42 +1100 Subject: [PATCH 02/16] AAI-2210 Update .gitignore aai/search-data-service Update for change in component sub-directories Change-Id: I5efcd798e2940b4119477b8d7bfeb944e7837547 Issue-ID: AAI-2210 Signed-off-by: Keong Lim --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f219d63..79cde97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/src/main/java-gen/ +**/src/main/java-gen/ /target/ /bin/ .project -- 2.16.6 From 7ba399d3c66d60536f0757280419140642309b31 Mon Sep 17 00:00:00 2001 From: Edwin Lawrance Date: Tue, 5 Mar 2019 11:23:05 +0000 Subject: [PATCH 03/16] Update pom to conform merge jobs requirments Change-Id: Ibec2d9ea738569e96d4de7cd24899a0a5886fd99 Issue-ID: AAI-2203 Signed-off-by: Edwin Lawrance --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 0c6300c..8fe939f 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,13 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + + true + + -- 2.16.6 From e93913a77a630501cc158c384e105a978bab50e8 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 2 Apr 2019 11:55:36 -0700 Subject: [PATCH 04/16] Update to latest springboot Issue-ID: AAI-2253 Change-Id: I3e201603ffb6cc8d3eab5ab0184576f0dd130591 Signed-off-by: Jimmy Forsyth --- search-data-service-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 10e84dd..485e9a4 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -27,7 +27,7 @@ spring-boot-starter-parent org.springframework.boot - 1.5.18.RELEASE + 1.5.19.RELEASE org.onap.aai.search-data-service -- 2.16.6 From e914376e0831e8e2f73a4c7c26576a271bcbbe56 Mon Sep 17 00:00:00 2001 From: renealr Date: Fri, 5 Apr 2019 12:25:23 -0400 Subject: [PATCH 05/16] set jacoco coverage check limit Issue-ID: AAI-2253 Change-Id: I5a05025043f2af9e3d6aee9d7e45f35c3f889148 Signed-off-by: renealr --- search-data-service-app/pom.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 485e9a4..bd4daee 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -51,6 +51,7 @@ false ${project.version} + 0.58 @@ -426,6 +427,28 @@ + + default-check + + check + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + + -- 2.16.6 From 48835b19ca7c475f422e782a62ddfb02b8234a95 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 9 Apr 2019 11:54:58 -0400 Subject: [PATCH 06/16] Upgrade to springboot 1.5.20.RELEASE Issue-ID: AAI-2349 Change-Id: If0b38fad33b17e7bef13f4261228c82feb227319 Signed-off-by: Jimmy Forsyth --- search-data-service-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index bd4daee..98fce2a 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -27,7 +27,7 @@ spring-boot-starter-parent org.springframework.boot - 1.5.19.RELEASE + 1.5.20.RELEASE org.onap.aai.search-data-service -- 2.16.6 From 0775c59211291505a49fbc36a08d695e4aa7af93 Mon Sep 17 00:00:00 2001 From: Francis Paquette Date: Wed, 1 May 2019 14:41:13 -0400 Subject: [PATCH 07/16] Trying the fix auto-release Issue-ID: AAI-2401 Change-Id: I7bb5517535294dfd36ef08cec4d8ae895890d9df Signed-off-by: Francis Paquette --- elasticsearch-sg/pom.xml | 4 ++-- pom.xml | 31 +++++++++++++++++++++++++++++-- search-data-service-app/pom.xml | 2 +- version.properties | 2 +- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index 0c6f67b..322c742 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -27,7 +27,7 @@ org.onap.aai elasticsearch-sg ElasticSearch with SearchGuard - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 8fe939f..456185b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.aai search-data-service aai-search-data-service aggregate pom - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom @@ -40,6 +40,33 @@ + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + default-deploy + none + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${onap.nexus.url} + 176c31dfe190a + ecomp-staging + + + + com.spotify @@ -72,4 +99,4 @@ - \ No newline at end of file + diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 98fce2a..5cc0ab3 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -32,7 +32,7 @@ org.onap.aai.search-data-service search-data-service-app - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT AAI Search Data Service Application diff --git a/version.properties b/version.properties index 668657e..eff345c 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=4 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6 From 22471531491355235b0dd22518d3f967b8094290 Mon Sep 17 00:00:00 2001 From: Francis Paquette Date: Wed, 1 May 2019 17:59:38 -0400 Subject: [PATCH 08/16] Unskipping deployment Issue-ID: AAI-2401 Change-Id: I1885bc0226cfac2de21e36ed63a2e0dca6631262 Signed-off-by: Francis Paquette --- elasticsearch-sg/pom.xml | 25 ++++++++++++++++++++----- pom.xml | 7 ------- search-data-service-app/pom.xml | 15 +++++++++------ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index 322c742..5360c95 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -79,11 +79,26 @@ - org.apache.maven.plugins - maven-deploy-plugin - - true - + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + default-deploy + none + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + diff --git a/pom.xml b/pom.xml index 456185b..d3ffb93 100644 --- a/pom.xml +++ b/pom.xml @@ -76,13 +76,6 @@ true - - org.apache.maven.plugins - maven-deploy-plugin - - true - - diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 5cc0ab3..978b0c5 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -395,13 +395,16 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + default-deploy + none + + org.codehaus.mojo -- 2.16.6 From 39504159b33e2f5bc4601c12f37204427a81bb51 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 1 May 2019 21:14:51 -0400 Subject: [PATCH 09/16] Set groupId to avoid permission denied error Issue-ID: AAI-2401 Change-Id: I27040d3458029fe96ba33e72bfa5104b43e5139d Signed-off-by: Jimmy Forsyth --- elasticsearch-sg/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index 5360c95..c27ff54 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.aai + org.onap.aai.search-data-service elasticsearch-sg ElasticSearch with SearchGuard 1.4.1-SNAPSHOT -- 2.16.6 From d24b9671b91935c49602c5793c67e0b1c1607353 Mon Sep 17 00:00:00 2001 From: "Lee, Tian (tl5884)" Date: Thu, 2 May 2019 11:54:16 +0100 Subject: [PATCH 10/16] Tidy up pom config changes Change-Id: I088f3e0bd537a36cf8682070811f50d4abdee150 Issue-ID: AAI-2401 Signed-off-by: Lee, Tian (tl5884) --- elasticsearch-sg/pom.xml | 36 ++++++++++++------------- pom.xml | 27 ------------------- search-data-service-app/pom.xml | 60 ++++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 75 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index c27ff54..e581748 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -79,26 +79,26 @@ - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - default-deploy - none - - + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + default-deploy + none + + - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + diff --git a/pom.xml b/pom.xml index d3ffb93..0443284 100644 --- a/pom.xml +++ b/pom.xml @@ -40,33 +40,6 @@ - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - default-deploy - none - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - - - com.spotify diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 978b0c5..3ba6fe0 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -396,15 +396,15 @@ - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - default-deploy - none - - + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + default-deploy + none + + org.codehaus.mojo @@ -430,28 +430,28 @@ - - default-check - - check - - - ${project.build.directory}/coverage-reports/jacoco.exec - + + default-check + + check + + + ${project.build.directory}/coverage-reports/jacoco.exec + - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco.line.coverage.limit} - - - - - - + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + + -- 2.16.6 From 08a9ac083da20357ccff34463079d319738645db Mon Sep 17 00:00:00 2001 From: "Lee, Tian (tl5884)" Date: Thu, 2 May 2019 13:26:43 +0100 Subject: [PATCH 11/16] Add staging plugin to root pom In order to trigger the autorelease Change-Id: I489dc9145227e747e7ec5b4436627094d47e96e8 Issue-ID: AAI-2401 Signed-off-by: Lee, Tian (tl5884) --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 0443284..29a5e58 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,17 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + -- 2.16.6 From e25f4959c9e3f1992b3f5a8303500bd13488e5cd Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Fri, 3 May 2019 12:06:26 -0400 Subject: [PATCH 12/16] Upversion for Dublin release Issue-ID: AAI-2403 Change-Id: I311b3549c75cc2beb5e13aa1c43774f7324d78f8 Signed-off-by: Jimmy Forsyth --- elasticsearch-sg/pom.xml | 2 +- pom.xml | 2 +- search-data-service-app/pom.xml | 2 +- version.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index e581748..6b4bd63 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.search-data-service elasticsearch-sg ElasticSearch with SearchGuard - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 29a5e58..366c8a2 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.aai search-data-service aai-search-data-service aggregate pom - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT pom diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 3ba6fe0..8c93f92 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -32,7 +32,7 @@ org.onap.aai.search-data-service search-data-service-app - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT AAI Search Data Service Application diff --git a/version.properties b/version.properties index eff345c..77e67b1 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=4 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} -- 2.16.6 From 42570578ab61e9dc630544f3d07cf48fc4b3cb80 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Fri, 3 May 2019 15:50:30 -0400 Subject: [PATCH 13/16] Upversion for Dublin release Issue-ID: AAI-2403 Change-Id: I93802ce621c0701c86663ad16fbeb822db43bc2e Signed-off-by: Jimmy Forsyth --- elasticsearch-sg/pom.xml | 2 +- pom.xml | 2 +- search-data-service-app/pom.xml | 2 +- version.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index 6b4bd63..8c393c7 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.search-data-service elasticsearch-sg ElasticSearch with SearchGuard - 1.4.2-SNAPSHOT + 1.4.3-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 366c8a2..c2e19a1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.aai search-data-service aai-search-data-service aggregate pom - 1.4.2-SNAPSHOT + 1.4.3-SNAPSHOT pom diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 8c93f92..2e0b19c 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -32,7 +32,7 @@ org.onap.aai.search-data-service search-data-service-app - 1.4.2-SNAPSHOT + 1.4.3-SNAPSHOT AAI Search Data Service Application diff --git a/version.properties b/version.properties index 77e67b1..44e6ad0 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=4 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6 From 84405ca31620effe245b332b354a6c9142a11bd0 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Mon, 6 May 2019 08:03:54 -0400 Subject: [PATCH 14/16] Downgrade to springboot 1.5.19.RELEASE Issue-ID: AAI-2409 Change-Id: If9a069a5ddd95aa95b568c20e66887fa4d4c2704 Signed-off-by: Jimmy Forsyth --- search-data-service-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 2e0b19c..4b28a2a 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -27,7 +27,7 @@ spring-boot-starter-parent org.springframework.boot - 1.5.20.RELEASE + 1.5.19.RELEASE org.onap.aai.search-data-service -- 2.16.6 From c68c18f33a0bd60cac32077d24c0b5bab88cbdb7 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 19 Jun 2019 17:08:12 -0400 Subject: [PATCH 15/16] Upversion for global jjb transition Issue-ID: AAI-2496 Change-Id: I289c83fbce8ac8b17c76ac59be6a4dd796e65902 Signed-off-by: Jimmy Forsyth --- elasticsearch-sg/pom.xml | 2 +- pom.xml | 2 +- search-data-service-app/pom.xml | 8 ++++---- version.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index 8c393c7..210aa2c 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.search-data-service elasticsearch-sg ElasticSearch with SearchGuard - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index c2e19a1..ec5e75e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.aai search-data-service aai-search-data-service aggregate pom - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT pom diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index 4b28a2a..a61232e 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -32,7 +32,7 @@ org.onap.aai.search-data-service search-data-service-app - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT AAI Search Data Service Application @@ -101,19 +101,19 @@ org.onap.aai.logging-service common-logging - 1.2.2 + 1.5.0 org.onap.aai.logging-service logging-api - 1.2.2 + 1.5.0 org.onap.aai.logging-service eelf-logging - 1.2.2 + 1.5.0 diff --git a/version.properties b/version.properties index 44e6ad0..99af342 100644 --- a/version.properties +++ b/version.properties @@ -3,8 +3,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=4 -patch=3 +minor=5 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6 From 78c5a01b9fd7236f79b9dcdb57a9e76d92b02d03 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 3 Jul 2019 14:48:47 -0400 Subject: [PATCH 16/16] Upversion to oparent 2.0.0 Issue-ID: AAI-2496 Change-Id: I469f9e911212512ee0cff4df68c674af3c67c872 Signed-off-by: Jimmy Forsyth --- elasticsearch-sg/pom.xml | 18 ------------------ pom.xml | 17 +++++++---------- search-data-service-app/pom.xml | 19 ------------------- 3 files changed, 7 insertions(+), 47 deletions(-) diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml index 210aa2c..6bbed7e 100644 --- a/elasticsearch-sg/pom.xml +++ b/elasticsearch-sg/pom.xml @@ -81,24 +81,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 - - - default-deploy - none - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - diff --git a/pom.xml b/pom.xml index ec5e75e..260edd3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,11 @@ 4.0.0 - + + org.onap.oparent + oparent + 2.0.0 + org.onap.aai search-data-service aai-search-data-service aggregate pom @@ -50,15 +54,8 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - + org.apache.maven.plugins + maven-deploy-plugin diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml index a61232e..71fe188 100644 --- a/search-data-service-app/pom.xml +++ b/search-data-service-app/pom.xml @@ -303,18 +303,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - @@ -398,13 +386,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 - - - default-deploy - none - - org.codehaus.mojo -- 2.16.6