SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

First version of 1.3.0 with thin jars

Browse Source
This commit is contained in:
Dave Syer
2016-12-02 13:38:23 +00:00
parent 229a1d9de1
commit 194425f483
16 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-parent</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Spring Cloud Cli Docs</name>

8
pom.xml
View File

@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-parent</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.2.2.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<packaging>pom</packaging>
@@ -24,7 +24,7 @@
<bintray.package>cli</bintray.package>
<docs.main>spring-cloud-cli</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<spring-boot.version>1.4.2.BUILD-SNAPSHOT</spring-boot.version>
<spring-boot.version>1.5.0.BUILD-SNAPSHOT</spring-boot.version>
</properties>
<modules>
<module>spring-cloud-launcher</module>
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Camden.BUILD-SNAPSHOT</version>
<version>Dalston.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>

2
spring-cloud-cli-integration-tests/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-parent</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

4
spring-cloud-cli/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>spring-cloud-cli</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-parent</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

27
spring-cloud-launcher/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-launcher</name>
@@ -14,9 +14,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-parent</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<thin-jar.version>0.0.1.BUILD-SNAPSHOT</thin-jar.version>
</properties>
<modules>
<module>spring-cloud-launcher-deployer</module>
<module>spring-cloud-launcher-cli</module>
@@ -37,4 +41,23 @@
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot.experimental</groupId>
<artifactId>spring-boot-thin-launcher</artifactId>
<version>${thin-jar.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

2
spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java
View File

@@ -52,7 +52,7 @@ public class LauncherCommand extends OptionParsingCommand {
public static final Log log = LogFactory.getLog(LauncherCommand.class);
private static final String DEFAULT_VERSION = "1.2.3.BUILD-SNAPSHOT";
private static final String DEFAULT_VERSION = "1.3.0.BUILD-SNAPSHOT";
private static final Collection<HelpExample> EXAMPLES = new ArrayList<>();

2
spring-cloud-launcher/spring-cloud-launcher-configserver/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

4
spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml
View File

@@ -13,11 +13,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<spring-cloud-dataflow.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-dataflow.version>1.1.0.RELEASE</spring-cloud-dataflow.version>
</properties>
<dependencyManagement>

6
spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java
View File

@@ -20,6 +20,7 @@ import org.springframework.batch.core.repository.support.JobRepositoryFactoryBea
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.batch.BatchDatabaseInitializer;
import org.springframework.boot.autoconfigure.batch.BatchProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -31,6 +32,7 @@ import org.springframework.cloud.dataflow.server.repository.support.DataflowRdbm
import org.springframework.cloud.task.repository.support.TaskRepositoryInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ResourceLoader;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
@@ -67,8 +69,8 @@ public class DataFlowApplication {
@Bean
public BatchDatabaseInitializer batchRepositoryInitializer(
DataSource dataSource) {
return new BatchDatabaseInitializer();
DataSource dataSource, ResourceLoader resourceLoader, BatchProperties batchProperties) {
return new BatchDatabaseInitializer(dataSource, resourceLoader, batchProperties);
}
@Bean

4
spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
View File

@@ -13,11 +13,11 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<spring-cloud-deployer.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-deployer.version>
<spring-cloud-deployer.version>1.1.1.RELEASE</spring-cloud-deployer.version>
</properties>
<dependencyManagement>

2
spring-cloud-launcher/spring-cloud-launcher-eureka/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
spring-cloud-launcher/spring-cloud-launcher-h2/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
spring-cloud-launcher/spring-cloud-launcher-kafka/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>

2
spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml
View File

@@ -17,7 +17,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-launcher</artifactId>
<version>1.2.3.BUILD-SNAPSHOT</version>
<version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>