Gradle #574

bsideup · 2018-02-04T14:48:54Z

in #564 we agreed to use Gradle instead of Maven, and also use Bintray to simplify the process of release.

This PR replaces Maven with Gradle and also brings some exciting changes:

BOM publishing ( org.testcontainers:testcontainers-bom:${version} ) with every module from this repository
Run Delombok before attaching the sources
Remote Build Cache to speed up the PRs
Revisited shadowing

The result was pushed to Bintray:
Repo: https://dl.bintray.com/testcontainers/releases
BOM: org.testcontainers:testcontainers-bom:1.6.0-gradle

So that you can test it yourself on your projects and verify that it works as previously.

…llel on CircleCI

…ts to Gradle

# Conflicts: # modules/jdbc/pom.xml # pom.xml

asafm

Quite a sizable PR!
Just throwing in my 2 cent as I’m mostly a user and not a contributor: I think Gradle build files are on the surface area much shorter thus “simpler” but they do much implicit complexity inside as opposed to Verbose Maven which is more explicit.

I read the move Gradle was due to speed of build mainly due to using S3 caching. Wondering how much did it save and wasn’t it achievable in Maven?

bsideup · 2018-02-05T09:16:30Z

@asarm

While Gradle's Build Cache indeed saves a lot of time (i.e. if you change the markdown docs, tests will not be executed, or if you change only kafka module, core tests and other modules will not be executed also), it was not the only reason to migrate to Gradle.

With Maven, things like BOM, Delombok or explicit control of shadowed dependencies was hard to do, so we didn't.
Also, if we want to merge all modules into the same repo, we would like to make adding new modules simple. With Maven, you have to list your modules explicitly in your root project's POM. Our Gradle config will auto-detect modules so that we will not get merge conflicts if two PRs with modules were submitted in parallel.

And last but not least, you can & should configure "delegate to Gradle" in your IDE so that you will always get the same compilation result as any other contributor. e.g. technically you don't have to install Lombok plugin to make project compile. It also solves the issues like running the shadowing tests (before, you had to package JAR manually with Maven before you run the JAR tests)

kiview

The changes seem fine for me, just some questions/remarks and everything works perfectly out of the box. Of course we are still missing documentation updates I assume?

Edit:
It seems we are not 😉

kiview · 2018-02-07T20:23:27Z

build.gradle

+subprojects {
+    apply plugin: 'nebula.provided-base'
+    apply plugin: 'java'
+    apply plugin: 'idea'


This plugin can normally be omitted.

No it's not :) We have this line in core/build.gradle:

idea.module.testSourceDirs += sourceSets.jarFileTest.allSource.srcDirs

What do we need this for?

can't you just.... errr... read it? :D

"add all sources of "jarFileTest" source set to module's test source dirs" :)

Yes I can read it, I was not aware that you have to do this manually, since i.e. gradle-test-sets-plugin was doing this automatically.

Yeah, I know the plugin, but thought to use as minimum plugins as possible to keep build simple :)

Totally fine this way, I was just explaining my lack of knowledge regarding this configuration 🤤

ah, ok, sorry :)

kiview · 2018-02-08T10:00:35Z

modules/database-commons/build.gradle

