Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

Commit d07ee15

Browse files
authored
prepare 4.6.5 release (#164)
1 parent 61fdf7e commit d07ee15

File tree

2 files changed

+59
-26
lines changed

2 files changed

+59
-26
lines changed

.circleci/config.yml

Lines changed: 58 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,63 @@
11
version: 2
2-
jobs:
32

3+
test-template: &test-template
4+
steps:
5+
- checkout
6+
- run: cp gradle.properties.example gradle.properties
7+
- attach_workspace:
8+
at: build
9+
- run: java -version
10+
- run: ./gradlew test
11+
- run:
12+
name: Save test results
13+
command: |
14+
mkdir -p ~/junit/;
15+
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
16+
when: always
17+
- store_test_results:
18+
path: ~/junit
19+
- store_artifacts:
20+
path: ~/junit
21+
22+
jobs:
423
build:
524
docker:
6-
- image: circleci/java
7-
- image: redis
25+
- image: circleci/openjdk:8u131-jdk # To match the version pre-installed in Ubuntu 16 and used by Jenkins for releasing
826
steps:
927
- checkout
1028
- run: cp gradle.properties.example gradle.properties
29+
- run: java -version
1130
- run: ./gradlew dependencies
12-
- run: ./gradlew test
13-
- run:
14-
name: Save test results
15-
command: |
16-
mkdir -p ~/junit/;
17-
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
18-
when: always
19-
- store_test_results:
20-
path: ~/junit
21-
- store_artifacts:
22-
path: ~/junit
31+
- run: ./gradlew jar
2332
- persist_to_workspace:
2433
root: build
2534
paths:
2635
- classes
27-
36+
test-java8:
37+
<<: *test-template
38+
docker:
39+
- image: circleci/openjdk:8
40+
- image: redis
41+
test-java9:
42+
<<: *test-template
43+
docker:
44+
- image: circleci/openjdk:9
45+
- image: redis
46+
test-java10:
47+
<<: *test-template
48+
docker:
49+
- image: circleci/openjdk:10
50+
- image: redis
51+
test-java11:
52+
<<: *test-template
53+
docker:
54+
- image: circleci/openjdk:11
55+
- image: redis
2856
packaging:
2957
docker:
30-
- image: circleci/java
58+
- image: circleci/openjdk:8
3159
steps:
60+
- run: java -version
3261
- run: sudo apt-get install make -y -q
3362
- checkout
3463
- attach_workspace:
@@ -45,15 +74,19 @@ workflows:
4574
version: 2
4675
test:
4776
jobs:
48-
- build:
49-
filters:
50-
branches:
51-
ignore:
52-
- gh-pages
77+
- build
78+
- test-java8:
79+
requires:
80+
- build
81+
- test-java9:
82+
requires:
83+
- build
84+
- test-java10:
85+
requires:
86+
- build
87+
- test-java11:
88+
requires:
89+
- build
5390
- packaging:
5491
requires:
5592
- build
56-
filters:
57-
branches:
58-
ignore:
59-
- gh-pages

packaging-test/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SLF4J_SIMPLE_JAR_URL=https://oss.sonatype.org/content/groups/public/org/slf4j/sl
3030

3131
# Felix OSGi container
3232
FELIX_ARCHIVE=org.apache.felix.main.distribution-6.0.3.tar.gz
33-
FELIX_ARCHIVE_URL=http://apache.mirrors.ionfish.org//felix/$(FELIX_ARCHIVE)
33+
FELIX_ARCHIVE_URL=http://mirrors.ibiblio.org/apache//felix/$(FELIX_ARCHIVE)
3434
FELIX_DIR=$(TEMP_DIR)/felix
3535
FELIX_JAR=$(FELIX_DIR)/bin/felix.jar
3636
TEMP_BUNDLE_DIR=$(TEMP_DIR)/bundles

0 commit comments

Comments
 (0)