Skip to content

Commit a25ff91

Browse files
clunclun
committed
update archetypes
1 parent ec2d58a commit a25ff91

File tree

23 files changed

+751
-399
lines changed

23 files changed

+751
-399
lines changed

‎astra-sdk-archetypes/astra-sdk-quickstart/pom.xml‎

Lines changed: 56 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,62 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.datastax.astra</groupId>
5-
<artifactId>astra-sdk-quickstart</artifactId>
6-
<packaging>maven-archetype</packaging>
7-
<name>+ archetype::astra-sdk-quickstart</name>
8-
9-
<parent>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
105
<groupId>com.datastax.astra</groupId>
11-
<artifactId>astra-sdk-archetypes</artifactId>
12-
<version>0.6.2-SNAPSHOT</version>
13-
</parent>
6+
<artifactId>astra-sdk-quickstart</artifactId>
7+
<packaging>maven-archetype</packaging>
8+
<name>+ archetype::astra-sdk-quickstart</name>
9+
10+
<parent>
11+
<groupId>com.datastax.astra</groupId>
12+
<artifactId>astra-sdk-archetypes</artifactId>
13+
<version>0.6.2-SNAPSHOT</version>
14+
</parent>
15+
16+
<build>
17+
<extensions>
18+
<extension>
19+
<groupId>org.apache.maven.archetype</groupId>
20+
<artifactId>archetype-packaging</artifactId>
21+
<version>3.2.1</version>
22+
</extension>
23+
</extensions>
24+
25+
<pluginManagement>
26+
<plugins>
27+
<plugin>
28+
<artifactId>maven-archetype-plugin</artifactId>
29+
<version>3.2.1</version>
30+
</plugin>
31+
</plugins>
32+
</pluginManagement>
33+
34+
<plugins>
35+
<plugin>
36+
<groupId>com.google.code.maven-replacer-plugin</groupId>
37+
<artifactId>replacer</artifactId>
38+
<version>1.5.2</version>
39+
<executions>
40+
<execution>
41+
<phase>prepare-package</phase>
42+
<goals>
43+
<goal>replace</goal>
44+
</goals>
45+
</execution>
46+
</executions>
47+
<configuration>
48+
<file>astra-sdk-archetypes/astra-sdk-quickstart/target/classes/archetype-resources/pom.xml</file>
49+
<replacements>
50+
<replacement>
51+
<token>\$\{archetypeVersion\}</token>
52+
<value>${version}</value>
53+
</replacement>
54+
</replacements>
55+
</configuration>
56+
</plugin>
57+
</plugins>
1458

15-
<build>
16-
<extensions>
17-
<extension>
18-
<groupId>org.apache.maven.archetype</groupId>
19-
<artifactId>archetype-packaging</artifactId>
20-
<version>3.2.1</version>
21-
</extension>
22-
</extensions>
59+
</build>
2360

24-
<pluginManagement>
25-
<plugins>
26-
<plugin>
27-
<artifactId>maven-archetype-plugin</artifactId>
28-
<version>3.2.1</version>
29-
</plugin>
30-
</plugins>
31-
</pluginManagement>
32-
</build>
3361

34-
3562
</project>

‎astra-sdk-archetypes/astra-sdk-quickstart/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,21 @@
88
<groupId>${groupId}</groupId>
99
<version>${version}</version>
1010

11+
<properties>
12+
<astra-sdk-starter.version>${archetypeVersion}</astra-sdk-starter.version>
13+
<junit.version>5.9.3</junit.version>
14+
</properties>
15+
1116
<dependencies>
1217
<dependency>
1318
<groupId>com.datastax.astra</groupId>
1419
<artifactId>astra-sdk</artifactId>
15-
<version>0.6.1</version>
20+
<version>${astra-sdk-starter.version}</version>
1621
</dependency>
1722
<dependency>
1823
<groupId>org.junit.jupiter</groupId>
1924
<artifactId>junit-jupiter-engine</artifactId>
20-
<version>5.9.3</version>
25+
<version>${junit.version}</version>
2126
<scope>test</scope>
2227
</dependency>
2328
</dependencies>

‎astra-sdk-archetypes/spring-boot-2x-archetype/pom.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,32 @@
2929
</plugin>
3030
</plugins>
3131
</pluginManagement>
32+
33+
<plugins>
34+
<plugin>
35+
<groupId>com.google.code.maven-replacer-plugin</groupId>
36+
<artifactId>replacer</artifactId>
37+
<version>1.5.2</version>
38+
<executions>
39+
<execution>
40+
<phase>prepare-package</phase>
41+
<goals>
42+
<goal>replace</goal>
43+
</goals>
44+
</execution>
45+
</executions>
46+
<configuration>
47+
<file>astra-sdk-archetypes/spring-boot-2x-archetype/target/classes/archetype-resources/pom.xml</file>
48+
<replacements>
49+
<replacement>
50+
<token>\$\{archetypeVersion\}</token>
51+
<value>${version}</value>
52+
</replacement>
53+
</replacements>
54+
</configuration>
55+
</plugin>
56+
</plugins>
57+
3258
</build>
3359

