Skip to content

Commit 654ffa6

Browse files
jwgmeligmeylingjwgmeligmeyling
committed
Merge pull request #53 from JWGmeligMeyling/dependency-management
Dependency management
2 parents a1d89b0 + 1b97adb commit 654ffa6

File tree

9 files changed

+76
-24
lines changed

9 files changed

+76
-24
lines changed

‎.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
language: java
22
jdk:
33
- oraclejdk8
4+
after_success:
5+
- mvn clean test jacoco:report coveralls:report versioneye:update

‎Java-Gitolite-Manager

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
[![Stories in Ready](https://badge.waffle.io/devhub-tud/devhub.png?label=ready&title=Ready)](https://waffle.io/devhub-tud/devhub)
2+
[![Build Status](https://travis-ci.org/devhub-tud/git-server.svg?branch=master)](https://travis-ci.org/devhub-tud/git-server)
3+
[![Coverage Status](https://coveralls.io/repos/github/devhub-tud/git-server/badge.svg?branch=master)](https://coveralls.io/github/devhub-tud/git-server?branch=master)
4+
[![Dependency Status](https://www.versioneye.com/user/projects/569e5ab6ec6e6a000a1a98ea/badge.svg?style=flat)](https://www.versioneye.com/user/projects/569e5ab6ec6e6a000a1a98ea)
5+
16
# Git-Server
27

38
**Git-Server** is a git server with a REST API and is backed by a local Gitolite installation. The **Git-Server** REST API can be used to manage the local installation of Gitolite. The REST API allows external systems to list, inspect, create or delete users, ssh-keys, groups, and repositories.

‎git-models/src/main/resources/versioneye.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Properties for http://www.VersionEye.com
2+
#Tue Jan 19 16:44:41 CET 2016
3+
project_id=569e5ab6ec6e6a000e1b00a1

‎git-server/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>org.eclipse.jgit</groupId>
2121
<artifactId>org.eclipse.jgit</artifactId>
22-
<version>4.0.2.201509141540-r</version>
22+
<version>4.1.1.201511131810-r</version>
2323
</dependency>
2424
<!-- Web -->
2525
<dependency>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>ch.qos.logback</groupId>
9292
<artifactId>logback-classic</artifactId>
93-
<version>1.0.13</version>
93+
<version>1.1.3</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.slf4j</groupId>
@@ -164,13 +164,13 @@
164164
<dependency>
165165
<groupId>org.javassist</groupId>
166166
<artifactId>javassist</artifactId>
167-
<version>3.19.0-GA</version>
167+
<version>3.20.0-GA</version>
168168
</dependency>
169169

170170
<dependency>
171171
<groupId>org.reflections</groupId>
172172
<artifactId>reflections</artifactId>
173-
<version>0.9.8</version>
173+
<version>0.9.10</version>
174174
<exclusions>
175175
<exclusion>
176176
<groupId>com.google.guava</groupId>
@@ -186,7 +186,7 @@
186186
<dependency>
187187
<groupId>com.google.code.findbugs</groupId>
188188
<artifactId>annotations</artifactId>
189-
<version>3.0.0</version>
189+
<version>3.0.1</version>
190190
</dependency>
191191
</dependencies>
192192

@@ -202,7 +202,7 @@
202202
<plugin>
203203
<groupId>org.apache.maven.plugins</groupId>
204204
<artifactId>maven-assembly-plugin</artifactId>
205-
<version>2.4</version>
205+
<version>2.6</version>
206206
<configuration>
207207
<descriptors>
208208
<descriptor>
@@ -223,7 +223,7 @@
223223
<plugin>
224224
<groupId>org.apache.maven.plugins</groupId>
225225
<artifactId>maven-jar-plugin</artifactId>
226-
<version>2.4</version>
226+
<version>2.6</version>
227227
<configuration>
228228
<archive>
229229
<manifest>

‎git-server/src/main/resources/versioneye.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Properties for http://www.VersionEye.com
2+
#Tue Jan 19 16:44:43 CET 2016
3+
project_id=569e5ab8ec6e6a000e1b00b0

‎pom.xml

Lines changed: 53 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515

16-
<guice.version>3.0</guice.version>
17-
<jackson.version>2.5.3</jackson.version>
18-
<jetty.version>9.3.3.v20150827</jetty.version>
19-
<resteasy.version>3.0.13.Final</resteasy.version>
20-
<slf4j.version>1.7.5</slf4j.version>
21-
<lombok.version>1.16.4</lombok.version>
22-
<guava.version>18.0</guava.version>
16+
<guice.version>[3.0,)</guice.version>
17+
<jackson.version>2.6.3</jackson.version>
18+
<jetty.version>9.3.7.v20160115</jetty.version>
19+
<resteasy.version>3.0.14.Final</resteasy.version>
20+
<slf4j.version>1.7.13</slf4j.version>
21+
<lombok.version>1.16.6</lombok.version>
22+
<guava.version>19.0</guava.version>
23+
<jacoco.version>0.7.5.201505241946</jacoco.version>
2324
</properties>
2425

2526
<description>The Devhub Git-server is a REST API over the Git API and can be used for Gitolite server administration</description>
@@ -81,7 +82,7 @@
8182
<dependency>
8283
<groupId>javax.ws.rs</groupId>
8384
<artifactId>javax.ws.rs-api</artifactId>
84-
<version>2.0</version>
85+
<version>[2.0,)</version>
8586
</dependency>
8687
<dependency>
8788
<groupId>org.jboss.resteasy</groupId>
@@ -107,12 +108,46 @@
107108

108109
</dependencies>
109110

111+
<build>
112+
<plugins>
113+
<plugin>
114+
<groupId>com.versioneye</groupId>
115+
<artifactId>versioneye-maven-plugin</artifactId>
116+
<version>3.5.1</version>
117+
<configuration>
118+
<apiKey>3d8f08d518ddab52c31a</apiKey>
119+
</configuration>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.eluder.coveralls</groupId>
123+
<artifactId>coveralls-maven-plugin</artifactId>
124+
<version>4.1.0</version>
125+
<configuration>
126+
<repoToken>6KyeeQlj65x6lW3ZgOYq93I1dKpbxM4qI</repoToken>
127+
</configuration>
128+
</plugin>
129+
<plugin>
130+
<groupId>org.jacoco</groupId>
131+
<artifactId>jacoco-maven-plugin</artifactId>
132+
<version>${jacoco.version}</version>
133+
<executions>
134+
<execution>
135+
<id>prepare-agent</id>
136+
<goals>
137+
<goal>prepare-agent</goal>
138+
</goals>
139+
</execution>
140+
</executions>
141+
</plugin>
142+
</plugins>
143+
</build>
144+
110145
<reporting>
111146
<plugins>
112147
<plugin>
113148
<groupId>org.apache.maven.plugins</groupId>
114149
<artifactId>maven-project-info-reports-plugin</artifactId>
115-
<version>2.8</version>
150+
<version>2.8.1</version>
116151
</plugin>
117152

118153
<plugin>
@@ -144,21 +179,27 @@
144179
<plugin>
145180
<groupId>org.codehaus.mojo</groupId>
146181
<artifactId>findbugs-maven-plugin</artifactId>
147-
<version>3.0.0</version>
182+
<version>3.0.3</version>
148183
</plugin>
149184

150185
<plugin> <!-- JUnit report -->
151186
<groupId>org.apache.maven.plugins</groupId>
152187
<artifactId>maven-surefire-report-plugin</artifactId>
153-
<version>2.18.1</version>
188+
<version>2.19.1</version>
154189
</plugin>
190+
191+
<plugin>
192+
<groupId>org.jacoco</groupId>
193+
<artifactId>jacoco-maven-plugin</artifactId>
194+
<version>${jacoco.version}</version>
195+
</plugin>
196+
155197
</plugins>
156198
</reporting>
157199

158200
<modules>
159201
<module>git-server</module>
160202
<module>git-models</module>
161-
<module>Java-Gitolite-Manager</module>
162203
</modules>
163204

164205
</project>

‎src/main/resources/versioneye.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Properties for http://www.VersionEye.com
2+
#Tue Jan 19 16:44:40 CET 2016
3+
project_id=569e5ab6ec6e6a000a1a98ea

0 commit comments

Comments
 (0)