Skip to content

Commit a369f93

Browse files
philwebbphilwebb
committed
Replace references to Pivotal
Closes gh-33737
1 parent eab4873 commit a369f93

File tree

12 files changed

+36
-36
lines changed

12 files changed

+36
-36
lines changed

‎CODE_OF_CONDUCT.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434
individual is representing the project or its community.
3535

3636
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
37-
contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
37+
contacting a project maintainer at code-of-conduct@spring.io. All complaints will
3838
be reviewed and investigated and will result in a response that is deemed necessary and
3939
appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
4040
with regard to the reporter of an incident.

‎CONTRIBUTING.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Spring Boot is released under the Apache 2.0 license. If you would like to contr
66

77
== Code of Conduct
88
This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
9-
By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
9+
By participating, you are expected to uphold this code. Please report unacceptable behavior to code-of-conduct@spring.io.
1010

1111

1212

‎buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@ private void suppressMavenOptionalFeatureWarnings(MavenPublication publication)
129129
}
130130

131131
private void customizeOrganization(MavenPomOrganization organization) {
132-
organization.getName().set("Pivotal Software, Inc.");
132+
organization.getName().set("VMware, Inc.");
133133
organization.getUrl().set("https://spring.io");
134134
}
135135

@@ -142,9 +142,9 @@ private void customizeLicences(MavenPomLicenseSpec licences) {
142142

143143
private void customizeDevelopers(MavenPomDeveloperSpec developers) {
144144
developers.developer((developer) -> {
145-
developer.getName().set("Pivotal");
146-
developer.getEmail().set("info@pivotal.io");
147-
developer.getOrganization().set("Pivotal Software, Inc.");
145+
developer.getName().set("Spring");
146+
developer.getEmail().set("ask@spring.io");
147+
developer.getOrganization().set("VMware, Inc.");
148148
developer.getOrganizationUrl().set("https://www.spring.io");
149149
});
150150
}

‎buildSrc/src/main/resources/NOTICE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Spring Boot ${version}
2-
Copyright (c) 2012-2023 Pivotal, Inc.
2+
Copyright (c) 2012-2023 VMware, Inc.
33

44
This product is licensed to you under the Apache License, Version 2.0
55
(the "License"). You may not use this product except in compliance with

‎ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Example module</description>
1515
<url>https://spring.io/projects/spring-boot</url>
1616
<organization>
17-
<name>Pivotal Software, Inc.</name>
17+
<name>Spring</name>
1818
<url>https://spring.io</url>
1919
</organization>
2020
<licenses>
@@ -25,9 +25,9 @@
2525
</licenses>
2626
<developers>
2727
<developer>
28-
<name>Pivotal</name>
29-
<email>info@pivotal.io</email>
30-
<organization>Pivotal Software, Inc.</organization>
28+
<name>Spring</name>
29+
<email>ask@spring.io</email>
30+
<organization>Spring</organization>
3131
<organizationUrl>https://www.spring.io</organizationUrl>
3232
</developer>
3333
</developers>

‎ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Example module</description>
1515
<url>https://spring.io/projects/spring-boot</url>
1616
<organization>
17-
<name>Pivotal Software, Inc.</name>
17+
<name>Spring</name>
1818
<url>https://spring.io</url>
1919
</organization>
2020
<licenses>
@@ -25,9 +25,9 @@
2525
</licenses>
2626
<developers>
2727
<developer>
28-
<name>Pivotal</name>
29-
<email>info@pivotal.io</email>
30-
<organization>Pivotal Software, Inc.</organization>
28+
<name>Spring</name>
29+
<email>ask@spring.io</email>
30+
<organization>Spring</organization>
3131
<organizationUrl>https://www.spring.io</organizationUrl>
3232
</developer>
3333
</developers>
@@ -45,5 +45,5 @@
4545
<url>
4646
https://github.com/spring-projects/spring-boot/issues
4747
</url>
48-
</issueManagement>
48+
</issueManagement>
4949
</project>

‎ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Example module</description>
1515
<url>https://spring.io/projects/spring-boot</url>
1616
<organization>
17-
<name>Pivotal Software, Inc.</name>
17+
<name>Spring</name>
1818
<url>https://spring.io</url>
1919
</organization>
2020
<licenses>
@@ -25,9 +25,9 @@
2525
</licenses>
2626
<developers>
2727
<developer>
28-
<name>Pivotal</name>
29-
<email>info@pivotal.io</email>
30-
<organization>Pivotal Software, Inc.</organization>
28+
<name>Spring</name>
29+
<email>ask@spring.io</email>
30+
<organization>Spring</organization>
3131
<organizationUrl>https://www.spring.io</organizationUrl>
3232
</developer>
3333
</developers>
@@ -45,5 +45,5 @@
4545
<url>
4646
https://github.com/spring-projects/spring-boot/issues
4747
</url>
48-
</issueManagement>
48+
</issueManagement>
4949
</project>

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -141,11 +141,11 @@ void testCustomSchemaValidation() {
141141
@Test
142142
void testMultiBaseDn() {
143143
this.contextRunner.withPropertyValues("spring.ldap.embedded.ldif:classpath:schema-multi-basedn.ldif",
144-
"spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=pivotal,dc=io")
144+
"spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=vmware,dc=com")
145145
.run((context) -> {
146146
InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class);
147147
assertThat(server.countEntriesBelow("ou=company1,c=Sweden,dc=spring,dc=org")).isEqualTo(5);
148-
assertThat(server.countEntriesBelow("c=Sweden,dc=pivotal,dc=io")).isEqualTo(2);
148+
assertThat(server.countEntriesBelow("c=Sweden,dc=vmware,dc=com")).isEqualTo(2);
149149
});
150150
}
151151

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,24 @@ sn: Person
8484
description: Sweden, Company1, Some Person
8585
telephoneNumber: +46 555-456321
8686

