Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add springcli.properties for version labels

Browse Source 
[Fixes #53030591] [bs-191] Use filtering in maven build
This commit is contained in:
Dave Syer
2013-07-18 16:27:59 +01:00
parent c055cf063d
commit fff2a804bc
15 changed files with 156 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-cli/src/main/java/org/springframework/cli/compiler/DependencyCustomizer.java
View File

@@ -20,11 +20,14 @@ import groovy.grape.Grape;
import groovy.lang.Grapes;
import groovy.lang.GroovyClassLoader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
/**
* Customizer that allows dependencies to be added during compilation. Delegates to Groovy
@@ -40,6 +43,8 @@ public class DependencyCustomizer {
private final List<Map<String, Object>> dependencies;
private Properties properties;
/**
* Create a new {@link DependencyCustomizer} instance. The {@link #call()} method must
* be used to actually resolve dependencies.
@@ -59,6 +64,26 @@ public class DependencyCustomizer {
this.dependencies = parent.dependencies;
}
public String getProperty(String key) {
return getProperty(key, "");
}
public String getProperty(String key, String defaultValue) {
if (this.properties == null) {
this.properties = new Properties();
try {
for (URL url : Collections.list(this.loader
.getResources("META-INF/springcli.properties"))) {
this.properties.load(url.openStream());
}
}
catch (Exception e) {
// swallow and continue
}
}
return this.properties.getProperty(key, defaultValue);
}
/**
* Create a nested {@link DependencyCustomizer} that only applies if any of the
* specified class names are not on the class path.

6
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
View File

@@ -38,9 +38,11 @@ public class SpringBatchCompilerAutoConfiguration extends CompilerAutoConfigurat
@Override
public void applyDependencies(DependencyCustomizer dependencies) {
dependencies.ifAnyMissingClasses("org.springframework.batch.core.Job").add(
"org.springframework.batch", "spring-batch-core", "2.2.0.RC2");
"org.springframework.batch", "spring-batch-core",
dependencies.getProperty("spring.batch.version", "2.2.0.RELEASE"));
dependencies.ifAnyMissingClasses("org.springframework.jdbc.core.JdbcTemplate")
.add("org.springframework", "spring-jdbc", "4.0.0.BUILD-SNAPSHOT");
.add("org.springframework", "spring-jdbc",
dependencies.getProperty("spring.version"));
}
@Override

6
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java
View File

@@ -40,8 +40,8 @@ public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration {
public void applyDependencies(DependencyCustomizer dependencies) {
dependencies.ifAnyMissingClasses(
"org.springframework.bootstrap.SpringApplication").add(
"org.springframework.zero", "spring-starter", "0.5.0.BUILD-SNAPSHOT");
// FIXME get the version
"org.springframework.zero", "spring-starter",
dependencies.getProperty("spring.zero.version"));
}
@Override
@@ -73,7 +73,7 @@ public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration {
public void applyToMainClass(GroovyClassLoader loader,
GroovyCompilerConfiguration configuration, GeneratorContext generatorContext,
SourceUnit source, ClassNode classNode) throws CompilationFailedException {
// FIXME: add switch for auto config
// Could add switch for auto config, but it seems like it wouldn't get used much
addEnableAutoConfigurationAnnotation(source, classNode);
}

9
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
View File

@@ -48,11 +48,14 @@ public class SpringIntegrationCompilerAutoConfiguration extends CompilerAutoConf
dependencies
.ifAnyMissingClasses("org.springframework.integration.Message")
.add("org.springframework.integration", "spring-integration-core",
"2.2.3.RELEASE")
dependencies.getProperty("spring.integration.version"))
.add("org.springframework.integration",
"spring-integration-dsl-groovy-core", "1.0.0.M1");
"spring-integration-dsl-groovy-core",
dependencies.getProperty("spring.integration.dsl.version",
"1.0.0.M1"));
dependencies.ifAnyMissingClasses("groovy.util.XmlParser").add(
"org.codehaus.groovy", "groovy-xml", "2.1.6");
"org.codehaus.groovy", "groovy-xml",
dependencies.getProperty("groovy.version"));
}
@Override

21
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
View File

@@ -34,18 +34,21 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
public void applyDependencies(DependencyCustomizer dependencies) {
dependencies
.ifAnyMissingClasses("org.springframework.web.servlet.mvc.Controller")
.add("org.springframework", "spring-webmvc", "4.0.0.BUILD-SNAPSHOT");
.add("org.springframework", "spring-webmvc",
dependencies.getProperty("spring.version"));
dependencies.ifAnyMissingClasses("org.apache.catalina.startup.Tomcat",
"org.eclipse.jetty.server.Server").add("org.eclipse.jetty",
"jetty-webapp", "8.1.10.v20130312");
dependencies.ifAnyMissingClasses("org.eclipse.jetty.server.Server").add(
"org.eclipse.jetty", "jetty-webapp",
dependencies.getProperty("jetty.version"));
dependencies.add("org.codehaus.groovy", "groovy-templates", "2.1.6");
dependencies.add("org.codehaus.groovy", "groovy-templates",
dependencies.getProperty("groovy.version"));
// FIXME restore Tomcat when we can get reload to work
// dependencies.ifMissingClasses("org.apache.catalina.startup.Tomcat",
// "org.eclipse.jetty.server.Server")
// .add("org.apache.tomcat.embed", "tomcat-embed-core", "7.0.39")
// .add("org.apache.tomcat.embed", "tomcat-embed-logging-juli", "7.0.39");
// dependencies.ifMissingClasses("org.apache.catalina.startup.Tomcat")
// .add("org.apache.tomcat.embed", "tomcat-embed-core",
// dependencies.getProperty("tomcat.version"))
// .add("org.apache.tomcat.embed", "tomcat-embed-logging-juli",
// dependencies.getProperty("tomcat.version"));
}
@Override

7
spring-cli/src/main/resources/META-INF/springcli.properties Normal file
View File

@@ -0,0 +1,7 @@
spring.zero.version: ${project.version}
spring.version: ${spring.version}
spring.batch.version: ${spring.batch.version}
spring.integration.version: ${spring.integration.version}
groovy.version: ${groovy.version}
jetty.version: ${jetty.version}
tomcat.version: ${tomcat.version}