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

Standardize version property names #2460

Merged
merged 12 commits into from
Nov 6, 2024
Merged

Standardize version property names #2460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ce4e67
Standardize version property names
foster33 Jul 5, 2024
d49b943
change property names to version.datawave.___
foster33 Jul 9, 2024
fde8c09
Merge branch 'integration' into version-property-names
foster33 Jul 9, 2024
7b72683
correct type-utils version
foster33 Jul 10, 2024
4dad491
Merge branch 'integration' into version-property-names
foster33 Jul 18, 2024
c6e129a
Merge branch 'integration' into version-property-names
foster33 Aug 2, 2024
58faf95
Merge branch 'integration' into version-property-names
foster33 Aug 9, 2024
e6bd96c
Merge branch 'integration' into version-property-names
foster33 Aug 20, 2024
8569b20
Merge branch 'integration' into version-property-names
jwomeara Sep 12, 2024
d116d51
Merge branch 'integration' into version-property-names
foster33 Sep 13, 2024
2acfb97
Merge branch 'integration' into version-property-names
foster33 Sep 26, 2024
449296f
Merge branch 'integration' into version-property-names
ivakegg Nov 6, 2024
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
4 changes: 2 additions & 2 deletions BUILDME.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ mvn -Pdev,assemble,rpm -Ddeploy -Dtar -Ddist -DskipTests clean install

Datawave web services utilize several microservices at runtime (currently authorization and auditing, although that
list will expand soon). Datawave depends on api modules for some of these services, and the dependencies are set in
the parent pom (see `version.microservice.*` properties) to released versions. If you wish to build the microservices
the parent pom (see `version.datawave.*` properties) to released versions. If you wish to build the microservices
for some reason, you can simply add `-Dservices` to your maven build command.