87-
dn: dc=pivotal,dc=io
87+
dn: dc=vmware,dc=com
8888
objectclass: top
8989
objectclass: domain
9090
objectclass: extensibleObject
91-
dc: pivotal
91+
dc: vmware
9292

93-
dn: ou=groups,dc=pivotal,dc=io
93+
dn: ou=groups,dc=vmware,dc=com
9494
objectclass: top
9595
objectclass: organizationalUnit
9696
ou: groups
9797

98-
dn: c=Sweden,dc=pivotal,dc=io
98+
dn: c=Sweden,dc=vmware,dc=com
9999
objectclass: top
100100
objectclass: country
101101
c: Sweden
102102
description:The country of Sweden
103103

104-
dn: cn=Some Random Person,c=Sweden,dc=pivotal,dc=io
104+
dn: cn=Some Random Person,c=Sweden,dc=vmware,dc=com
105105
objectclass: top
106106
objectclass: person
107107
objectclass: organizationalPerson
@@ -110,5 +110,5 @@ uid: some.random.person
110110
userPassword: password
111111
cn: Some Random Person
112112
sn: Person
113-
description: Sweden, Pivotal, Some Random Person
113+
description: Sweden, VMware, Some Random Person
114114
telephoneNumber: +46 555-123456

‎spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ open_source_licenses.txt
33
Spring Boot CLI
44
==================================================================
55

6-
Pivotal makes available all content in this download ("Content").
6+
VMware makes available all content in this download ("Content").
77
Unless otherwise indicated below, the Content is provided to you under
88
the terms and conditions of the Apache License 2.0 (the "License"). A
99
copy of the license is available in the file called LICENSE.txt or you
@@ -249,11 +249,11 @@ components and modifications thereto, if any, (the "Source Files"), by
249249
downloading the Source Files from https://github.com/spring-projects/spring-boot,
250250
or by sending a request, with your name and address to:
251251

252-
Pivotal, Inc., 875 Howard St,
252+
VMware, Inc., 875 Howard St,
253253
San Francisco, CA 94103
254254
United States of America
255255

256-
or email info@pivotal.io. All such requests should clearly specify:
256+
or email ask@spring.io. All such requests should clearly specify:
257257

258258
OPEN SOURCE FILES REQUEST
259259
Attention General Counsel

‎spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ In yaml files, you can use the yaml list notation. In properties files, you must
568568
----
569569
spring.ldap.embedded.base-dn:
570570
- "dc=spring,dc=io"
571-
- "dc=pivotal,dc=io"
571+
- "dc=vmware,dc=com"
572572
----
573573
====
574574

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<url>https://github.com/spring-projects/spring-boot/issues</url>
2828
</issueManagement>
2929
<organization>
30-
<name>Pivotal Software, Inc.</name>
30+
<name>Spring</name>
3131
<url>https://spring.io</url>
3232
</organization>
3333
<build>

0 commit comments

Comments
 (0)