Skip to content

Commit

Permalink
Merge 90246e2 into 4122721
Browse files Browse the repository at this point in the history
  • Loading branch information
@straybirdzls
straybirdzls committed Sep 20, 2018
2 parents 4122721 + 90246e2 commit a5edece
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion healthcheck-sofa-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-boot-runtime</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion infra-sofa-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-boot-runtime</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion isle-sofa-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-boot-runtime</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
18 changes: 9 additions & 9 deletions ...rter/src/main/java/com/alipay/sofa/isle/deployment/impl/AbstractDeploymentDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
* yangyanzhao Exp $
*/
public abstract class AbstractDeploymentDescriptor implements DeploymentDescriptor {
private final Properties properties;
private final DeploymentDescriptorConfiguration deploymentDescriptorConfiguration;
private final ClassLoader classLoader;
private final List<String> installedSpringXml = new ArrayList<>();
private ApplicationContext applicationContext;
private long startTime;
private long elapsedTime;
final URL url;
Map<String, Resource> springResources;
final Properties properties;
final DeploymentDescriptorConfiguration deploymentDescriptorConfiguration;
private final ClassLoader classLoader;
private final List<String> installedSpringXml = new ArrayList<>();
private ApplicationContext applicationContext;
private long startTime;
private long elapsedTime;
final URL url;
Map<String, Resource> springResources;

public AbstractDeploymentDescriptor(URL url,
Properties properties,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofaboot-dependencies</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>./sofaboot-dependencies/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion runtime-sofa-boot-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-boot-runtime</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion runtime-sofa-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-boot-runtime</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions sofaboot-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>com.alipay.sofa</groupId>
<artifactId>sofaboot-dependencies</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand All @@ -38,7 +38,7 @@
<project.build.encoding>UTF-8</project.build.encoding>

<spring.boot.version>1.4.2.RELEASE</spring.boot.version>
<sofa.boot.version>2.4.8</sofa.boot.version>
<sofa.boot.version>2.4.9-SNAPSHOT</sofa.boot.version>
<sofa.ark.version>0.5.2</sofa.ark.version>
<rpc.starter.version>5.4.5</rpc.starter.version>
<sofa.tracer.version>2.1.4</sofa.tracer.version>
Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-boot-runtime</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isle/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public class JvmServiceConsumer implements ClientFactoryAware {
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofaboot-dependencies</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
```

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofaboot-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isle/service-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofaboot-sample-with-isle</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isle/service-facade/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofaboot-sample-with-isle</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isle/service-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofaboot-sample-with-isle</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isle/sofa-boot-run/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofaboot-sample-with-isle</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-isolation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>sofaboot-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-rpc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SOFABoot 提供了如健康检查，上下文隔离等基础能力，同时提
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofaboot-dependencies</artifactId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
```

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample-with-rpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofaboot-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sofaboot-samples/sofaboot-sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>sofaboot-samples</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion test-sofa-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sofa-boot-runtime</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>2.4.8</version>
<version>2.4.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down

0 comments on commit a5edece

Please sign in to comment.