Merge pull request #230 from planetf1/issue180b

#180 Correct maven publish - artifact names
odpi · Nov 4, 2022 · ea5075f · ea5075f
2 parents 1bdc427 + 91df67b
commit ea5075f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -141,14 +141,14 @@ allprojects {
                         }
                     }
                     scm {
-                        connection = 'scm:git:git://github.com/odpi/egeria.git'
-                        developerConnection = 'scm:git:ssh://github.com/odpi/egeria/egeria.git'
-                        url = 'http://github.com/odpi/egeria'
+                        connection = 'scm:git:https://github.com/odpi/egeria-database-connectors'
+                        developerConnection = 'scm:git:https://github.com/odpi/egeria-database-connectors'
+                        url = 'https://egithub.com/odpi/egeria-database-connectors'
                     }
                 }
                 // Override the project name & description for the pom based on properties set in the child build.gradle (hard to default & required for maven central)
                 pom.withXml {
-                    asNode().appendNode('name', "${project.name}")
+                    //asNode().appendNode('name', "${project.name}")
                     asNode().appendNode('description', "${project.description}")
                 }
             }

diff --git a/egeria-connector-postgres/build.gradle b/egeria-connector-postgres/build.gradle
@@ -5,7 +5,6 @@
 
 // Artifact names are taken from the directory by default, set in settings.gradle to override
 // The 'name' for the maven artifact, and description are set here
-ext.name = 'Postgres Connector'
 description = 'Postgres Connector for Egeria'
 
 // Dependencies for this project. Versions set in constraints in root project.

diff --git a/jdbc-integration-connector/build.gradle b/jdbc-integration-connector/build.gradle
@@ -5,7 +5,7 @@
 
 // Artifact names are taken from the directory by default, set in settings.gradle to override
 // The 'name' for the maven artifact, and description are set here
-ext.name = 'JDBC Database Integration Connector'
+
 description = 'Egeria integration connector that uses Generic JDBC resource connector to access the database metadata'
 
 dependencies {
@@ -14,6 +14,6 @@ dependencies {
     compileOnly 'org.odpi.egeria:data-manager-api'
     compileOnly 'org.odpi.egeria:database-integrator-api'
     compileOnly 'org.odpi.egeria:open-connector-framework'
-    implementation project(':jdbc-resource-connector')
+    implementation project(':egeria-connector-resource-jdbc')
 }
 
diff --git a/jdbc-resource-connector/build.gradle b/jdbc-resource-connector/build.gradle
@@ -5,7 +5,6 @@
 
 // Artifact names are taken from the directory by default, set in settings.gradle to override
 // The 'name' for the maven artifact, and description are set here
-ext.name = 'JDBC Resource Connector'
 description = 'JDBC Resource Connector for Egeria'
 
 dependencies {

diff --git a/settings.gradle b/settings.gradle
@@ -16,6 +16,14 @@ pluginManagement {
 rootProject.name = 'egeria-database-connectors'
 
 include(':egeria-connector-postgres')
-include(':jdbc-resource-connector')
-include(':jdbc-integration-connector')
+include(':egeria-connector-resource-jdbc')
+include(':egeria-connector-integration-jdbc')
+include(':egeria-connector-event-mapper-polling-database')
 
+// These define the project names. For now we'll keep them the same as the directory
+// Not needed if we're only going one level deep
+project(':egeria-connector-postgres').projectDir = file('egeria-connector-postgres')
+project(':egeria-connector-resource-jdbc').projectDir = file('jdbc-resource-connector')
+project(':egeria-connector-integration-jdbc').projectDir = file('jdbc-integration-connector')
+project(':egeria-connector-postgres').projectDir = file('egeria-connector-postgres')
+project(':egeria-connector-event-mapper-polling-database').projectDir = file('omrs-database-polling-repository-event-mapper')