提交更新

master
星期八 5 years ago
parent 8574f977a2
commit 9940905d91
  1. 132
      CODE_OF_CONDUCT.adoc
  2. 6
      build.gradle
  3. 2
      settings.gradle
  4. 6
      spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
  5. 2
      spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
  6. 8
      spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java

@ -1,44 +1,88 @@
= Contributor Code of Conduct
As contributors and maintainers of this project, and in the interest of fostering an open
and welcoming community, we pledge to respect all people who contribute through reporting
issues, posting feature requests, updating documentation, submitting pull requests or
patches, and other activities.
We are committed to making participation in this project a harassment-free experience for
everyone, regardless of level of experience, gender, gender identity and expression,
sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
religion, or nationality.
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic addresses,
without explicit permission
* Other unethical or unprofessional conduct
Project maintainers have the right and responsibility to remove, edit, or reject comments,
commits, code, wiki edits, issues, and other contributions that are not aligned to this
Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
that they deem inappropriate, threatening, offensive, or harmful.
By adopting this Code of Conduct, project maintainers commit themselves to fairly and
consistently applying these principles to every aspect of managing this project. Project
maintainers who do not follow or enforce the Code of Conduct may be permanently removed
from the project team.
This Code of Conduct applies both within project spaces and in public spaces when an
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
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.
This Code of Conduct is adapted from the
https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
=贡献者行为准则
作为这个项目的贡献者和维护者,为了培养一个开放的
欢迎社会各界人士,我们承诺尊重所有通过报道作出贡献的人
发布、发布功能请求、更新文档、提交请求或
修补程序和其他活动。
我们致力于使参与该项目成为
每个人,不管经验,性别,性别认同和表达,
性取向,残疾,个人外貌,体型,种族,种族,年龄,
宗教或国籍。
参与者不可接受行为的例子包括:
*性化语言或意象的使用
*人身攻击
*辱骂或侮辱性/贬损性评论
*公共或私人骚扰
*发布他人的私人信息,如物理或电子地址,
未经明确许可
*其他不道德或不专业的行为
项目维护人员有权和责任删除、编辑或拒绝评论,
提交、代码、wiki编辑、问题和其他与此不一致的贡献
行为准则,或暂时或永久禁止任何其他行为的贡献者
他们认为不适当、威胁、冒犯或有害的。
通过采用这一行为准则,项目维护人员将致力于
始终将这些原则应用于项目管理的各个方面。项目
不遵守或执行行为准则的维护人员可能会被永久撤职
来自项目组。
本行为准则适用于项目空间和公共空间内
个人代表项目或其社区。
虐待、骚扰或其他不可接受的行为可由
通过spring-code-of-conduct@pivotal.io联系项目维护人员。所有的投诉都会
接受审查和调查,并做出必要的回应
适合当时的情况。维护者有义务保持机密性
关于一个事件的记者。
本行为准则改编自
https://contributor convention.org[contributor convention],1.3.0版,可在
https://contributor convention.org/version/1/3/0/[contributor convention.org/version/1/3/0/]

@ -1,5 +1,7 @@
buildscript {
repositories {
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven{ url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
maven { url "https://repo.spring.io/plugins-release" }
}
dependencies {
@ -154,8 +156,10 @@ configure(allprojects) { project ->
}
repositories {
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven{ url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
mavenCentral()
maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/snapshot" } // Reactor
mavenLocal()
}

@ -30,3 +30,5 @@ rootProject.name = "spring"
rootProject.children.each {project ->
project.buildFileName = "${project.name}.gradle"
}

@ -783,4 +783,10 @@ public abstract class BeanUtils {
}
public static void main(String[] args) {
System.out.println("============");
}
}

@ -139,7 +139,7 @@ public interface BeanFactory {
Object getBean(String name) throws BeansException;
/**
* Return an instance, which may be shared or independent, of the specified bean.
* 返回指定bean的实例该实例可以是共享的或独立的
* <p>Behaves the same as {@link #getBean(String)}, but provides a measure of type
* safety by throwing a BeanNotOfRequiredTypeException if the bean is not of the
* required type. This means that ClassCastException can't be thrown on casting

@ -28,8 +28,8 @@
package org.springframework.asm;
/**
* A visitor to visit a Java annotation. The methods of this class must be called in the following
* order: ( {@code visit} | {@code visitEnum} | {@code visitAnnotation} | {@code visitArray} )*
* 访问Java注释的访问者 必须在下面调用此类的方法
* 命令: ( {@code visit} | {@code visitEnum} | {@code visitAnnotation} | {@code visitArray} )*
* {@code visitEnd}.
*
* @author Eric Bruneton
@ -38,7 +38,7 @@ package org.springframework.asm;
public abstract class AnnotationVisitor {
/**
* The ASM API version implemented by this visitor. The value of this field must be one of {@link
* 此访问者实施的ASM API版本 该字段的值必须是以下值之一 {@link
* Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
*/
protected final int api;
@ -139,7 +139,7 @@ public abstract class AnnotationVisitor {
return null;
}
/** Visits the end of the annotation. */
/** 访问注释的结尾。 */
public void visitEnd() {
if (av != null) {
av.visitEnd();

Loading…
Cancel
Save