3460

‎astra-sdk-archetypes/spring-boot-2x-archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<version>2.7.12</version>
1313
</parent>
1414

15+
<properties>
16+
<astra-sdk-starter.version>${archetypeVersion}</astra-sdk-starter.version>
17+
</properties>
18+
1519
<dependencies>
1620

1721
<!-- CRUD API for Cassandra -->
@@ -28,7 +32,7 @@
2832
<dependency>
2933
<groupId>com.datastax.astra</groupId>
3034
<artifactId>astra-spring-boot-starter</artifactId>
31-
<version>0.6</version>
35+
<version>${astra-sdk-starter.version}</version>
3236
</dependency>
3337

3438
<!-- Test -->

‎astra-sdk-archetypes/spring-boot-3x-archetype/pom.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,31 @@
2929
</plugin>
3030
</plugins>
3131
</pluginManagement>
32+
33+
<plugins>
34+
<plugin>
35+
<groupId>com.google.code.maven-replacer-plugin</groupId>
36+
<artifactId>replacer</artifactId>
37+
<version>1.5.2</version>
38+
<executions>
39+
<execution>
40+
<phase>prepare-package</phase>
41+
<goals>
42+
<goal>replace</goal>
43+
</goals>
44+
</execution>
45+
</executions>
46+
<configuration>
47+
<file>astra-sdk-archetypes/spring-boot-3x-archetype/target/classes/archetype-resources/pom.xml</file>
48+
<replacements>
49+
<replacement>
50+
<token>\$\{archetypeVersion\}</token>
51+
<value>${version}</value>
52+
</replacement>
53+
</replacements>
54+
</configuration>
55+
</plugin>
56+
</plugins>
3257
</build>
3358

3459

‎astra-sdk-archetypes/spring-boot-3x-archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</parent>
1515

1616
<properties>
17-
<astra-sdk.version>0.6</astra-sdk.version>
17+
<astra-sdk-starter.version>${archetypeVersion}</astra-sdk-starter.version>
1818
<cassandra-driver.version>4.16.0</cassandra-driver.version>
1919
</properties>
2020

@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>com.datastax.astra</groupId>
3636
<artifactId>astra-spring-boot-3x-starter</artifactId>
37-
<version>${astra-sdk.version}</version>
37+
<version>${astra-sdk-starter.version}</version>
3838
</dependency>
3939
<!-- Override Spring or any third party Dependency -->
4040
<dependency>

‎astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/AbstractApiClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public abstract class AbstractApiClient {
2121
/**
2222
* Default constructor.
2323
*
24+
* @param env
25+
* astra environment
2426
* @param token
2527
* token value
2628
*/

‎astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DatabaseClient.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class DatabaseClient extends AbstractApiClient {
3939
*
4040
* @param token
4141
* authenticated token
42+
* @param databaseId
43+
* database identifier
4244
*/
4345
public DatabaseClient(String token, String databaseId) {
4446
this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
@@ -51,6 +53,8 @@ public DatabaseClient(String token, String databaseId) {
5153
* define target environment to be used
5254
* @param token
5355
* authenticated token
56+
* @param databaseId
57+
* database identifier
5458
*/
5559
public DatabaseClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
5660
super(token, env);

‎astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbAccessListsClient.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class DbAccessListsClient extends AbstractApiClient {
2727
*
2828
* @param token
2929
* authenticated token
30+
* @param databaseId
31+
* database identifier
3032
*/
3133
public DbAccessListsClient(String token, String databaseId) {
3234
this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
@@ -39,6 +41,8 @@ public DbAccessListsClient(String token, String databaseId) {
3941
* define target environment to be used
4042
* @param token
4143
* authenticated token
44+
* @param databaseId
45+
* database identifier
4246
*/
4347
public DbAccessListsClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
4448
super(token, env);

‎astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbCdcsClient.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class DbCdcsClient extends AbstractApiClient {
3939
*
4040
* @param token
4141
* authenticated token
42+
* @param databaseId
43+
* database identifier
4244
*/
4345
public DbCdcsClient(String token, String databaseId) {
4446
this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
@@ -51,6 +53,8 @@ public DbCdcsClient(String token, String databaseId) {
5153
* define target environment to be used
5254
* @param token
5355
* authenticated token
56+
* @param databaseId
57+
* database identifier
5458
*/
5559
public DbCdcsClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
5660
super(token, env);

0 commit comments

Comments
 (0)