Skip to content

Commit 1fe4008

Browse files
salesonsaleson
committed
修改metadata-map.version=2转数组时为空的bug
添加上传中央库的pom.xml配置
1 parent d59b7e2 commit 1fe4008

File tree

4 files changed

+181
-4
lines changed

4 files changed

+181
-4
lines changed

‎pom.xml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,27 @@
3030
</modules>
3131

3232

33+
<licenses>
34+
<license>
35+
<name>The Apache Software License, Version 2.0</name>
36+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
37+
<distribution>repo</distribution>
38+
</license>
39+
</licenses>
40+
<scm>
41+
<tag>master</tag>
42+
<url>[email protected]:SpringCloud/spring-cloud-gray.git</url>
43+
<connection>scm:git:[email protected]:SpringCloud/spring-cloud-gray.git</connection>
44+
<developerConnection>scm:git:[email protected]:SpringCloud/spring-cloud-gray.git</developerConnection>
45+
</scm>
46+
<developers>
47+
<developer>
48+
<name>saleson</name>
49+
<email>[email protected]</email>
50+
<organization>Spring Cloud中国社区</organization>
51+
</developer>
52+
</developers>
53+
3354
<properties>
3455
<maven.compiler.source>1.8</maven.compiler.source>
3556
<maven.compiler.target>1.8</maven.compiler.target>
@@ -39,6 +60,8 @@
3960
</properties>
4061

4162

63+
64+
4265
<dependencyManagement>
4366
<dependencies>
4467
<dependency>
@@ -92,4 +115,72 @@
92115
</dependencyManagement>
93116

94117

118+
<profiles>
119+
<profile>
120+
<id>sonatype-oss-release</id>
121+
<build>
122+
<plugins>
123+
<!-- Source -->
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-source-plugin</artifactId>
127+
<version>2.2.1</version>
128+
<executions>
129+
<execution>
130+
<phase>package</phase>
131+
<goals>
132+
<goal>jar-no-fork</goal>
133+
</goals>
134+
</execution>
135+
</executions>
136+
</plugin>
137+
<!-- Javadoc -->
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-javadoc-plugin</artifactId>
141+
<version>2.9.1</version>
142+
<executions>
143+
<execution>
144+
<phase>package</phase>
145+
<goals>
146+
<goal>jar</goal>
147+
</goals>
148+
</execution>
149+
</executions>
150+
</plugin>
151+
<!-- GPG -->
152+
<plugin>
153+
<groupId>org.apache.maven.plugins</groupId>
154+
<artifactId>maven-gpg-plugin</artifactId>
155+
<version>1.1</version>
156+
<executions>
157+
<execution>
158+
<id>sign-artifacts</id>
159+
<phase>verify</phase>
160+
<goals>
161+
<goal>sign</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
</plugins>
167+
</build>
168+
<distributionManagement>
169+
<snapshotRepository>
170+
<id>sonatype-nexus-snapshots</id>
171+
<url>
172+
https://oss.sonatype.org/content/repositories/snapshots
173+
</url>
174+
</snapshotRepository>
175+
<repository>
176+
<id>sonatype-nexus-staging</id>
177+
<url>
178+
https://oss.sonatype.org/service/local/staging/deploy/maven2
179+
</url>
180+
</repository>
181+
</distributionManagement>
182+
</profile>
183+
</profiles>
184+
185+
95186
</project>

‎spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/ribbon/loadbalancer/BambooApiVersionPredicate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.netflix.loadbalancer.AbstractServerPredicate;
55
import com.netflix.loadbalancer.PredicateKey;
66
import org.apache.commons.lang.ArrayUtils;
7-
import org.springframework.util.StringUtils;
7+
import org.apache.commons.lang3.StringUtils;
88

99
import java.util.Map;
1010

‎spring-cloud-gray-dependencies/pom.xml‎

Lines changed: 88 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,26 @@
2020
<version>1.0.0</version>
2121
<packaging>pom</packaging>
2222

23+
<licenses>
24+
<license>
25+
<name>The Apache Software License, Version 2.0</name>
26+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
27+
<distribution>repo</distribution>
28+
</license>
29+
</licenses>
30+
<scm>
31+
<tag>master</tag>
32+
<url>https://github.com/SpringCloud/spring-cloud-gray</url>
33+
<connection>[email protected]:SpringCloud/spring-cloud-gray.git</connection>
34+
<developerConnection>scm:git:[email protected]:SpringCloud/spring-cloud-gray.git</developerConnection>
35+
</scm>
36+
<developers>
37+
<developer>
38+
<name>saleson</name>
39+
<email>[email protected]</email>
40+
<organization>Spring Cloud中国社区</organization>
41+
</developer>
42+
</developers>
2343

2444
<properties>
2545
<spring-cloud.version>Dalston.SR5</spring-cloud.version>
@@ -35,8 +55,6 @@
3555
<type>pom</type>
3656
<scope>import</scope>
3757
</dependency>
38-
39-
4058
<dependency>
4159
<groupId>cn.springcloud.gray</groupId>
4260
<artifactId>spring-cloud-bamboo</artifactId>
@@ -77,4 +95,72 @@
7795

7896
</dependencyManagement>
7997

98+
99+
<profiles>
100+
<profile>
101+
<id>sonatype-oss-release</id>
102+
<build>
103+
<plugins>
104+
<!-- Source -->
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-source-plugin</artifactId>
108+
<version>2.2.1</version>
109+
<executions>
110+
<execution>
111+
<phase>package</phase>
112+
<goals>
113+
<goal>jar-no-fork</goal>
114+
</goals>
115+
</execution>
116+
</executions>
117+
</plugin>
118+
<!-- Javadoc -->
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-javadoc-plugin</artifactId>
122+
<version>2.9.1</version>
123+
<executions>
124+
<execution>
125+
<phase>package</phase>
126+
<goals>
127+
<goal>jar</goal>
128+
</goals>
129+
</execution>
130+
</executions>
131+
</plugin>
132+
<!-- GPG -->
133+
<plugin>
134+
<groupId>org.apache.maven.plugins</groupId>
135+
<artifactId>maven-gpg-plugin</artifactId>
136+
<version>1.1</version>
137+
<executions>
138+
<execution>
139+
<id>sign-artifacts</id>
140+
<phase>verify</phase>
141+
<goals>
142+
<goal>sign</goal>
143+
</goals>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
</plugins>
148+
</build>
149+
<distributionManagement>
150+
<snapshotRepository>
151+
<id>sonatype-nexus-snapshots</id>
152+
<url>
153+
https://oss.sonatype.org/content/repositories/snapshots
154+
</url>
155+
</snapshotRepository>
156+
<repository>
157+
<id>sonatype-nexus-staging</id>
158+
<url>
159+
https://oss.sonatype.org/service/local/staging/deploy/maven2
160+
</url>
161+
</repository>
162+
</distributionManagement>
163+
</profile>
164+
</profiles>
165+
80166
</project>

‎spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/GrayServerConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public interface GrayServerConfig {
66
/**
77
* 检查服务实例是否下线的间隔时间(ms)
88
*
9-
* @return
9+
* @return 返回服务实例是否下线的间隔时间(ms)
1010
*/
1111
int getEvictionIntervalTimerInMs();
1212

0 commit comments

Comments
 (0)