### Releasing Microservices
Expand Down Expand Up @@ -95,7 +95,7 @@ the authorization service API version 1.0 is tagged with `svc_authorization-api_

Note that simply building a new API or service release won't ensure that it is used anywhere. You will need to update
build properties in either the datawave parent pom or within other service poms (for cross-service dependencies) to
ensure that the new version is used. Look for properties starting with `version.microservice.` to see what to update.
ensure that the new version is used. Look for properties starting with `version.datawave.` to see what to update.
If you are updating an API module, you should be careful. In general, the associated service will need to be updated as
well to support the API changes. The service should _add_ a new version of the API and continue to support the old
version until it can be ensured that there are no more consumers of the old API.
Expand Down
56 changes: 28 additions & 28 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@
<version.commons-text>1.11.0</version.commons-text>
<version.curator>5.2.0</version.curator>
<version.curator.test>5.2.0</version.curator.test>
<version.datawave.accumulo-api>4.0.0</version.datawave.accumulo-api>
<version.datawave.accumulo-utils>4.0.0</version.datawave.accumulo-utils>
<version.datawave.audit-api>4.0.0</version.datawave.audit-api>
<version.datawave.authorization-api>4.0.0</version.datawave.authorization-api>
<version.datawave.base-rest-responses>4.0.0</version.datawave.base-rest-responses>
<version.datawave.common-utils>3.0.0</version.datawave.common-utils>
<version.datawave.dictionary-api>4.0.1</version.datawave.dictionary-api>
<version.datawave.mapreduce-query-api>1.0.0</version.datawave.mapreduce-query-api>
<version.datawave.metadata-utils>4.0.6</version.datawave.metadata-utils>
<version.datawave.metrics-reporter>3.0.0</version.datawave.metrics-reporter>
<version.datawave.query-api>1.0.0</version.datawave.query-api>
<version.datawave.query-metric-api>4.0.7</version.datawave.query-metric-api>
<version.datawave.type-utils>3.0.3</version.datawave.type-utils>
<version.deltaspike>1.9.0</version.deltaspike>
<version.easymock>5.2.0</version.easymock>
<version.eclipse.emf>2.15.0</version.eclipse.emf>
Expand Down Expand Up @@ -99,19 +112,6 @@
<version.lucene>7.5.0</version.lucene>
<version.maven-install-plugin>2.5.2</version.maven-install-plugin>
<version.metrics-cdi>1.6.0</version.metrics-cdi>
<version.microservice.accumulo-api>4.0.0</version.microservice.accumulo-api>
<version.microservice.accumulo-utils>4.0.0</version.microservice.accumulo-utils>
<version.microservice.audit-api>4.0.0</version.microservice.audit-api>
<version.microservice.authorization-api>4.0.0</version.microservice.authorization-api>
<version.microservice.base-rest-responses>4.0.0</version.microservice.base-rest-responses>
<version.microservice.common-utils>3.0.0</version.microservice.common-utils>
<version.microservice.dictionary-api>4.0.1</version.microservice.dictionary-api>
<version.microservice.mapreduce-query-api>1.0.0</version.microservice.mapreduce-query-api>
<version.microservice.metadata-utils>4.0.6</version.microservice.metadata-utils>
<version.microservice.metrics-reporter>3.0.0</version.microservice.metrics-reporter>
<version.microservice.query-api>1.0.0</version.microservice.query-api>
<version.microservice.query-metric-api>4.0.7</version.microservice.query-metric-api>
<version.microservice.type-utils>3.0.3</version.microservice.type-utils>
<version.minlog>1.2</version.minlog>
<version.mockito>2.23.0</version.mockito>
<version.mysql-connector>8.0.28</version.mysql-connector>
Expand Down Expand Up @@ -335,47 +335,47 @@
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>accumulo-api</artifactId>
<version>${version.microservice.accumulo-api}</version>
<version>${version.datawave.accumulo-api}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>accumulo-utils</artifactId>
<version>${version.microservice.accumulo-utils}</version>
<version>${version.datawave.accumulo-utils}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>audit-api</artifactId>
<version>${version.microservice.audit-api}</version>
<version>${version.datawave.audit-api}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>authorization-api</artifactId>
<version>${version.microservice.authorization-api}</version>
<version>${version.datawave.authorization-api}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>base-rest-responses</artifactId>
<version>${version.microservice.base-rest-responses}</version>
<version>${version.datawave.base-rest-responses}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>common-utils</artifactId>
<version>${version.microservice.common-utils}</version>
<version>${version.datawave.common-utils}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>dictionary-api</artifactId>
<version>${version.microservice.dictionary-api}</version>
<version>${version.datawave.dictionary-api}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>mapreduce-query-api</artifactId>
<version>${version.microservice.mapreduce-query-api}</version>
<version>${version.datawave.mapreduce-query-api}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>metadata-utils</artifactId>
<version>${version.microservice.metadata-utils}</version>
<version>${version.datawave.metadata-utils}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
Expand All @@ -394,23 +394,23 @@
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>metrics-reporter</artifactId>
<version>${version.microservice.metrics-reporter}</version>
<version>${version.datawave.metrics-reporter}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>query-api</artifactId>
<version>${version.microservice.query-api}</version>
<version>${version.datawave.query-api}</version>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>query-api</artifactId>
<version>${version.microservice.query-api}</version>
<version>${version.datawave.query-api}</version>
<classifier>jboss</classifier>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>query-metric-api</artifactId>
<version>${version.microservice.query-metric-api}</version>
<version>${version.datawave.query-metric-api}</version>
<exclusions>
<exclusion>
<groupId>gov.nsa.datawave</groupId>
Expand Down Expand Up @@ -445,7 +445,7 @@
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>type-utils</artifactId>
<version>${version.microservice.type-utils}</version>
<version>${version.datawave.type-utils}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
Expand Down Expand Up @@ -1135,7 +1135,7 @@
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>base-rest-responses</artifactId>
<version>${version.microservice.base-rest-responses}</version>
<version>${version.datawave.base-rest-responses}</version>
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
Expand Down
Loading