76 Commits

Author SHA1 Message Date
Phillip Webb
21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Vedran Pavic
a08fa27c39 Add .gitignore for Gradle Plugin module
Closes gh-13137
2018-05-11 14:28:02 +02:00
Andy Wilkinson
7913d9b599 Add methods to BootJar for adding content to BOOT-INF
Closes gh-13000
2018-05-11 11:14:14 +01:00
Stephane Nicoll
9dccf5b895 Polish
See gh-13078
2018-05-07 14:48:56 +02:00
Andy Wilkinson
2bcf29913d Skip building the Gradle plugin on Java 9 as well as 10
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.

This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
2018-05-04 11:40:35 +01:00
Phillip Webb
41efea51a7 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Andy Wilkinson
f5fabbc1b9 Remove the use of internal API from Gradle Plugin's BootJar
Closes gh-13037
2018-05-03 11:34:42 +01:00
Andy Wilkinson
a5f3f36b58 Test the Gradle plugin against Gradle 4.7
Closes gh-12952
2018-04-23 17:24:50 +01:00
Andy Wilkinson
72ec2c8644 Polish “Only analyze configurations that we've registered to check”
Closes gh-12784
2018-04-23 16:45:21 +01:00
danhyun
1e447ebfbf Only analyze configurations that we've registered to check
See gh-12784
2018-04-23 16:25:17 +01:00
Andy Wilkinson
806978b8f1 Test unresolved dependency analysis in the Gradle plugin
See gh-12784
2018-04-23 15:52:56 +01:00
Andy Wilkinson
f335ec00bf Polish 2018-04-05 09:31:17 +01:00
igor-suhorukov
69bc19e0ca Use lambdas for map entry iteration where possible
See gh-12626
2018-04-04 19:36:10 -07:00
Andy Wilkinson
1f35abacd6 Polish “Configure Kotlin compiler to use -java-parameters by default”
Closes gh-12641
2018-03-28 12:24:21 +01:00
Rui Figueira
5e2726f896 Configure Kotlin compiler to use -java-parameters by default
See gh-12641
2018-03-28 12:24:17 +01:00
Johnny Lim
751c444166 Polish
See gh-12326
2018-03-03 12:25:41 +01:00
Andy Wilkinson
3370c23ab9 Skip the Gradle plugin when building with the full profile and JDK 10
See gh-12028
2018-03-02 17:48:27 +00:00
Andy Wilkinson
2b1252e282 Skip the Gradle Plugin when building with JDK 10
Previously, the JDK 10 build would fail as we build the plugin using
Gradle 4.0.x (the lowest version of Gradle that we support) and
Gradle 4.0.x doesn't work with Java 10.

Upgrading to Gradle 4.1, which appears to work with Java 10, was
considered but rejected for now as it introduces the risk that we
inadvertently use an API that's new in 4.1 and break our 4.0 support.

This commit goes for the extreme option and disables building the
Gradle Plugin when building with JDK.

See gh-12028
2018-03-02 17:05:58 +00:00
Andy Wilkinson
4a3e0a231c Test the Gradle plugin against Gradle 4.6
Closes gh-12314
2018-03-02 13:41:28 +00:00
Andy Wilkinson
e4a1fed3b8 Test the Gradle plugin against Gradle 4.6 2018-03-02 13:41:27 +00:00
Andy Wilkinson
188d120c9c Test the Gradle plugin against Gradle 4.5.1
Closes gh-12315
2018-03-02 13:41:27 +00:00
Andy Wilkinson
8d1e69bca4 Polish Gradle plugin's javadoc 2018-02-28 20:22:45 +00:00
Andy Wilkinson
703de64842 Reinstate imports 2018-02-28 20:11:42 +00:00
Phillip Webb
7bc535e4fa Polish 2018-02-28 10:59:26 -08:00
Andy Wilkinson
9640881f38 Fix BuildInfo up-to-date check when group, name, or version changes
Previously, if the project's group, name, or version changed the
BuildInfo task would still be considered up-to-date as the values of
the project's properties were not reflected in the fields of the
BuildInfo instance.

This commit updates BuildInfo to copy the value of the project's
property to the corresponding BuildInfo field when the property is
read using its getter method on BuildInfo.

