Commit Graph

38 Commits

Author SHA1 Message Date
Artem Bilan
9e238f5d69 Upgrades and doc fixes
* Upgrade to Gradle 5.2.1, SonarQube 2.7, asciidoctor 1.5.10,
Apache Sshd 2.2.0, AsertJ 3.12.0, Curator Framework 4.1.0, room Tool 1.12.0,
Checkstyle 8.17
* remove Eclipse Link support in JPA tests since it is not compatible
with Java 11
* Move 5.1 changes to the `changes-5.0-5.1.adoc`; start new "What's New"
2019-02-15 15:54:18 -05:00
Gary Russell
2d54fe2618 Upgrade to SF 5.1.0, Gradle 4.10.2 2018-09-21 11:12:41 -04:00
Gary Russell
d61cd790fe Upgrade to Gradle 4.9; fix RotatingServersTests
Stop the flow before examining the stream to avoid `ConcurrentModificationException`.

**cherry-pick to 5.0.x**
2018-07-25 14:01:38 -04:00
Artem Bilan
2f1b55f48c Upgrade to Gradle 4.7 and others, polishing build (#2423)
* Upgrade to Gradle 4.7 and others, polishing build

* Fix `MqttAdapterTests` according requirement of the latest Mockito
* Move `int-derby.properties` to the `/resources` from `/java`

* Fix Checkstyle violations
2018-04-20 11:11:05 -04:00
Gary Russell
f479270dcd Support JUnit5 in tests
* wrapper
2018-03-05 16:50:33 -05:00
Artem Bilan
f3072af192 INT-550: Optimize AbstractIntNamespaceHandler
JIRA: https://jira.spring.io/browse/INT-550

* We need verify schema version and register `IntegrationRegistrar`
only once, not on parsing each element
* `@Ignore` time-sensitive `GroovyScriptExecutingMessageProcessorTests`
* Upgrade to Gradle-4.3.1 to overcome NPE with caches
2017-11-20 13:58:59 -05:00
Artem Bilan
46de69dbf2 Honor the FluxSink State in the PollChPublisherAd
The `PollableChannelPublisherAdapter` is based on the poll model of the
`FluxSink` and iterate and poll downstream `PollableChannel` until
there is an item or `n > 0`.
Having `take(6)` we end up with the cancel from the downstream
`Subscriber` after the batch is filled, but at the same time we continue
to poll the upstream source because `n` is like `Long.MAX_VALUE`.

* The proper way to interact is check for the `!sink.isCancelled()`
as well.
This way cancelled `sink` won't "steal" data from other subscribers

Fix compatibility with the latest dependencies

* Upgrade to Gradle 4.1
* Upgrade as much dependencies as possible
* Fix MongoDB module to resolve deprecation in the latest driver
* Increase receive timeout in the `ResequencerTests`
* Restore generic argument for the method reference in the `ReactiveStreamsTests`
* Fix `WebFluxInboundEndpoint` for the compatibility with the latest Reactor API
2017-09-06 16:46:59 -04:00
Artem Bilan
c26cac4c17 Upgrade to the released Milestones
* SF-5.0 RC3
* AMQP2.0 M5
* Security 5.0 M3
* Spring Twitter 2.0 M4
* Gradle 4.0.1
* Checkstyle 8.0
* JsonPath 2.3
* Fix deprecations and Checkstyle violations
2017-07-24 13:42:12 -04:00
Artem Bilan
a1c42f65d0 Fix timing issue in test for STOMP Server
https://build.spring.io/browse/INT-MASTER-733

The Netty tries to load `netty-transport-native-epoll` too long, more
then 10 seconds we expect in the `AbstractStompSessionManager`, therefore
 we end up having `StompConnectionFailedEvent` as a first event in the
queue channel for STOMP events.

* Increase connection wait timeout to `30 secs`, like it is in many other
places in Spring
* Provide some Java 8 style refactoring for the `AbstractStompSessionManager`
* Fix `StompServerIntegrationTests` to poll events from queue until
`StompSessionConnectedEvent` any way
* Upgrade to Gradle 4.0 and `spring-io-plugin-0.0.8`
* Bump `org.sonarqube` version to `2.5` - `2.1` isn't compatible with Gradle 4.0
2017-06-23 15:41:37 -04:00
Artem Bilan
026484c382 Compatibility with the latest dependencies
* Upgrade to Gradle 3.5, SS-5.0, Hibernate-5.2.10, Mockito-2.7.22, Pah-1.1.1
And some other minor upgrades
* Fix deprecations for Mockito compatibility
* Fix `ServletWebSocketHandlerRegistry` deprecations
* Fix SD-Mongo deprecations
* Tweak JMX tests to avoid dangling threads after tests exist
* Increase timeouts in some polling tests
2017-04-26 11:29:18 -04:00
Artem Bilan
b206c7747a INT-4007: Prepare for release
JIRA: https://jira.spring.io/browse/INT-4007

* Revert all `B-S` dependencies to their latest Milestones
* Upgrade to Gradle 3.3 and some plugins
* Add more info into `MANIFEST.MF` via Gradle config
2017-01-05 11:53:18 -05:00
Artem Bilan
65261567d2 Upgrade to Gradle 2.14 and SF-4.3.1
In addition optimize `dist` task a bit excluding `BOM` module
2016-06-20 13:49:02 -04:00
Artem Bilan
ca0fa1b182 INT-4019: Upgrade to Gradle-2.13
JIRA: https://jira.spring.io/browse/INT-4019

* Add `org.gradle.daemon=true` to `gradle.properties`
* Add `--no-daemon` to CI plans, such as `master` and `nightly`
* Adjust `.travis.yml` to disable `gradlew assamble` task and allow artifacts caching

Add `script` to `.travis.yml` config

Since we have sometimes the problem with cached dependencies and the Travis report doesn't reflect the reality properly,
  add `--refresh-dependencies` to avoid such a caching bottleneck
 Also add `--parallel` for experiment to see if a new Gradle and Travis can overcome that now

No `--parallel`

Doesn't work forTravis. It indicates the maximum load for CPU as a critical error and interrupts the spawned Gradle Threads

Add `--no-daemon`

This option does not make sense for Travis. It starts a new environment for each build.
Meanwhile looks like `caching` and `--refresh-dependencies` do their premise
2016-04-29 14:38:59 -04:00
Artem Bilan
2b0598291c RequireThis rule and fixThis Gradle task
* `gradlew clean check -x test --parallel --continue` - to collect reports
* `gradlew fixThis --parallel` - to fix all possible vulnerabilities. With `-Dfile.encoding=UTF-8` on Windows

Since the `RequireThisCheck` doesn't see parents for anonymous classes (e.g. `Runnable` callback), its report doesn't contains the outer class name with `this.`,
therefore we still have to fix those cases manually.
Thanks to the wrong `replacer` just with `this.` we have uncompilable code enough easy to find problems.
Not so easy to fix for good readability though...

* Upgrade to Grade 2.12
* Upgrade to SonarQube native plugin

The fix contains at about 300 files. So, will be done on merge.

Fix `fixThis.gradle` according PR comments

Apply `fixThis` and also `fixModifiers` for test classes.
 Fix some `this.` inner issues manually.
 Make code polishing for long lines after `fixThis`

Fix conflicts and vulnerabilities after the rebase
2016-03-22 20:18:27 -04:00
Gary Russell
b69c0c2d24 INT-3780: Update to Gradle 2.5
JIRA: https://jira.spring.io/browse/INT-3780

- Move `s-i-test` to top of file to avoid deprecation warning

- Change `jacoco` to use the Gradle plugin

- Enable generation of `jacoco` coverage html report

- Hibernate tests need `javax.persistence` `2.1` eclipselink pulls in `2.0`;
works ok with gradle 2.3, but with 2.5 the 2.0 versions are loaded.

- replace `jpaApiVersion` build variable with the `jpa21ApiVersion`
2015-07-23 19:02:16 -04:00
Gunnar Hillert
8c81cffd27 INT-3629: Upgrade to Gradle 2.3
JIRA: https://jira.spring.io/browse/INT-3629

Fix Sonar Build
`build.gradle` polishing
2015-02-16 16:26:43 +02:00
Artem Bilan
4c89d21195 INT-3403: Upgrade Spring IO Dependencies
JIRA: https://jira.spring.io/browse/INT-3403

* Upgrade to Gradle 1.12
* Make `schemaZip` Windows compatible

INT-3403: Fix the `replaceAll` logic

INT-3403: Apply SS & SWS releases
2014-05-22 08:35:38 -04:00
Artem Bilan
fa4775e775 INT-3241: Upgrade Gradle and some dependencies
JIRA: https://jira.springsource.org/browse/INT-3241
2014-01-02 12:43:12 -05:00
Artem Bilan
dd5c9cc18c INT-3155: Add Gradle Task 'testAll'
* Add to `LongRunningIntegrationTest` ability to read `System.properties`
Note, ENV property 'RUN_LONG_INTEGRATION_TESTS' has a preference in case of value `true`
* Add Gradle task `testAll`
* Upgrade to Gradle 1.7
* Improve build performance by adding 'inputs'/'outputs' to some tasks

JIRA: https://jira.springsource.org/browse/INT-3155

Polishing

Remove inputs/outputs.

Polish RouterConcurrencyTest.
2013-09-30 12:01:12 -04:00
Gunnar Hillert
955e3ee282 INT-3021 - Fix Sonar Build Plan
* Upgrade to gradle 1.6
* Switch from sonar plugin to sonarRunner plugin

INT-3021 - Correct SCM syntax
2013-05-23 10:42:37 -04:00
Gunnar Hillert
51149184e8 INT-2985 - Upgrade to Gradle 1.5 2013-04-11 16:02:24 -04:00
Artem Bilan
c4ca84e20b INT-2907: Upgrade to Gradle 1.4
JIRA: https://jira.springsource.org/browse/INT-2907
2013-02-01 16:01:04 -05:00
Gunnar Hillert
2d81f3cc27 INT-2802 - Upgrade build.gradle to use Gradle 1.2
For reference see: https://jira.springsource.org/browse/INT-2802
2012-10-31 17:19:54 -04:00
Gunnar Hillert
cef6113854 INT-2681 - Upgrade to Gradle 1.0 GA
For reference: https://jira.springsource.org/browse/INT-2681
2012-07-25 15:49:07 -04:00
Chris Beams
edae65ae52 Eliminate gradle directory in favor of shared buildSrc
.gradle scripts once in gradle/ dir now live in shared buildSrc/ dir.

Some hard-coding of Spring Integration specifics still remain and will
be removed shortly.
2010-11-09 15:07:22 -08:00
Chris Beams
25e5756337 Initial cut of bundlor plugin 2010-11-09 10:55:19 -08:00
Chris Beams
7ea55fdc71 Add ability to generate poms for use at build time
Generate poms from Gradle metadata with

    `gradle generatePom`

This will create a root pom with a <modules> section as well as a pom
for every individual module.

These poms are suitable for use with m2eclipse (e.g., File->Import->
Existing Maven project), or at the command line for basic build goals
such as `mvn test`.

These poms are not capable of producing distribution artifacts or
deployment of artifacts.

pom.xml and target will remain in .gitignore as these artifacts are
transient and for developer convenience only.
2010-11-04 16:54:06 -06:00
Hans Dockter
c2866d96b4 Apply Hans' refactoring of pom customization logic 2010-10-28 11:58:36 -04:00
Chris Beams
a72d327db6 Mark dependencies 'optional' or 'provided' as appropriate
Requires significant pom customization in maven-deployment.gradle
which has been verified at `gradle install` time, but not yet at
`gradle uploadArchives` time.  Need to figure out how to eliminate
the duplication going on there.
2010-10-28 11:16:03 -04:00
Chris Beams
a600e5279b Polish @author tags
Names should be spelled out ('Chris Beams') instead of abbreviated
('cbeams')
2010-10-27 15:54:05 -04:00
Chris Beams
8b483a08b8 Simplify inclusion of images and css in html* doc dirs 2010-10-27 10:40:49 -04:00
Chris Beams
036a3f5b15 Update gradle files to reference new locations for resources 2010-10-27 09:29:19 -04:00
Chris Beams
1cbafbe9db Upgrade Gradle to 0.9-build-daemon-20101027111821+1100 2010-10-27 07:24:56 -04:00
Chris Beams
677fca51a9 Major progress on Gradle port
Complete:
--------
- src/* documentation resources moved to 'docs' subproject

- docbook sources upgraded to Docbook 5

- formatted all docbook sources to strip tab characters and
  eliminate trailing whitespace

- all projects compile and test successfully

- all artifacts upload successfully to s3, static.sf.org, etc.

Remaining:
---------
- documentation L&F needs work. CSS, images, and highlighting aren't
  hooked up properly

- spring-integration-jdbc codegen bits in Maven POM need to be
  transcribed into gradle

- dependencies that were optional or provided scope in maven are
  currently 'compile' scope in Gradle.  Need to figure out support
  in Gradle to fix this.

- run through Eclipse classpath and project generation scenarios

- delete all Maven artifacts
2010-10-26 18:51:08 -04:00
Mark Fisher
d677da9c62 added major/minor version properties to version class 2010-10-26 12:53:36 -04:00
Chris Beams
28d31094b5 Back to latest build_daemon branch build
This reverts commit 4a8b3e592c.
2010-10-25 19:29:44 -04:00
Chris Beams
4a8b3e592c Drop down to 0.9-rc-1 2010-10-25 19:27:00 -04:00
Mark Fisher
8025f72d00 adding basic gradle config 2010-10-25 19:18:49 -04:00