Skip to content

Commit 8cf86f5

Browse files
ttosta-googlettosta-google
committed
chore: Relocate maven artifacts and continue to support old names.
1 parent ad992a7 commit 8cf86f5

File tree

31 files changed

+840
-149
lines changed

31 files changed

+840
-149
lines changed

‎.kokoro/release/publish_javadoc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ python3 -m pip install --require-hashes -r .kokoro/requirements.txt
3333
# compile all packages
3434
mvn clean install -B -q -DskipTests=true
3535

36-
export NAME=jdbc-socket-factory-parent
36+
export NAME=cloud-sql-connector-parent
3737
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
3838

3939
# build the docs

‎.kokoro/release/publish_javadoc11.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env_vars: {
1414

1515
env_vars: {
1616
key: "TRAMPOLINE_BUILD_FILE"
17-
value: "github/jdbc-socket-factory-parent/.kokoro/release/publish_javadoc11.sh"
17+
value: "github/cloud-sql-connector-parent/.kokoro/release/publish_javadoc11.sh"
1818
}
1919

2020
before_action {

‎.kokoro/release/publish_javadoc11.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ python3 -m pip install --require-hashes -r .kokoro/requirements.txt
3333
# compile all packages
3434
mvn clean install -B -q -DskipTests=true
3535

36-
export NAME=jdbc-socket-factory-parent
36+
export NAME=cloud-sql-connector-parent
3737
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
3838

3939
# cloud RAD generation

‎.kokoro/release/snapshot.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
env_vars: {
44
key: "TRAMPOLINE_BUILD_FILE"
5-
value: "github/jdbc-socket-factory-parent/.kokoro/release/snapshot.sh"
5+
value: "github/cloud-sql-connector-parent/.kokoro/release/snapshot.sh"
66
}
77

88

99
action {
1010
define_artifacts {
11-
regex: "github/jdbc-socket-factory-parent/.*/target/.*\.jar"
12-
strip_prefix: "github/jdbc-socket-factory-parent"
11+
regex: "github/cloud-sql-connector-parent/.*/target/.*\.jar"
12+
strip_prefix: "github/cloud-sql-connector-parent"
1313
}
1414
}

‎.kokoro/release/stage.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
env_vars: {
44
key: "TRAMPOLINE_BUILD_FILE"
5-
value: "github/jdbc-socket-factory-parent/.kokoro/release/stage.sh"
5+
value: "github/cloud-sql-connector-parent/.kokoro/release/stage.sh"
66
}
77

88
# Need to save the properties file
99
action {
1010
define_artifacts {
11-
regex: "github/jdbc-socket-factory-parent/target/nexus-staging/staging/*.properties"
12-
strip_prefix: "github/jdbc-socket-factory-parent"
11+
regex: "github/cloud-sql-connector-parent/target/nexus-staging/staging/*.properties"
12+
strip_prefix: "github/cloud-sql-connector-parent"
1313
}
1414
}
1515

1616
# Save jar artifacts for SBOM generation
1717
action {
1818
define_artifacts {
19-
regex: "github/jdbc-socket-factory-parent/.*/target/.*\.jar"
20-
strip_prefix: "github/jdbc-socket-factory-parent"
19+
regex: "github/cloud-sql-connector-parent/.*/target/.*\.jar"
20+
strip_prefix: "github/cloud-sql-connector-parent"
2121
}
2222
}
2323

‎.release/generate_sha.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515

1616
touch release_table.md
17-
types=("mysql-socket-factory" "postgres-socket-factory" "jdbc-sqlserver" "r2dbc-mysql" "r2dbc-postgres" "r2dbc-sqlserver")
17+
types=("mysql-socket-factory" "cloud-sql-connector-jdbc-postgres" "jdbc-sqlserver" "r2dbc-mysql" "r2dbc-postgres" "r2dbc-sqlserver")
1818
for t in "${types[@]}"; do
1919
echo "### $t" >> release_table.md
2020
echo "| filename | sha256 hash |" >> release_table.md

‎.repo-metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"language": "java",
77
"repo": "GoogleCloudPlatform/cloud-sql-jdbc-socket-factory",
88
"repo_short": "cloud-sql-jdbc-socket-factory",
9-
"distribution_name": "com.google.cloud.sql:jdbc-socket-factory-parent",
9+
"distribution_name": "com.google.cloud:cloud-sql-connector-parent",
1010
"api_id": "sqladmin.googleapis.com",
1111
"library_type": "OTHER",
1212
"codeowner_team": "@GoogleCloudPlatform/infra-db-sdk"

‎README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ To build a fat JAR containing the JDBC driver with the bundles Socket Factory de
3434
This will create a *target* sub-folder within each of the module directories. Within these target directories you'll find the JDBC driver files.
3535

3636
Example:
37+
<!-- {x-version-update-start:cloud-sql-connector-jdbc-mysql:released} -->
3738
```
38-
mysql-socket-factory-connector-j-8–1.8.0-jar-with-dependencies.jar
39-
postgres-socket-factory-1.8.0-jar-with-dependencies.jar
39+
cloud-sql-connector-jdbc-mariadb-1.16.0-jar-with-dependencies.jar
40+
cloud-sql-connector-jdbc-mysql–1.16.0-jar-with-dependencies.jar
41+
cloud-sql-connector-jdbc-postgres-1.16.0-jar-with-dependencies.jar
42+
cloud-sql-connector-jdbc-sqlserver-1.16.0-jar-with-dependencies.jar
4043
```
44+
<!-- {x-version-update-end} -->
4145

4246
---
4347

‎core/pom.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,20 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>com.google.cloud.sql</groupId>
25-
<artifactId>jdbc-socket-factory-parent</artifactId>
26-
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-parent:current} -->
24+
<groupId>com.google.cloud</groupId>
25+
<artifactId>cloud-sql-connector-parent</artifactId>
26+
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:cloud-sql-connector-parent:current} -->
2727
</parent>
28-
<artifactId>jdbc-socket-factory-core</artifactId>
29-
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-core:current} -->
28+
<artifactId>cloud-sql-connector-core</artifactId>
29+
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:cloud-sql-connector-core:current} -->
3030
<packaging>jar</packaging>
3131

