Commit Graph

443 Commits (eab599bd38bbc909e7db0bbbff355b9f0371a828)

Author SHA1 Message Date
Dave Syer 78b2f17502 Fix typo in Javadocs 11 years ago
Andy Wilkinson 45c61eb96b Remove special case for integration sample's milestone dependency
3d714d301 allowed all integration tests to download snapshots and
milestones. The test for the integration sample, which depends upon a
milestone, no longer needs to be a special case.
11 years ago
Phillip Webb a6a1929274 Extract inner-classes from GroovyCompiler
Extract and refactor inner-classes from the GroovyCompiler to improve
code readability.
11 years ago
Phillip Webb eff587d5b0 Create CliTester JUnit @Rule
Extract logic from SampleIntegrationTests into a reusable JUnit @Rule.
11 years ago
Phillip Webb a9c9c383f4 Polish pom.xml
Aplly consistent formatting, drop JDK 8 support and cleanup repo
locations to use spring.io.
11 years ago
Phillip Webb 3d714d3016 Allow snapshot repositories in integration tests
Update CLI SampleIntegrationTests to no longer disable snapshot repos.
11 years ago
Andy Wilkinson 1a76c972e3 Always install new GrapeEngine
Previously, GrapeEngineInstaller would only install its GrapeEngine
if an engine had not already been installed. As the Grape class stores
the engine in a static field, this meant that the engine would only be
installed once for the lifetime of Grape's classloader. This caused
an ordering issue in SampleIntegrationTests.

The test for the integration sample clears the
disableSpringSnapshotRepos system property to allow M1 of the
integration DSL to be resolved. However, this property is only
examined and honoured in AetherGrapeEngine's constructor. If another
test had run and had already created and installed an
AetherGrapeEngine, the new AetherGrapeEngine that allowed the use of
snapshot repositories would not be installed and the test would fail.

This commit updates GrapeEngineInstaller so that it always installs
its GrapeEngine, overwriting any previously installed engine.
11 years ago
Andy Wilkinson ecc5463a76 Allow integration sample to download DSL milestone 11 years ago
Andy Wilkinson 4f47f71dc2 Allow use of snapshot repos to be disabled
Previously, the Ivy-based Grape engine used a system property,
disableSpringSnapshotRepos, to control whether or not Spring's
snapshot and milestone repositories were used for dependency
resolution. This commit adds the same capability to AetherGrapeEngine.