+description = "Testcontainers :: Database-Commons"
+
+dependencies {
+    compile project(':testcontainers')


Should we maybe add this dependency for all subprojects but :testcontainers? I think simple would not need any build.gradle anymore in this case.

I'm not a fan of implicit dependencies, to be honest :)
Plus IMO description have to be set by a human.

5 lines file per module shouldn't hurt too much :)

This is introduced to allow the build remote cache on Windows.

rnorth · 2018-02-09T06:59:07Z

docs/index.md

@@ -47,7 +47,7 @@ This project was initially inspired by a [gist](https://gist.github.com/mosheesh
 	* discuss with the authors on an issue ticket prior to doing anything big
 	* follow the style, naming and structure conventions of the rest of the project
 	* make commits atomic and easy to merge
-	* verify all tests are passing. Build the project with `mvn clean install -Pproprietary-deps` to do this.
+	* verify all tests are passing. Build the project with `./gradlew test` to do this.


Please could we mention the build cache here?

People might want to re-run all tests just to be sure, especially, for example, if they're trying to check both Docker Machine and Docker for * compatibility. It would probably be helpful to explain how to disable the cache. (Is ./gradlew test --no-build-cache correct?)

good idea, I'll add it 👍

AFAIR the recommended test task should be check. check dependsOn test by default. I would document check here, so that future test tasks (e.g. TestNG oder integrative tests), can be introduced without telling people about another test task.

Yes, you are right. I think we should change the usage in Travis and CircleCI accordingly also.

rnorth · 2018-02-09T06:59:28Z

LGTM 😄
The build time improvements on their own are compelling, but also the general cleanliness and readability make me happy.

…Testcontainers (#573)

Fixes #578

* Add ability to specify docker image in KafkaContainer. * Added 'kafka.container.image' property to TestcontainersConfiguration in order to have an opportunity to replace default image with testcontainers.properties. * Return version argument to KafkaContainer constructor.

…able build caching,

# Conflicts: # core/pom.xml # modules/database-commons/pom.xml # modules/jdbc-test/pom.xml # modules/jdbc/pom.xml # modules/kafka/pom.xml # modules/mysql/pom.xml # modules/nginx/pom.xml # modules/postgresql/pom.xml # modules/selenium/pom.xml # modules/virtuoso/pom.xml # pom.xml

bsideup added 25 commits January 29, 2018 15:04

Add Gradle with dependency sync from Maven

35a32d6

use Gradle on CircleCI

ccdb027

run Maven before Gradle to create initial folders structure

c7f850a

Merge branch 'master' into gradle

d0cc4f7

Shadowing, Maven publishing, build cache

4c31cc0

Use Gradle 4.5

ac022ff

store test results in CircleCI

eb3f1ee

fix tests

9c9a94d

Create 'target' directory before running the tests, run tests in para…

726bd37

…llel on CircleCI

run selenium tests separately

03632f6

change only Kafka module

647b42b

now Travis

7ef12dd

fix Travis config

d71825f

mount .gradle into alpine container

1e1a8ca

polish Gradle config, fix publishing, add Delombok, move JAR file tes…

7e0fc19

…ts to Gradle

fix tab space

87f3f56

do not force verbose console

6b92664

fix core tests

6b57b93

revert KafkaContainerTest change

092ba2e

push only from CircleCI's master branch

ebe6c74

remove Maven, add more info to the generated pom, remove shade-test

8905b2e

flat modules structure, bintray publishing, BOM, remove virtuoso module

e448102

fix CI configs (use 'testcontainers' instead of 'core')

5f5c2dd

fix TravisCI config

248712a

release with Gradle

b77bffa

bsideup added the enhancement label Feb 4, 2018

bsideup added this to the next milestone Feb 4, 2018

bsideup requested review from rnorth and kiview February 4, 2018 14:48

Merge branch 'master' into gradle

6e623f2

# Conflicts: # modules/jdbc/pom.xml # pom.xml

bsideup added 2 commits February 4, 2018 15:54

use Gradle for database-commons

4f098f3

simplify BOM's code

8edc5ea

asafm reviewed Feb 4, 2018

View reviewed changes

kiview requested changes Feb 8, 2018

View reviewed changes

kiview approved these changes Feb 8, 2018

View reviewed changes

Force LF line endings for all text files

a3a34ac

This is introduced to allow the build remote cache on Windows.

rnorth mentioned this pull request Feb 8, 2018

Combine Java modules into main testcontainers-java repo #564

Closed

7 tasks

rnorth reviewed Feb 9, 2018

View reviewed changes

rnorth and others added 6 commits February 11, 2018 13:57

Change capitalisation of the project name to the commonly used form, …

8c2de5e

…Testcontainers (#573)

Fix broken link

ae1dac4

Fixes #578

use Gradle's check task instead of just test, document how to dis…

8e92bd0

…able build caching,

fix Travis' install

3d803e5

This was referenced Feb 11, 2018

Feature/pumba support #283

Closed

Add ceph support #497

Closed

Add ClickHouse support #498

Closed

Add cockroach db support #499

Merged

Implement Cassandra support #525

Merged

Support init script at JdbcDatabaseContainer level #575

Merged

bsideup merged commit fe62ccf into master Feb 11, 2018

bsideup deleted the gradle branch February 11, 2018 16:48

bsideup added the type/housekeeping label Feb 13, 2018

astubbs mentioned this pull request Dec 6, 2019

Make junit dependency test scope #1718

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gradle #574

Gradle #574

bsideup commented Feb 4, 2018

asafm left a comment

bsideup commented Feb 5, 2018

kiview left a comment •

edited

Loading

kiview Feb 7, 2018

bsideup Feb 8, 2018

kiview Feb 8, 2018

bsideup Feb 8, 2018

bsideup Feb 8, 2018

kiview Feb 8, 2018

bsideup Feb 8, 2018

kiview Feb 8, 2018

bsideup Feb 8, 2018

kiview Feb 8, 2018

bsideup Feb 8, 2018

rnorth Feb 9, 2018

bsideup Feb 9, 2018

gesellix Feb 9, 2018

kiview Feb 9, 2018

rnorth commented Feb 9, 2018

Gradle #574

Gradle #574

Conversation

bsideup commented Feb 4, 2018

asafm left a comment

Choose a reason for hiding this comment

bsideup commented Feb 5, 2018

kiview left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rnorth commented Feb 9, 2018

kiview left a comment •

edited

Loading