32-
<name>Cloud SQL Core Socket Factory (Core Library, don't depend on this directly)</name>
32+
<name>Google Cloud SQL Java Connector (Core Library, don't depend on this directly)</name>
3333
<description>
3434
Core library for establishing secure connections. End users should depend on the
3535
driver-specific socket factory artifacts.
3636
</description>
37+
<url>https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory</url>
3738

3839
<properties>
3940
<assembly.skipAssembly>false</assembly.skipAssembly>

‎docs/jdbc.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,42 @@ or in `build.gradle` if your project uses Gradle.
99

1010
##### MySQL
1111

12-
<!-- {x-version-update-start:mysql-socket-factory-connector-j-8:released} -->
12+
<!-- {x-version-update-start:cloud-sql-connector-jdbc-mysql:released} -->
1313
Maven
1414

1515
```maven-pom
1616
<dependency>
17-
    <groupId>com.google.cloud.sql</groupId>
18-
    <artifactId>mysql-socket-factory-connector-j-8</artifactId>
17+
    <groupId>com.google.cloud</groupId>
18+
    <artifactId>cloud-sql-connector-jdbc-mysql</artifactId>
1919
    <version>1.16.0</version>
2020
</dependency>
2121
```
2222

2323
Gradle
2424

2525
```gradle
26-
compile 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.16.0'
26+
compile 'com.google.cloud:cloud-sql-connector-jdbc-mysql:1.16.0'
2727
```
2828

2929
<!-- {x-version-update-end} -->
3030

3131
##### Maria DB
3232

33-
<!-- {x-version-update-start:mariadb-socket-factory:released} -->
33+
<!-- {x-version-update-start:cloud-sql-connector-jdbc-mariadb:released} -->
3434
Maven
3535

3636
```maven-pom
3737
<dependency>
38-
    <groupId>com.google.cloud.sql</groupId>
39-
    <artifactId>mariadb-socket-factory</artifactId>
38+
    <groupId>com.google.cloud</groupId>
39+
    <artifactId>cloud-sql-connector-jdbc-mariadb</artifactId>
4040
    <version>1.16.0</version>
4141
</dependency>
4242
```
4343

4444
Gradle
4545

4646
```gradle
47-
compile 'com.google.cloud.sql:mariadb-socket-factory:1.16.0'
47+
compile 'com.google.cloud:cloud-sql-connector-jdbc-mariadb:1.16.0'
4848
```
4949

5050
**Note:** Also include the JDBC Driver for
@@ -53,21 +53,21 @@ MariaDB, `org.mariadb.jdbc:mariadb-java-client:<LATEST-VERSION>`
5353

5454
##### Postgres
5555

56-
<!-- {x-version-update-start:postgres-socket-factory:released} -->
56+
<!-- {x-version-update-start:cloud-sql-connector-jdbc-postgres:released} -->
5757
Maven
5858

5959
```maven-pom
6060
<dependency>
61-
    <groupId>com.google.cloud.sql</groupId>
62-
    <artifactId>postgres-socket-factory</artifactId>
61+
    <groupId>com.google.cloud</groupId>
62+
    <artifactId>cloud-sql-connector-jdbc-postgres</artifactId>
6363
    <version>1.16.0</version>
6464
</dependency>
6565
```
6666

6767
Gradle
6868

6969
```gradle
70-
compile 'com.google.cloud.sql:postgres-socket-factory:1.16.0'
70+
compile 'com.google.cloud:cloud-sql-connector-jdbc-postgres:1.16.0'
7171
```
7272

7373
**Note:** Also include the JDBC Driver for
@@ -81,16 +81,16 @@ Maven
8181

8282
```maven-pom
8383
<dependency>
84-
    <groupId>com.google.cloud.sql</groupId>
85-
    <artifactId>postgres-socket-factory</artifactId>
84+
    <groupId>com.google.cloud</groupId>
85+
    <artifactId>cloud-sql-connector-jdbc-sqlserver</artifactId>
8686
    <version>1.16.0</version>
8787
</dependency>
8888
```
8989

9090
Gradle
9191

9292
```gradle
93-
compile 'com.google.cloud.sql:cloud-sql-connector-jdbc-sqlserver:1.16.0'
93+
compile 'com.google.cloud:cloud-sql-connector-jdbc-sqlserver:1.16.0'
9494
```
9595

9696
**Note:** Also include the JDBC Driver for SQL

‎docs/r2dbc.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Maven
1616

1717
```maven-pom
1818
<dependency>
19-
<groupId>com.google.cloud.sql</groupId>
19+
<groupId>com.google.cloud</groupId>
2020
<artifactId>cloud-sql-connector-r2dbc-mysql</artifactId>
2121
<version>1.16.0</version>
2222
</dependency>
@@ -25,7 +25,7 @@ Maven
2525
Gradle
2626

2727
```gradle
28-
compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-mysql:1.16.0'
28+
compile 'com.google.cloud:cloud-sql-connector-r2dbc-mysql:1.16.0'
2929
```
3030

3131
**Note:** Also include the R2DBC Driver for
@@ -39,7 +39,7 @@ Maven
3939

4040
```maven-pom
4141
<dependency>
42-
<groupId>com.google.cloud.sql</groupId>
42+
<groupId>com.google.cloud</groupId>
4343
<artifactId>cloud-sql-connector-r2dbc-postgres</artifactId>
4444
<version>1.16.0</version>
4545
</dependency>
@@ -48,7 +48,7 @@ Maven
4848
Gradle
4949

5050
```gradle
51-
compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-postgres:1.16.0'
51+
compile 'com.google.cloud:cloud-sql-connector-r2dbc-postgres:1.16.0'
5252
```
5353

5454
**Note:** Also include the R2DBC Driver for
@@ -62,7 +62,7 @@ Maven
6262

6363
```maven-pom
6464
<dependency>
65-
<groupId>com.google.cloud.sql</groupId>
65+
<groupId>com.google.cloud</groupId>
6666
<artifactId>cloud-sql-connector-r2dbc-sqlserver</artifactId>
6767
<version>1.16.0</version>
6868
</dependency>
@@ -71,7 +71,7 @@ Maven
7171
Gradle
7272

7373
```gradle
74-
compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-sqlserver:1.16.0'
74+
compile 'com.google.cloud:cloud-sql-connector-r2dbc-sqlserver:1.16.0'
7575
```
7676

7777
**Note:** Also include the R2DBC Driver for SQL

‎jdbc/mariadb/pom.xml

+12-11
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,31 @@
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<parent>
23-
<groupId>com.google.cloud.sql</groupId>
24-
<artifactId>jdbc-socket-factory-parent</artifactId>
25-
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-parent:current} -->
23+
<groupId>com.google.cloud</groupId>
24+
<artifactId>cloud-sql-connector-parent</artifactId>
25+
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:cloud-sql-connector-parent:current} -->
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
28-
<artifactId>mariadb-socket-factory</artifactId>
29-
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:mariadb-socket-factory:current} -->
28+
<artifactId>cloud-sql-connector-jdbc-mariadb</artifactId>
29+
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:cloud-sql-connector-jdbc-mariadb:current} -->
3030
<packaging>jar</packaging>
3131

32-
<name>Cloud SQL MariaDB Socket Factory</name>
32+
<name>Google Cloud SQL JDBC Connector for MariaDB</name>
3333
<description>
34-
Socket factory for the MariaDB JDBC driver that allows a user with the appropriate permissions
35-
to connect to a Cloud SQL database without having to deal with IP allowlisting or SSL
36-
certificates manually.
34+
The Cloud SQL JDBC Connector provides a socket factory for the MariaDB JDBC driver.
35+
The socket factory provides an mTLS 1.3 connection to any specified Cloud SQL
36+
MariaDB instance without requiring any manually configured TLS certificates.
3737
</description>
38+
<url>https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory</url>
3839

3940
<properties>
4041
<assembly.skipAssembly>false</assembly.skipAssembly>
4142
</properties>
4243

4344
<dependencies>
4445
<dependency>
45-
<groupId>com.google.cloud.sql</groupId>
46-
<artifactId>jdbc-socket-factory-core</artifactId>
46+
<groupId>com.google.cloud</groupId>
47+
<artifactId>cloud-sql-connector-core</artifactId>
4748
<version>${project.parent.version}</version>
4849
</dependency>
4950
<dependency>

‎jdbc/mariadb/src/main/java/com/google/cloud/sql/mariadb/SocketFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class SocketFactory extends ConfigurableSocketFactory {
3434

3535
static {
36-
InternalConnectorRegistry.addArtifactId("mariadb-socket-factory");
36+
InternalConnectorRegistry.addArtifactId("cloud-sql-connector-jdbc-mariadb");
3737
}
3838

3939
private Configuration conf;

‎jdbc/mysql-j-8/pom.xml

+11-12
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,32 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>com.google.cloud.sql</groupId>
25-
<artifactId>jdbc-socket-factory-parent</artifactId>
26-
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:jdbc-socket-factory-parent:current} -->
24+
<groupId>com.google.cloud</groupId>
25+
<artifactId>cloud-sql-connector-parent</artifactId>
26+
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:cloud-sql-connector-parent:current} -->
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

3030
<artifactId>mysql-socket-factory-connector-j-8</artifactId>
31-
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:mysql-socket-factory-connector-j-8:current} -->
31+
<version>1.16.1-SNAPSHOT</version><!-- {x-version-update:cloud-sql-connector-jdbc-mysql:current} -->
3232
<packaging>jar</packaging>
3333

34-
<name>Cloud SQL MySQL Socket Factory (for Connector/J 8.x)</name>
34+
<name>Google Cloud SQL JDBC Connector for MySQL</name>
3535
<description>
36-
Socket factory for the MySQL JDBC driver (version 8.x) that allows a user
37-
with the appropriate
38-
permissions to connect to a Cloud SQL database without having to deal with
39-
IP allowlisting or
40-
SSL certificates manually.
36+
The Cloud SQL JDBC Connector provides a socket factory for the MySQL JDBC driver.
37+
The socket factory provides an mTLS 1.3 connection to any specified Cloud SQL
38+
MySQL instance without requiring any manually configured TLS certificates.
4139
</description>
40+
<url>https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory</url>
4241

4342
<properties>
4443
<assembly.skipAssembly>false</assembly.skipAssembly>
4544
</properties>
4645

4746
<dependencies>
4847
<dependency>
49-
<groupId>com.google.cloud.sql</groupId>
50-
<artifactId>jdbc-socket-factory-core</artifactId>
48+
<groupId>com.google.cloud</groupId>
49+
<artifactId>cloud-sql-connector-core</artifactId>
5150
<version>${project.parent.version}</version>
5251
</dependency>
5352
<dependency>

‎jdbc/mysql-j-8/src/main/java/com/google/cloud/sql/mysql/SocketFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class SocketFactory implements com.mysql.cj.protocol.SocketFactory {
3535

3636
static {
37-
InternalConnectorRegistry.addArtifactId("mysql-socket-factory-connector-j-8");
37+
InternalConnectorRegistry.addArtifactId("cloud-sql-connector-jdbc-mysql");
3838
}
3939

4040
@Override

0 commit comments

Comments
 (0)