Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update dependencyManagement #2660

Merged
merged 27 commits into from
May 14, 2019
Merged

update dependencyManagement #2660

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cb42c19
Fix #2546
ascrutae Apr 28, 2019
82c87fb
Merge branch 'master' into fix/spring-plugin-issue
ascrutae Apr 28, 2019
a4ad679
Change the stackdepth type
ascrutae Apr 28, 2019
12b6da9
Merge branch 'master' into fix/spring-plugin-issue
wu-sheng Apr 28, 2019
0782642
Fix bug
ascrutae Apr 29, 2019
53f2fc5
Merge branch 'fix/spring-plugin-issue' of https://github.com/ascrutae…
ascrutae Apr 29, 2019
6f7e27b
Fix CI failed
ascrutae Apr 29, 2019
1dff9b3
Merge pull request #1 from ascrutae/fix/spring-plugin-issue
IanCao Apr 29, 2019
285c513
fix #2599
IanCao May 6, 2019
72e54b0
Merge pull request #2 from apache/master
IanCao May 6, 2019
a2fadff
Merge branch 'master' of https://github.com/IanCao/skywalking
IanCao May 6, 2019
7f20d19
fix ci
IanCao May 6, 2019
5220451
add license
IanCao May 6, 2019
8592c29
add ActiveTag error methods
IanCao May 6, 2019
9e0c23a
Merge branch 'master' into master
ascrutae May 6, 2019
c1681c4
fix
IanCao May 7, 2019
604a6c4
Merge branch 'master' of https://github.com/IanCao/skywalking
IanCao May 7, 2019
5b6719d
Merge branch 'master' into master
wu-sheng May 7, 2019
a46bc1d
fix
IanCao May 7, 2019
961357c
fix doc
IanCao May 7, 2019
4e7fde6
Merge branch 'master' into master
wu-sheng May 9, 2019
128c472
update doc
IanCao May 10, 2019
292c10b
Merge branch 'master' into master
wu-sheng May 10, 2019
8426c0c
update dependencyManagement
IanCao May 14, 2019
ba011f9
Merge pull request #3 from apache/master
IanCao May 14, 2019
e14ce94
fix
IanCao May 14, 2019
24d66f1
Merge branch 'master' into master
peng-yongsheng May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions oap-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
<zipkin.version>2.9.1</zipkin.version>
<caffeine.version>2.6.2</caffeine.version>
<okhttp.version>3.9.0</okhttp.version>
<jackson-core.version>2.9.5</jackson-core.version>
<jackson-annotations.version>2.9.5</jackson-annotations.version>
<jackson-databind.version>2.9.5</jackson-databind.version>
<commons-codec.version>1.11</commons-codec.version>
<commons-lang3.version>3.7</commons-lang3.version>
<simpleclient.version>0.6.0</simpleclient.version>

<maven-docker-plugin.version>0.28.0</maven-docker-plugin.version>
</properties>
Expand Down Expand Up @@ -322,6 +328,36 @@
<version>${caffeine.version}</version>
</dependency>
<!-- -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-core.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>${simpleclient.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down