-
Notifications
You must be signed in to change notification settings - Fork 246
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.
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
Merge submodules #2654
base: integration
Are you sure you want to change the base?
Merge submodules #2654
Conversation
…-utils.git core/utils/type-utils subrepo: subdir: "core/utils/type-utils" merged: "55d92d5d99" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-type-utils.git" branch: "main" commit: "55d92d5d99" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…s.git contrib/datawave-utils subrepo: subdir: "contrib/datawave-utils" merged: "4348fc36a3" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-utils.git" branch: "main" commit: "4348fc36a3" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…-rest-responses.git core/base-rest-responses subrepo: subdir: "core/base-rest-responses" merged: "cb0f550615" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-base-rest-responses.git" branch: "main" commit: "cb0f550615" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…emory-accumulo.git core/in-memory-accumulo subrepo: subdir: "core/in-memory-accumulo" merged: "8a9d2f46d2" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-in-memory-accumulo.git" branch: "main" commit: "8a9d2f46d2" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ics-reporter.git core/metrics-reporter subrepo: subdir: "core/metrics-reporter" merged: "992378d629" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-metrics-reporter.git" branch: "main" commit: "992378d629" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…mulo-utils.git core/utils/accumulo-utils subrepo: subdir: "core/utils/accumulo-utils" merged: "638b3eda97" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-accumulo-utils.git" branch: "main" commit: "638b3eda97" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-common-utils.git core/utils/common-utils subrepo: subdir: "core/utils/common-utils" merged: "c96ed21342" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-common-utils.git" branch: "main" commit: "c96ed21342" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-metadata-utils.git core/utils/metadata-utils subrepo: subdir: "core/utils/metadata-utils" merged: "6169ce3833" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-metadata-utils.git" branch: "main" commit: "6169ce3833" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…nt.git microservices/microservice-parent subrepo: subdir: "microservices/microservice-parent" merged: "6207c9d657" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-parent.git" branch: "main" commit: "6207c9d657" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ice-parent.git microservices/microservice-service-parent subrepo: subdir: "microservices/microservice-service-parent" merged: "8064d20ccf" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-service-parent.git" branch: "main" commit: "8064d20ccf" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-accumulo-service.git microservices/services/accumulo subrepo: subdir: "microservices/services/accumulo" merged: "7ecb4dd560" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-accumulo-service.git" branch: "main" commit: "7ecb4dd560" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-audit-service.git microservices/services/audit subrepo: subdir: "microservices/services/audit" merged: "2714c97b19" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-audit-service.git" branch: "main" commit: "2714c97b19" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-authorization-service.git microservices/services/authorization subrepo: subdir: "microservices/services/authorization" merged: "292be85b63" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-authorization-service.git" branch: "main" commit: "292be85b63" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-config-service.git microservices/services/config subrepo: subdir: "microservices/services/config" merged: "fc187c0e4b" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-config-service.git" branch: "main" commit: "fc187c0e4b" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ionary-service.git microservices/services/dictionary subrepo: subdir: "microservices/services/dictionary" merged: "653cf5b596" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-dictionary-service.git" branch: "main" commit: "653cf5b596" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…-provider-service.git microservices/services/file-provider subrepo: subdir: "microservices/services/file-provider" merged: "27080f3b94" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-file-provider-service.git" branch: "main" commit: "27080f3b94" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-hazelcast-service.git microservices/services/hazelcast subrepo: subdir: "microservices/services/hazelcast" merged: "8abc2ef7e9" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-hazelcast-service.git" branch: "main" commit: "8abc2ef7e9" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…service.git microservices/services/map subrepo: subdir: "microservices/services/map" merged: "473ec43708" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-map-service.git" branch: "main" commit: "473ec43708" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-mapreduce-query-service.git microservices/services/mapreduce-query subrepo: subdir: "microservices/services/mapreduce-query" merged: "22af8f93c8" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-mapreduce-query-service.git" branch: "main" commit: "22af8f93c8" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-modification-service.git microservices/services/modification subrepo: subdir: "microservices/services/modification" merged: "768007f319" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-modification-service.git" branch: "main" commit: "768007f319" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…y-service.git microservices/services/query subrepo: subdir: "microservices/services/query" merged: "14c65febd3" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-query-service.git" branch: "main" commit: "14c65febd3" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-query-executor-service.git microservices/services/query-executor subrepo: subdir: "microservices/services/query-executor" merged: "4517c4c29e" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-query-executor-service.git" branch: "main" commit: "4517c4c29e" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…y-metric-service.git microservices/services/query-metric subrepo: subdir: "microservices/services/query-metric" merged: "4bce0c8921" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-query-metric-service.git" branch: "main" commit: "4bce0c8921" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-spring-boot-starter-audit.git microservices/starters/audit subrepo: subdir: "microservices/starters/audit" merged: "ef18c9e652" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-audit.git" branch: "main" commit: "ef18c9e652" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ng-boot-starter-cache.git microservices/starters/cache subrepo: subdir: "microservices/starters/cache" merged: "3019600791" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-cache.git" branch: "main" commit: "3019600791" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-spring-boot-starter-cached-results.git microservices/starters/cached-results subrepo: subdir: "microservices/starters/cached-results" merged: "b22a3d6a17" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-cached-results.git" branch: "main" commit: "b22a3d6a17" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-spring-boot-starter.git microservices/starters/datawave subrepo: subdir: "microservices/starters/datawave" merged: "081e0a028a" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter.git" branch: "main" commit: "081e0a028a" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-spring-boot-starter-metadata.git microservices/starters/metadata subrepo: subdir: "microservices/starters/metadata" merged: "28337e6c23" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-metadata.git" branch: "main" commit: "28337e6c23" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-spring-boot-starter-query.git microservices/starters/query subrepo: subdir: "microservices/starters/query" merged: "ae730eab06" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-query.git" branch: "main" commit: "ae730eab06" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
…ave-spring-boot-starter-query-metric.git microservices/starters/query-metric subrepo: subdir: "microservices/starters/query-metric" merged: "fad3ed7859" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-spring-boot-starter-query-metric.git" branch: "main" commit: "fad3ed7859" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
I think the README should be updated to add instructions for submodule PRs and subsequent tagging. |
cd7870e
to
9a292b5
Compare
Updated test workflow to add all former submodules into build/.test Changed README.md instructions from submodules to subrepo Updated build readme
9a292b5
to
c868816
Compare
subrepo: subdir: "core/utils/metadata-utils" merged: "7f05830ac6" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-metadata-utils.git" branch: "main" commit: "7f05830ac6" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
@@ -110,14 +110,14 @@ jobs: | |||
# USER_NAME: ${{ secrets.USER_NAME }} | |||
# ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} | |||
# run: | | |||
# BUILD="mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Pdev,examples,assemble,spotbugs -Dmaven.build.cache.enabled=false -DskipServices -Ddeploy -Ddist -T1C -pl "-:config-service" clean install -DskipTests" | |||
# BUILD="mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Dstarters -Dservices -Dutils -Pdev,examples,assemble,spotbugs -Dmaven.build.cache.enabled=false -DonlyServiceApis -Ddeploy -Ddist -T1C -pl "-:config-service" clean install -DskipTests" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this is commented out, but in the before it was specifically skipping services. Why are we now not skipping services?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is correct here. See the comment at the top of this comment block. This build was intended to build all of the starters, utilities, and service apis which is achieved with -Dstarters -Dservices -Dutils -DonlyServiceApis
|
||
If you don't want to build the starters, util modules, and services then try this | ||
``` | ||
mvn -Pdocker,dist -Dstarters -Dservices -Dutils clean install -T 1C |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This says "if you dont want to build..." but the command adds the properties to build them. Did you mean "if you want to"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, this one was in error.... fixing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of minor updates needed to documentation and workflows
subrepo: subdir: "core/utils/metadata-utils" merged: "9b84bb8b5a" upstream: origin: "git@github.com:NationalSecurityAgency/datawave-metadata-utils.git" branch: "main" commit: "9b84bb8b5a" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "cce3d93"
This PR pulls all of the submodules into the main datawave repo. Using the "subrepo" git mechanism (https://github.com/ingydotnet/git-subrepo#readme) we can merge in updates to submodules for existing PRs. All subsequent PRs against microservices/starters/util modules should be done against the main datawave repo.
Added profiles activated by properties of the same name to include the various submodules into a build/test. Also included several profiles/properties: utils, services, and starters that will include all of the modules of that type into the build/test. Updated the github test workflow to include everything.
It is probably easier to look at the separate commits instead. The subrepo automated commits simply pulled in the main branch of the various submodules. There is one additional commit that changes the various profiles that is worth looking at.