Skip to content

Commit 0745d7c

Browse files
daggerokdaggerok
committed
workaround for ant being a pile of fail (C) whatthecommit.com
1 parent 216035f commit 0745d7c

File tree

21 files changed

+211
-72
lines changed

21 files changed

+211
-72
lines changed

‎.github/workflows/ci.yml

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: CI
22
on: [push]
33
env:
44
CI: 'true'
5+
JAVA_OPTS: -Djava.net.preferIPv4Stack=true
56
jobs:
67
jboss-eap-postgres:
78
strategy:
@@ -159,6 +160,157 @@ jobs:
159160
with:
160161
java-version: ${{ matrix.java }}
161162
- run: cd $GITHUB_WORKSPACE/wildfly-swarm-maven && ./gradlew clean build wildfly-swarm-package
163+
kotlin-java-ee:
164+
strategy:
165+
matrix:
166+
java: [8]
167+
os: [ubuntu-latest]
168+
runs-on: ${{ matrix.os }}
169+
name: java-${{ matrix.java }} kotlin-java-ee test
170+
steps:
171+
- uses: actions/checkout@v1
172+
- uses: actions/cache@v1
173+
with:
174+
path: ~/.n*
175+
key: ${{ runner.os }}-npm-${{ hashFiles('**/package.json') }}
176+
restore-keys: |
177+
${{ runner.os }}-build-
178+
${{ runner.os }}-npm-
179+
${{ runner.os }}-
180+
- uses: actions/setup-node@v1
181+
- uses: actions/cache@v1
182+
with:
183+
path: ~/.m2
184+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradlew') }}
185+
restore-keys: |
186+
${{ runner.os }}-gradle-
187+
${{ runner.os }}-build-
188+
${{ runner.os }}-
189+
- uses: actions/setup-java@v1
190+
with:
191+
java-version: ${{ matrix.java }}
192+
- run: npm i -g wait-port
193+
- run: sudo apt-get install -y httpie
194+
- run: cd $GITHUB_WORKSPACE/kotlin-java-ee && ./gradlew clean build
195+
- run: java -Djava.net.preferIPv4Stack=true -jar $GITHUB_WORKSPACE/kotlin-java-ee/build/libs/*-swarm.jar &
196+
- run: wait-port 8080
197+
- run: sleep 15s
198+
- run: http :8080
199+
- run: http :8080/max
200+
kotlin-swarm-maven:
201+
strategy:
202+
matrix:
203+
java: [8]
204+
os: [ubuntu-latest]
205+
runs-on: ${{ matrix.os }}
206+
name: java-${{ matrix.java }} kotlin-swarm-maven test
207+
steps:
208+
- uses: actions/checkout@v1
209+
- uses: actions/cache@v1
210+
with:
211+
path: ~/.n*
212+
key: ${{ runner.os }}-npm-${{ hashFiles('**/package.json') }}
213+
restore-keys: |
214+
${{ runner.os }}-build-
215+
${{ runner.os }}-npm-
216+
${{ runner.os }}-
217+
- uses: actions/setup-node@v1
218+
- uses: actions/cache@v1
219+
with:
220+
path: ~/.m2
221+
key: ${{ runner.os }}-naven-${{ hashFiles('**/mvnw') }}
222+
restore-keys: |
223+
${{ runner.os }}-maven-
224+
${{ runner.os }}-build-
225+
${{ runner.os }}-
226+
- uses: actions/setup-java@v1
227+
with:
228+
java-version: ${{ matrix.java }}
229+
- run: npm i -g wait-port
230+
- run: sudo apt-get install -y httpie
231+
- run: cd $GITHUB_WORKSPACE/kotlin-swarm && ./mvnw
232+
#- run: cd $GITHUB_WORKSPACE/kotlin-swarm && sudo bash mvnw wildfly-swarm:run &
233+
- run: java -Djava.net.preferIPv4Stack=true -jar $GITHUB_WORKSPACE/kotlin-swarm/target/*.jar &
234+
- run: wait-port 8080
235+
- run: sleep 5s
236+
- run: http :8080
237+
- run: http :8080/health
238+
java-ee-dwr-example:
239+
strategy:
240+
matrix:
241+
java: [8]
242+
os: [ubuntu-latest]
243+
runs-on: ${{ matrix.os }}
244+
name: java-${{ matrix.java }} java-ee-dwr-example test
245+
steps:
246+
- uses: actions/checkout@v1
247+
- uses: actions/cache@v1
248+
with:
249+
path: ~/.docker
250+
key: ${{ runner.os }}-docker-${{ hashFiles('**/Dockerfile') }}
251+
restore-keys: |
252+
${{ runner.os }}-docker-
253+
${{ runner.os }}-build-
254+
${{ runner.os }}-
255+
- run: sudo apt-get update -t docker-ce
256+
- uses: actions/cache@v1
257+
with:
258+
path: ~/.m2
259+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradlew') }}
260+
restore-keys: |
261+
${{ runner.os }}-gradle-
262+
${{ runner.os }}-build-
263+
${{ runner.os }}-
264+
- uses: actions/setup-java@v1
265+
with:
266+
java-version: ${{ matrix.java }}
267+
- run: sudo npm i -g wait-port
268+
- run: sudo apt-get install -y httpie
269+
- run: cd $GITHUB_WORKSPACE/java-ee-dwr-example && ./gradlew
270+
- run: cd $GITHUB_WORKSPACE/java-ee-dwr-example && ./gradlew composeUp
271+
- run: http :8080/app/
272+
- run: http :8080/app/dwr/index.html
273+
- run: cd $GITHUB_WORKSPACE/java-ee-dwr-example && ./gradlew composeDown
274+
kotlin-swarm-gradle:
275+
strategy:
276+
matrix:
277+
java: [8]
278+
os: [ubuntu-latest]
279+
runs-on: ${{ matrix.os }}
280+
name: java-${{ matrix.java }} kotlin-swarm-gradle test
281+
steps:
282+
- uses: actions/checkout@v1
283+
- uses: actions/cache@v1
284+
with:
285+
path: ~/.n*
286+
key: ${{ runner.os }}-npm-${{ hashFiles('**/package.json') }}
287+
restore-keys: |
288+
${{ runner.os }}-build-
289+
${{ runner.os }}-npm-
290+
${{ runner.os }}-
291+
- uses: actions/setup-node@v1
292+
- uses: actions/cache@v1
293+
with:
294+
path: ~/.m2
295+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradlew') }}
296+
restore-keys: |
297+
${{ runner.os }}-gradle-
298+
${{ runner.os }}-build-
299+
${{ runner.os }}-
300+
- uses: actions/setup-java@v1
301+
with:
302+
java-version: ${{ matrix.java }}
303+
- run: npm i -g wait-port
304+
- run: sudo apt-get install -y httpie
305+
- run: cd $GITHUB_WORKSPACE/kotlin-swarm && ./gradlew
306+
- run: |
307+
cd $GITHUB_WORKSPACE/kotlin-swarm
308+
java -jar ./build/libs/*-swarm.jar &
309+
wait-port 8080
310+
sleep 5s
311+
http :8080
312+
http :8080/health
313+
162314
# wildfly-swarm-maven-docker:
163315
# strategy:
164316
# matrix:

‎.travis.yml

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,7 @@ jobs:
4040
- stage: test
4141
name: java-ee-dwr-example
4242
script:
43-
#
44-
- cd $TRAVIS_BUILD_DIR/java-ee-dwr-example/
45-
- ./mvnw
46-
- ./gradlew composeUp
47-
- http :8080/app/
48-
- http :8080/app/dwr/index.html
49-
- ./gradlew composeDown
43+
- cd $TRAVIS_BUILD_DIR/java-ee-dwr-example && ./mvnw
5044
#
5145
## jax-rs-hateoas-links
5246
#- cd $TRAVIS_BUILD_DIR/jax-rs-hateoas-links
@@ -246,27 +240,20 @@ jobs:
246240
- stage: test
247241
name: kotlin-swarm
248242
script:
249-
- cd $TRAVIS_BUILD_DIR/kotlin-swarm
250-
- bash mvnw
251-
#- sudo bash mvnw wildfly-swarm:run &
252-
#- java -jar target/*.jar &
253-
- bash gradlew
254-
- bash build/libs/*-swarm.jar -Djava.net.preferIPv4Stack=true &
255-
- wait_for 8080
256-
- sleep 5
257-
- http :8080
258-
- http :8080/health
259-
- stop_any 8080
260-
- bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up
243+
- cd $TRAVIS_BUILD_DIR/kotlin-swarm && ./mvnw
244+
- cd $TRAVIS_BUILD_DIR/kotlin-swarm && ./mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up
261245
- sleep 25
262246
- http :8080
263247
- http :8080/health
264-
- bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:down
265-
- bash gradlew composeUp || true
248+
- cd $TRAVIS_BUILD_DIR/kotlin-swarm && ./mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:down
249+
#
250+
- cd $TRAVIS_BUILD_DIR/kotlin-swarm && ./gradlew composeUp || true
266251
- sleep 25
267252
- http :8080
268253
- http :8080/health
269-
- bash gradlew composeDown || true
254+
- cd $TRAVIS_BUILD_DIR/kotlin-swarm && ./gradlew composeDown || true
255+
#
256+
- cd $TRAVIS_BUILD_DIR/kotlin-swarm && ./mvnw
270257
- docker-compose -f docker-compose-maven.yaml build
271258
- docker-compose -f docker-compose-maven.yaml up &
272259
- sleep 40
@@ -538,16 +525,6 @@ jobs:
538525
#- http :8080/hi
539526
#- http :8080/max
540527
#- docker-compose down -v
541-
- stage: test
542-
name: kotlin-java-ee
543-
script:
544-
- cd $TRAVIS_BUILD_DIR/kotlin-java-ee
545-
- bash gradlew clean build
546-
- java -Djava.net.preferIPv4Stack=true -jar build/libs/*-swarm.jar &
547-
- sleep 30
548-
- http :8080
549-
- http :8080/max
550-
- stop_any 8080 8080 8080
551528
- stage: deploy
552529
name: Deploy docs
553530
script: skip

‎facelets-example/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
hibernateCoreVersion = "4.2.18.Final"
1111
}
1212
repositories {
13-
mavenLocal()
13+
// mavenLocal()
1414
mavenCentral()
1515
}
1616
dependencies {
@@ -42,7 +42,7 @@ war {
4242
defaultTasks "clean", "build"
4343

4444
repositories {
45-
mavenLocal()
45+
// mavenLocal()
4646
mavenCentral()
4747
}
4848

‎faces/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ war {
3030
defaultTasks "clean", "build"
3131

3232
repositories {
33-
mavenLocal()
33+
// mavenLocal()
3434
mavenCentral()
3535
}
3636

‎java-kube-ee/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
repositories {
7-
mavenLocal()
7+
// mavenLocal()
88
mavenCentral()
99
}
1010

@@ -25,7 +25,7 @@ version = "0.0.0"
2525
group = "daggerok"
2626

2727
repositories {
28-
mavenLocal()
28+
// mavenLocal()
2929
mavenCentral()
3030
}
3131

‎jboss-4-jax-rs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ war {
7575
defaultTasks "clean", "build"
7676

7777
repositories {
78-
mavenLocal()
78+
// mavenLocal()
7979
mavenCentral()
8080
}
8181

‎jboss4-java5/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ war {
3232
defaultTasks "clean", "build"
3333

3434
repositories {
35-
mavenLocal()
35+
// mavenLocal()
3636
mavenCentral()
3737
}
3838

‎kotlin-java-ee-payara-docker/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
wildflySwarmVersion = "2017.10.1"
55
}
66
repositories {
7-
mavenLocal()
7+
// mavenLocal()
88
mavenCentral()
99
maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" }
1010
}
@@ -53,7 +53,7 @@ compileTestKotlin {
5353
}
5454

5555
repositories {
56-
mavenLocal()
56+
// mavenLocal()
5757
mavenCentral()
5858
maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" }
5959
}

‎kotlin-java-ee/build.gradle

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
buildscript {
22
ext {
3-
kotlinVersion = "1.1.60-eap-43"
4-
wildflySwarmVersion = "2017.10.1"
3+
kotlinVersion = "1.1.61"
4+
wildflySwarmVersion = "2018.5.0"
55
}
66
repositories {
7-
mavenLocal()
7+
// mavenLocal()
88
mavenCentral()
9-
maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" }
9+
maven { url = "https://maven.repository.redhat.com/ga/" }
10+
maven { url = "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/" }
1011
}
1112
dependencies {
1213
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
13-
classpath "io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE"
14+
classpath "io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE"
1415
classpath "org.wildfly.swarm:wildfly-swarm-gradle-plugin:$wildflySwarmVersion"
1516
}
1617
}
@@ -45,13 +46,15 @@ compileTestKotlin {
4546
}
4647

4748
repositories {
48-
mavenLocal()
49+
// mavenLocal()
4950
mavenCentral()
50-
maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" }
51+
maven { url = "https://maven.repository.redhat.com/ga/" }
52+
maven { url = "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/" }
5153
}
5254

5355
task wrapper(type: Wrapper) {
54-
gradleVersion = "4.3"
56+
// gradleVersion = "3.5.1"
57+
gradleVersion = "4.10.3"
5558
distributionType = "ALL"
5659
}
5760

@@ -71,3 +74,5 @@ swarm {
7174
// }
7275
// bundleDependencies = true
7376
}
77+
78+
defaultTasks "clean", "build"

‎kotlin-java-ee/gradle/wrapper/gradle-wrapper.jar

-77 Bytes
Binary file not shown.

‎kotlin-java-ee/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Nov 07 04:09:42 EET 2017
1+
#Sat Apr 18 18:22:06 EEST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

‎kotlin-kafka/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
hibernateCoreVersion = "4.2.18.Final"
1313
}
1414
repositories {
15-
mavenLocal()
15+
// mavenLocal()
1616
mavenCentral()
1717
}
1818
dependencies {
@@ -91,7 +91,7 @@ war {
9191
defaultTasks "clean", "build"
9292

9393
repositories {
94-
mavenLocal()
94+
// mavenLocal()
9595
mavenCentral()
9696
}
9797

0 commit comments

Comments
 (0)