Closes gh-12266
2018-02-27 21:21:16 +00:00
Phillip Webb
3e4da3cc37 Polish 2018-02-27 12:53:01 -08:00
Andy Wilkinson
fdb9a1ea8f Consider time in BuildInfo up-to-date checks and allow it to be set
Closes gh-12111
Closes gh-12266
2018-02-27 20:09:07 +00:00
Andy Wilkinson
30f79f2fb1 Use application name as convention for distribution's base name
Closes gh-12232
2018-02-27 12:56:50 +00:00
Phillip Webb
29c3be3590 Polish 2018-02-26 10:26:02 -08:00
Stephane Nicoll
2641559231 Polish contribution
Closes gh-12202
2018-02-24 16:10:44 +01:00
dreis2211
e2fb093ccf Polish
See gh-12202
2018-02-24 16:09:38 +01:00
Andy Wilkinson
a09c64e18c Polish 2018-02-08 11:15:36 +00:00
Andy Wilkinson
70c613819d Fix incomplete calls to assertThat 2018-02-08 11:06:54 +00:00
Andy Wilkinson
76a450dfba Format with Eclipse Oxygen SR2 2018-02-08 10:53:53 +00:00
Andy Wilkinson
b4f4dd3fdd Correct location of JDT config files in Gradle plugin 2018-02-08 10:42:50 +00:00
dreis2211
81459efffa Use HTTPS URLs where applicable 2018-02-02 12:03:12 +00:00
Phillip Webb
7d5e41f7dc Polish 2018-02-01 10:25:33 -08:00
Johnny Lim
3cead7693d Polish
Closes gh-11871
2018-02-01 08:35:42 +01:00
Andy Wilkinson
8f116f7e6f Align ordering of BootJar and BootWar archive entries
Previously, the ordering of the entries in an archive produced by
BootJar was different to the ordering of the entries in an archive
produced by BootWar. The latter placed application classes before
any nested jars, whereas the former was the other way around.

This commit updates BootJar to use the same ordering as BootWar and
adds tests to verify that the ordering is the following:

1. Loader classes
2. Application classes (BOOT-INF/classes or WEB-INF/classes)
3. Nested jars (BOOT-INF/lib or WEB-INF/lib)
4. Provided nested jars in a war (WEB-INF/lib-provided)

The tests also verify that the position of a library is not affected
by it requiring unpacking.

See gh-11695
See gh-11696
2018-01-31 14:38:38 +00:00
Phillip Webb
7c5042d079 Don't run apply-plugin tests
Stop running apply-plugin tests as part of the build since during a
release the version number will change and the jar will not be
available.

Fixes gh-11857
2018-01-30 21:45:17 -08:00
Phillip Webb
6dddceacad Always include plugin classpath in sample gradle
Update a couple of the `spring-boot-gradle-plugin` sample gradle flies
so that they include the running classpath. The additional lines are
contained within a tag which is ultimately filtered from the final
documentation.

Fixes gh-11857
2018-01-30 20:08:04 -08:00
Andy Wilkinson
199088b0c9 Set kotlin.version when Kotlin's Gradle plugin is applied
Closes gh-11711
2018-01-29 10:13:54 +00:00
Phillip Webb
b234501af3 Polish 2018-01-26 11:39:41 -08:00
Johnny Lim
a46e047c5d Polish
Closes gh-11792
2018-01-26 18:19:44 +01:00
Andy Wilkinson
498f66fcdc Test the Gradle plugin against Gradle 4.5
Closes gh-11768
2018-01-26 15:55:25 +00:00
Phillip Webb
f3379668ac Polish 2018-01-18 23:21:51 -08:00
Andy Wilkinson
54c0cf513b Polish 2018-01-17 19:03:23 +00:00
Andy Wilkinson
ffc99b03dd Remove use of deprecated Gradle API from plugin's public API
This commit removes the use of the incubating PropertyState and
Provider API that was introduced in Gradle 4.0 and deprecated in
Gradle 4.3. A not-deprecated-but-still-incubating replacement was
introduced in Gradle 4.3. The short life of PropertyState and Provider
has made me wary of using an incubating Gradle API in our public API
as it may not be stable for long. Therefore, this commit does not move
to the replacement as it is incubating. Instead, it falls back to
using Gradle's convention mapping. This is internal API, but its use
is not part of our public API and I perceive the risk of using it to
be lower than using the deprecated and/or incubating API alternatives.

Closes gh-11640
2018-01-17 12:20:30 +00:00
Andy Wilkinson
5e17fc775c Test the Gradle plugin against Gradle 4.4.1
Closes gh-11654
2018-01-17 11:57:02 +00:00
Andy Wilkinson
2668e41dd5 Make it easier to just use Boot’s dependency management with Gradle
Closes gh-11059
2018-01-17 11:39:59 +00:00