mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Replace references to Pivotal
Closes gh-33737
This commit is contained in:
Phillip Webb
parent
eab4873d7d
commit
a369f936c9
|
|
@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
|
|||
individual is representing the project or its community.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
|
||||
contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
|
||||
contacting a project maintainer at code-of-conduct@spring.io. All complaints will
|
||||
be reviewed and investigated and will result in a response that is deemed necessary and
|
||||
appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
|
||||
with regard to the reporter of an incident.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Spring Boot is released under the Apache 2.0 license. If you would like to contr
|
|||
|
||||
== Code of Conduct
|
||||
This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
|
||||
By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
|
||||
By participating, you are expected to uphold this code. Please report unacceptable behavior to code-of-conduct@spring.io.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2022 the original author or authors.
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -129,7 +129,7 @@ class MavenPublishingConventions {
|
|||
}
|
||||
|
||||
private void customizeOrganization(MavenPomOrganization organization) {
|
||||
organization.getName().set("Pivotal Software, Inc.");
|
||||
organization.getName().set("VMware, Inc.");
|
||||
organization.getUrl().set("https://spring.io");
|
||||
}
|
||||
|
||||
|
|
@ -142,9 +142,9 @@ class MavenPublishingConventions {
|
|||
|
||||
private void customizeDevelopers(MavenPomDeveloperSpec developers) {
|
||||
developers.developer((developer) -> {
|
||||
developer.getName().set("Pivotal");
|
||||
developer.getEmail().set("info@pivotal.io");
|
||||
developer.getOrganization().set("Pivotal Software, Inc.");
|
||||
developer.getName().set("Spring");
|
||||
developer.getEmail().set("ask@spring.io");
|
||||
developer.getOrganization().set("VMware, Inc.");
|
||||
developer.getOrganizationUrl().set("https://www.spring.io");
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Spring Boot ${version}
|
||||
Copyright (c) 2012-2023 Pivotal, Inc.
|
||||
Copyright (c) 2012-2023 VMware, Inc.
|
||||
|
||||
This product is licensed to you under the Apache License, Version 2.0
|
||||
(the "License"). You may not use this product except in compliance with
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<description>Example module</description>
|
||||
<url>https://spring.io/projects/spring-boot</url>
|
||||
<organization>
|
||||
<name>Pivotal Software, Inc.</name>
|
||||
<name>Spring</name>
|
||||
<url>https://spring.io</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
|
|
@ -25,9 +25,9 @@
|
|||
</licenses>
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Pivotal</name>
|
||||
<email>info@pivotal.io</email>
|
||||
<organization>Pivotal Software, Inc.</organization>
|
||||
<name>Spring</name>
|
||||
<email>ask@spring.io</email>
|
||||
<organization>Spring</organization>
|
||||
<organizationUrl>https://www.spring.io</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<description>Example module</description>
|
||||
<url>https://spring.io/projects/spring-boot</url>
|
||||
<organization>
|
||||
<name>Pivotal Software, Inc.</name>
|
||||
<name>Spring</name>
|
||||
<url>https://spring.io</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
|
|
@ -25,9 +25,9 @@
|
|||
</licenses>
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Pivotal</name>
|
||||
<email>info@pivotal.io</email>
|
||||
<organization>Pivotal Software, Inc.</organization>
|
||||
<name>Spring</name>
|
||||
<email>ask@spring.io</email>
|
||||
<organization>Spring</organization>
|
||||
<organizationUrl>https://www.spring.io</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
|
|
@ -45,5 +45,5 @@
|
|||
<url>
|
||||
https://github.com/spring-projects/spring-boot/issues
|
||||
</url>
|
||||
</issueManagement>
|
||||
</issueManagement>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<description>Example module</description>
|
||||
<url>https://spring.io/projects/spring-boot</url>
|
||||
<organization>
|
||||
<name>Pivotal Software, Inc.</name>
|
||||
<name>Spring</name>
|
||||
<url>https://spring.io</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
|
|
@ -25,9 +25,9 @@
|
|||
</licenses>
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Pivotal</name>
|
||||
<email>info@pivotal.io</email>
|
||||
<organization>Pivotal Software, Inc.</organization>
|
||||
<name>Spring</name>
|
||||
<email>ask@spring.io</email>
|
||||
<organization>Spring</organization>
|
||||
<organizationUrl>https://www.spring.io</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
|
|
@ -45,5 +45,5 @@
|
|||
<url>
|
||||
https://github.com/spring-projects/spring-boot/issues
|
||||
</url>
|
||||
</issueManagement>
|
||||
</issueManagement>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -141,11 +141,11 @@ class EmbeddedLdapAutoConfigurationTests {
|
|||
@Test
|
||||
void testMultiBaseDn() {
|
||||
this.contextRunner.withPropertyValues("spring.ldap.embedded.ldif:classpath:schema-multi-basedn.ldif",
|
||||
"spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=pivotal,dc=io")
|
||||
"spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=vmware,dc=com")
|
||||
.run((context) -> {
|
||||
InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class);
|
||||
assertThat(server.countEntriesBelow("ou=company1,c=Sweden,dc=spring,dc=org")).isEqualTo(5);
|
||||
assertThat(server.countEntriesBelow("c=Sweden,dc=pivotal,dc=io")).isEqualTo(2);
|
||||
assertThat(server.countEntriesBelow("c=Sweden,dc=vmware,dc=com")).isEqualTo(2);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,24 +84,24 @@ sn: Person
|
|||
description: Sweden, Company1, Some Person
|
||||
telephoneNumber: +46 555-456321
|
||||
|
||||
dn: dc=pivotal,dc=io
|
||||
dn: dc=vmware,dc=com
|
||||
objectclass: top
|
||||
objectclass: domain
|
||||
objectclass: extensibleObject
|
||||
dc: pivotal
|
||||
dc: vmware
|
||||
|
||||
dn: ou=groups,dc=pivotal,dc=io
|
||||
dn: ou=groups,dc=vmware,dc=com
|
||||
objectclass: top
|
||||
objectclass: organizationalUnit
|
||||
ou: groups
|
||||
|
||||
dn: c=Sweden,dc=pivotal,dc=io
|
||||
dn: c=Sweden,dc=vmware,dc=com
|
||||
objectclass: top
|
||||
objectclass: country
|
||||
c: Sweden
|
||||
description:The country of Sweden
|
||||
|
||||
dn: cn=Some Random Person,c=Sweden,dc=pivotal,dc=io
|
||||
dn: cn=Some Random Person,c=Sweden,dc=vmware,dc=com
|
||||
objectclass: top
|
||||
objectclass: person
|
||||
objectclass: organizationalPerson
|
||||
|
|
@ -110,5 +110,5 @@ uid: some.random.person
|
|||
userPassword: password
|
||||
cn: Some Random Person
|
||||
sn: Person
|
||||
description: Sweden, Pivotal, Some Random Person
|
||||
description: Sweden, VMware, Some Random Person
|
||||
telephoneNumber: +46 555-123456
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ open_source_licenses.txt
|
|||
Spring Boot CLI
|
||||
==================================================================
|
||||
|
||||
Pivotal makes available all content in this download ("Content").
|
||||
VMware makes available all content in this download ("Content").
|
||||
Unless otherwise indicated below, the Content is provided to you under
|
||||
the terms and conditions of the Apache License 2.0 (the "License"). A
|
||||
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
|
|||
downloading the Source Files from https://github.com/spring-projects/spring-boot,
|
||||
or by sending a request, with your name and address to:
|
||||
|
||||
Pivotal, Inc., 875 Howard St,
|
||||
VMware, Inc., 875 Howard St,
|
||||
San Francisco, CA 94103
|
||||
United States of America
|
||||
|
||||
or email info@pivotal.io. All such requests should clearly specify:
|
||||
or email ask@spring.io. All such requests should clearly specify:
|
||||
|
||||
OPEN SOURCE FILES REQUEST
|
||||
Attention General Counsel
|
||||
|
|
|
|||
|
|
@ -568,7 +568,7 @@ In yaml files, you can use the yaml list notation. In properties files, you must
|
|||
----
|
||||
spring.ldap.embedded.base-dn:
|
||||
- "dc=spring,dc=io"
|
||||
- "dc=pivotal,dc=io"
|
||||
- "dc=vmware,dc=com"
|
||||
----
|
||||
====
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<url>https://github.com/spring-projects/spring-boot/issues</url>
|
||||
</issueManagement>
|
||||
<organization>
|
||||
<name>Pivotal Software, Inc.</name>
|
||||
<name>Spring</name>
|
||||
<url>https://spring.io</url>
|
||||
</organization>
|
||||
<build>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user