Skip to content

Commit dca6e2a

Browse files
authored
[SRC-218] Improvement/standalone build
2 parents 6512c59 + f209c88 commit dca6e2a

File tree

2 files changed

+83
-6
lines changed

2 files changed

+83
-6
lines changed

.circleci/config.yml

Lines changed: 73 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,77 @@
11
version: 2
2+
3+
job-settings:
4+
defaults:
5+
agent-only: &defaults-agent-only
6+
docker:
7+
- image: groupbyinc/circleci-java
8+
9+
workflow-settings:
10+
context: &job-context
11+
context: org-global
12+
13+
main_branch_only: &main_branch_only
14+
filters:
15+
branches:
16+
only:
17+
- develop
18+
19+
workspace_key: &workspace_key
20+
key: v1-repo-{{ .Branch }}-{{ .Revision }}
21+
22+
dependency_cache_key: &dependency_cache_key
23+
run:
24+
name: Generate Dependency Cache Key
25+
command: /scripts/checksum.sh /tmp/checksum
26+
27+
cache_key: &cache_key
28+
key: v1-dependencies-{{checksum "/tmp/checksum"}}-{{ .Revision }}
29+
30+
setup_builder: &setup_builder
31+
run:
32+
name: Initialize Build Agent
33+
command: /scripts/setup.sh
34+
235
jobs:
336
build:
4-
docker:
5-
- image: circleci/openjdk:8u171-jdk
37+
<<: *defaults-agent-only
638
steps:
7-
- checkout
8-
- run: mvn clean install
9-
- run: mvn surefire:test -Punit
39+
- checkout
40+
- *dependency_cache_key
41+
- restore_cache: *cache_key
42+
- *setup_builder
43+
- run: mvn clean install
44+
- run: mvn surefire:test -Punit
45+
- save_cache:
46+
<<: *cache_key
47+
paths:
48+
- ~/.m2
49+
- save_cache:
50+
<<: *workspace_key
51+
paths:
52+
- ~/.ssh
53+
- ~/project
54+
release:
55+
<<: *defaults-agent-only
56+
steps:
57+
- restore_cache: *workspace_key
58+
- *dependency_cache_key
59+
- restore_cache: *cache_key
60+
- *setup_builder
61+
- run: mvn -B release:prepare release:perform
62+
63+
workflows:
64+
version: 2
65+
build-and-push:
66+
jobs:
67+
- build: *job-context
68+
- hold:
69+
<<: *main_branch_only
70+
type: approval
71+
requires:
72+
- build
73+
- release:
74+
<<: *main_branch_only
75+
<<: *job-context
76+
requires:
77+
- hold

pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>api-java-flux</artifactId>
13-
<version>2.6.81-SNAPSHOT</version>
13+
<version>3.0.0-SNAPSHOT</version>
1414

1515
<packaging>jar</packaging>
1616

@@ -251,6 +251,15 @@
251251
<groupId>org.sonatype.plugins</groupId>
252252
<artifactId>nexus-staging-maven-plugin</artifactId>
253253
</plugin>
254+
255+
<plugin>
256+
<groupId>org.apache.maven.plugins</groupId>
257+
<artifactId>maven-compiler-plugin</artifactId>
258+
<configuration>
259+
<source>6</source>
260+
<target>6</target>
261+
</configuration>
262+
</plugin>
254263
</plugins>
255264

256265
</build>

0 commit comments

Comments
 (0)