[#59489826]
11 years ago
Andy Wilkinson 1d5cb7731d Support transitive=false in AetherGrapeEngine
@Grab allows a dependency to be declared, but for its transitive
dependencies to be excluded by setting transitive to false. This
commit enhances AetherGrapeEngine to honour this setting by using a
wildcard exclusion on any dependency so declared.
11 years ago
Andy Wilkinson 00a0cab781 Remove remaining git.properties files 11 years ago
Andy Wilkinson c0ae78f3ec Isolate Aether in a separate class loader
Prior to this commit, the Aether-based GrapeEngine was loaded in the
same class loader as the rest of Boot. This led to Aether's and its
dependencies' types polluting the application's class path. Most
notably, this caused problems with logging as the logging framework
could be permaturely initialized.

This commit isolates AetherGrapeEngine, Aether and its dependencies
into a separate class loader. This is done by customizing the
packaging of the CLI's jar file with the internal directory housing
all of the types that will be loaded by the separate class loader.
11 years ago
Andy Wilkinson 39e8e46e2a Provide an Aether-based Grape Engine
Previously, @Grab annotations would use Ivy to download the
dependencies with some of Ivy's known limitations being worked around
by GrapeEngineCustomizer.

This commit adds a GrapeEngine implementation that uses Aether,
the dependency resolution 'engine' used by Maven and Grails. To ensure
consistent behaviour with a Maven build, the Aether-powered dependency
resolution uses the dependency management configuration from the
spring-boot-starter-parent pom file.
11 years ago
Andy Wilkinson 97f93bfa64 Support simple @Grab annotations everywhere
Previously, simple @Grab annotations only worked on classes. This commit
updates the simple @Grab support so that they can be used on anything
that can be annotated with @Grab.

The simplified @Grab support relies upon springcli.properties having
been generated. This commit adds an M2E lifecycle mapping for the
antrun plugin so that springcli.properties is generated as part of an
Eclipse build, thereby making it easier to run tests in Eclipse that
rely upon the simplified @Grab support.
11 years ago
Andy Wilkinson b855ab6cae Treat Maven artifacts with bundle packaging as jars
Previously, LocalM2Resource used the pom's packaging configuration to
determine the suffix of the file that it should look for, e.g. if
the pom's packaging was jar, it would look for a file with a .jar
suffix in artifactExists(). This logic fails for artifacts with bundle
packaging as it would look for a .bundle file rather than a .jar file,
fail to find the file, and incorrectly report that the artifact does not
exist.

This commit updates LocalM2Resource to look for a file with a .jar
suffix when the packaging configuration in the pom is bundle.
11 years ago
Dave Syer 3adfdd34ec Use simplified @Grab where possible 11 years ago
Dave Syer 1dd0cca294 Update M4->M5 in README 11 years ago
Phillip Webb af0d08c998 Polish 11 years ago
Phillip Webb b772f7c2e4 Polish
Minor formatting and consistent copyright header.
11 years ago
Phillip Webb efe102bd51 Polish CLI tester code
Reduce duplication by extracting FileOptions class to be shared by
both the RunCommand and the TestCommand.

Also applied minor code convention tweaks.
11 years ago
Dave Syer ef17ff8d24 Adapt device change to new springcli.properties 11 years ago
Roy Clarkson 5cdaa43912 Add Spring Mobile Device Resolver autoconfiguration 11 years ago
Dave Syer 84a213f774 Add README to cli 11 years ago
Dave Syer a72ab9eb7d Refactor cli properties into single project 11 years ago
Dave Syer b5f0f97110 Clean up TestCommand paraphenalia 11 years ago
Greg Turnquist 1ce13cc2c2 Add 'spring test [files]' command to compile and test code automatically
- Look for JUnit test symbols, and add JUnit automatically
- Look for Spock test symbols, and add Spock automatically
- Based on what test libraries were used, invoke relevant embedded testers
  and accumulate results
- Make it so that multiple testers can be invoked through a single 'test' command
- Print out total results and write out detailed trace errors in results.txt
- Update based on the new artifact resolution mechanism
11 years ago
Andy Wilkinson c1ec5e5c0e Support @Grab without a version or group
Usually, use of @Grab requires you to specify a group, module, and
version when identifying a dependency. This can be done in two
different ways:

@Grab(group='alpha', module='bravo', version='1.0.0')
@Grab('alpha:bravo:1.0.0')

This commit allows users to only specify a module: the group is
inferred and the version is the one dictated by the boot CLI. Both
forms are supported:

@Grab(module='bravo')
@Grab('bravo')

Groovy's global AST transformations, which is how Grab is implemented,
do not support ordering and we need to augment the AST for the Grab
annotation before its processed by the Grab AST transformation. To
work around this, reflection is used to get hold of the compile
operations in the conversion phase, and a new AST transformation is
inserted immediately before the first AST transformation operation.

To allow a module's groupId and version to be resolved consistently,
META-INF/springcli.properties has been enhanced to include properties
for each module that we want to support in the following form:

<module>.groudId = <groudId>
<module>.version = <version>

<groupId> and <version> are taken from the Maven project's
dependencies and VPP, a Velocity-based pre-processor, is used to
automatically generate the enhanced properties file.

To prevent pollution of spring-boot-cli's class path with the
dependencies that are only required to populate springcli.properties,
a separate project, spring-boot-cli-properties, has been created.
spring-boot-cli depends upon this now project causing it to, via the
shade plug, include the properties file in its jar.

Previously DependencyCustomizer allow a dependency to be added by
specifying its full coordinates, i.e. a group ID, artifact ID, and
version. This commit updates DependencyCustomizer to only require
an artifact/module ID. The group ID and version are then resolved
using the same mechanism as the enhanced @Grab support.

[#56328644] [bs-312] Allow @Grab without version
11 years ago
Greg Turnquist 941d163709 Add support for Spring Rabbit (via Spring AMQP) to Boot
- If RabbitTemplate is on the classpath, turn on autodetection.
- Create a RabbitTemplate, a Rabbit ConnectionFactory, and a RabbitAdmin is spring.rabbitmq.dynamic:true
- Enable some **spring.rabbitmq** properties like host, port, username, password, and dynamic
- Add tests to verify functionality
- Add Groovy CLI functionality. Base it on @EnableRabbitMessaging. Add spring-amqp to the path.
- Create rabbit.groovy test to prove it all works.
- Make Queue and TopicExchange top-level Spring beans in rabbit.groovy test script
11 years ago
Greg Turnquist fa6e6fde6c Add JMS autoconfig support
* application.properties support for spring.jms and spring.activemq

* more tests to verify ActiveMQConnectionFactory pooling

* Groovy support and simple sample with activemq

* Groovy detection mechanism is @EnableJmsMessaging annotation
11 years ago
Phillip Webb c544921eaa Polish whitespace 11 years ago
Phillip Webb fd9e258d12 Replace 'springsource.org' with 'spring.io'
Replace all references to 'springsource.org' with the new 'spring.io'
domain.
11 years ago
Christian Dupuis a1631d581b Add license and legal information on third party open source software that is part of the CLI distribution 11 years ago
Greg Turnquist 97af88a8d8 Switch activemq to version 5.4.0 to avoid slf4j issue 11 years ago
Dave Syer 04ba4d064e Investigating failing tests 11 years ago
Phillip Webb 9a529b41c1 Polish 11 years ago
Phillip Webb b857a9001d Cleanup trailing whitespace 11 years ago
Greg Turnquist 5801e422cf [BS-48] Add autoconfigured JMS support
* Add ability to detect spring-jms on the path and create a JmsTemplate with
  ActiveMQConnectionFactory
* Create tests showing autoconfigured JmsTemplate with ActiveMQ, but prove it
  backs off if a separate ConnectionFactory exists.
* Add support to spring-boot-cli to that it detects JmsTemplate, DefaultMessageListenerContainer,
  or SimpleMessageListenerContainer, and turns on autoconfiguration as well as
  add proper @Grab's and import statements.
* Write a jms.groovy test showing proper CLI support

Simplify ActiveMQ configuration

Update ActiveMQ to 5.7.0
11 years ago
Dave Syer f76662a6ec Add spring-jdbc as well if necessary 11 years ago
Dave Syer 621ecd3901 Added JDBC and @Transactional support to Groovy CLI
* @EnableTransactionManagement triggers spring-tx imports
* Field or method of type JdbcTemplate or NamedParameterJdbcTemplate
  of DataSource triggers spring-jdbc imports
11 years ago
Dave Syer 8467a66e84 Add security.management.enabled flag 11 years ago
Phillip Webb a33425920b Rework POMs to support automated CI release 11 years ago
Phillip Webb a44f8bc59e Increase SampleIntegrationTests run timeouts
Increase the timeouts to give CI builds more time should dependencies
be missing.
11 years ago
Dave Syer 38e565e920 Back to SNAPSHOT for dev 11 years ago
Dave Syer b634b3bde6 Update to 0.5.0.M2 11 years ago
Phillip Webb 347f30d135 Recognize @RestController as MVC Application
Update CLI SpringMvcCompilerAutoConfiguration to recognize Spring's new
@RestController annotation.
11 years ago
Phillip Webb 13f51b7901 Add version properties
Add version properties to dependencies POM so that users can easily
override. Also use consistent naming for all property keys.
11 years ago
Dave Syer 5fa0166dea Upgrade to Reactor 1.0.0.M2 11 years ago
Dave Syer 082678d660 Use echo+exit instead of die 11 years ago
Phillip Webb 1d4f86452f Use web-starter for CLI MVC compiler auto-config 11 years ago
Phillip Webb 47d0ba5c8e Remove superfluous ivy log output 11 years ago
Phillip Webb 0a9d7c6ef2 Use managed spring-integration-groovy-dsl
Update SpringIntegrationCompilerAutoConfiguration to use the managed
version of spring-integration-groovy-dsl.
11 years ago
Phillip Webb 4ad3d30a40 Fixup CLI POM
Fix classloader issues by excluding spring JARs from test classpath
and also include spring-integration-groovy-dsl as a managed dependency.
11 years ago
Dave Syer 05e678acb3 Clean out grapes 11 years ago
Dave Syer d88e1b4b7a Add test case for ivy customization
A bug in ivy (tickled by maven leaving a pom
but no jar in the local repo) would make the
default Grapes ivy config fail (cannot grab...).
Phil's workaround now has a test case.
11 years ago
Phillip Webb 39aea5d944 Ensure localm2 ivy repo can resolve artifacts
Fix the localm2 repository to only consider that a pom exists when
its artifact is contained in the repository.

This prevents a download error that can occur when the local m2
repository contains a POM file but not a JAR.

Issue: #55532358
11 years ago
Dave Syer b720f7e688 Startup time for CLI app much quicker now
The Boot resolver didn't transfer enough of the settings
of the default ChainResolver. Adding a boolean flag was
enough to make the chatter die down for dependencies
that were unneeded.

[Fixes #55358344] [bs-291]
11 years ago
Dave Syer 0993f3da0a Restore Tomcat in CLI
Seems to work. I think the problem was the race conditions
that we hopefully already eliminated. I got an out of memory
error running the samples tests in Eclipse, but then it went
away again (something to look out for).

[Fixes #54925992] [bs-280]
11 years ago
Dave Syer 0d583deb27 Add CLASSPATH elements back to spring CLI script
Also add @WebConfiguration as a shortcut for groovy
scripts to get MVC behaviour (without a @Controller)

[#54926366]
11 years ago
Phillip Webb cf655945aa Polish 11 years ago
Phillip Webb f25b9e109f Remove trailing whitespace from bash script 11 years ago
Dave Syer 3b9df63f73 Add bash completion for spring command
* Added src/main/content/bash_completion.d/spring
* Also made all commands alias to "--<self>" so
"--help" is a synonym for "help" (for instance). This
helps with the completion generation.

[Fixes #54827292]
11 years ago
Phillip Webb f4c129a063 Don't use snapshot repos for CLI test
Update SampleIntegrationTests to only use local maven repo when
running integration tests.
11 years ago
Phillip Webb 5189d9d3e6 Don't generate dependency reduced POM 11 years ago
Phillip Webb 4e11ae1671 Documentation
Various updates to README.md files.
11 years ago
Phillip Webb 40a9176937 Restructure distribution content
Include LICENCE and INSTALL text files and ensure that .bat file is
not set with executable Unix file permissions.
11 years ago
Phillip Webb 54cb7b39c9 Change assembly name to '-bin' and add tar.gz 11 years ago
Phillip Webb f08b283b08 Implement CLI --version command 11 years ago
Phillip Webb 02f0c2b639 Get the version to clean from the pom.xml 11 years ago
Phillip Webb aaebb3f3fb Improve Ivy resolution
Refactor GrapeEngineCustomizer to improve ivy resolution times by
failing early when resolution is known to fail.
11 years ago
Phillip Webb e5918b6756 Restore grapes cleaner 11 years ago
Phillip Webb 77455ec3dc Fix CLI test failures 11 years ago
Phillip Webb 4038b39496 Add OutputCapture test class 11 years ago
Phillip Webb 174427881a Revert "Attempt to sort out logging dependencies"
This reverts commit e99d2199d8.

The main spring-boot project should not have compile scope dependencies
to any org.slf4j artifacts.
11 years ago
Phillip Webb 7d3ac266e8 Fix GrapesCleaner to work with renamed artifacts 11 years ago
Phillip Webb 6bb628adb4 Indicate downloading dependencies progress in CLI
Update CLI to show a "Downloading Dependencies..." message if the
initial dependency resolution takes more than 3 seconds. Whilst
downloading dots are appended to the message.

Issue: #54589094
11 years ago
Dave Syer e99d2199d8 Attempt to sort out logging dependencies 11 years ago
Dave Syer 34500632d4 Accept SPRING_HOME if already set 11 years ago
Phillip Webb 8a4b4bd155 Add spring.bat start script for Windows 11 years ago
Phillip Webb 8a19e48e21 Polish and simplify spring bash script 11 years ago
Phillip Webb a9700c92f3 Fix a few problems with spring start script
Fixed a few issues with the spring start script, mainly around symlinks.
Test on OSX, Ubuntu and Windows (Cygwin) with and would symlinks.
11 years ago
Phillip Webb 94855bf4ec Correct directory permissions in dist zip 11 years ago
Dave Syer 55ed0bdf45 Fix problem locating spring home 11 years ago
Phillip Webb 1db22aca5c Rework POM structure
Rework main build POM to be an aggregator pom that does not inherit
from any parent. Introduce new spring-boot-dependencies module to
act as a parent for both spring-boot-starter-parent and
spring-boot-parent.
11 years ago
Dave Syer 4bb5de02e7 Switch back to SNAPSHOT for dev 11 years ago
Dave Syer 68e5a7e887 Bump version to 0.5.0.M1 11 years ago
Phillip Webb e1c6860a41 Documentation 11 years ago
Dave Syer 1c34fb5ed3 Fix mvn assembly 11 years ago
Phillip Webb 4c067a89fe Ops -> Actuator 11 years ago
Dave Syer ec3c5b5321 Add auto compile tweaks for reactor 11 years ago
Phillip Webb 3bb79db579 Renamed spring-boot-ups -> spring-boot-starter 11 years ago
Phillip Webb b665a2bb1d Renamed packages
Issue: #54095231
11 years ago
Phillip Webb 3f2bb03fb8 Renamed some projects and polish POMs
Issue: #54095231
11 years ago
Dave Syer 2098e23fca Change package names zero->boot
* actuator -> boot-ops
* cli -> boot-cli
* launcher -> boot-load
* autoconfig -> boot-config
* bootstrap -> boot-strap
* starters -> boot-up

[#54095231] [bs-253] Refactor Zero->Boot
11 years ago