Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ARSnova Backend
Manage
Activity
Members
Labels
Plan
Issues
27
Issue boards
Milestones
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
ARSnova
ARSnova Backend
Commits
90016c06
There was a problem fetching the latest pipeline status.
Commit
90016c06
authored
6 years ago
by
Daniel Gerhardt
Browse files
Options
Downloads
Plain Diff
Merge branch '2.5' into 2.x
parents
7b54c81e
31f4f830
No related merge requests found
Pipeline
#15271
passed with stages
in 2 minutes and 21 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
pom.xml
+7
-7
7 additions, 7 deletions
pom.xml
with
11 additions
and
7 deletions
CHANGELOG.md
+
4
−
0
View file @
90016c06
# Changelog
## 2.5.6
This is a maintenance release which only brings libraries up to date to fix
potential bugs.
## 2.5.5
This is a maintenance release which only brings libraries up to date to fix
potential bugs.
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
7
−
7
View file @
90016c06
...
...
@@ -7,8 +7,8 @@
<packaging>
war
</packaging>
<properties>
<io.spring.platform-version>
Brussels-SR
9
</io.spring.platform-version>
<io.netty-version>
4.1.2
3
.Final
</io.netty-version>
<io.spring.platform-version>
Brussels-SR
10
</io.spring.platform-version>
<io.netty-version>
4.1.2
5
.Final
</io.netty-version>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<timestamp>
${maven.build.timestamp}
</timestamp>
<sonar.language>
java
</sonar.language>
...
...
@@ -235,7 +235,7 @@
<dependency>
<groupId>
com.corundumstudio.socketio
</groupId>
<artifactId>
netty-socketio
</artifactId>
<version>
1.7.1
4
</version>
<version>
1.7.1
5
</version>
</dependency>
<dependency>
<groupId>
javax.inject
</groupId>
...
...
@@ -299,7 +299,7 @@
<dependency>
<groupId>
io.swagger
</groupId>
<artifactId>
swagger-annotations
</artifactId>
<version>
1.5.1
8
</version>
<version>
1.5.1
9
</version>
</dependency>
<dependency>
<groupId>
com.codahale.metrics
</groupId>
...
...
@@ -344,7 +344,7 @@
<plugin>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-maven-plugin
</artifactId>
<version>
9.4.
9
.v20180
320
</version>
<version>
9.4.
10
.v20180
503
</version>
<configuration>
<scanIntervalSeconds>
1
</scanIntervalSeconds>
<webApp>
...
...
@@ -366,7 +366,7 @@
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-site-plugin
</artifactId>
<version>
3.7
</version>
<version>
3.7
.1
</version>
<configuration>
<locales>
en
</locales>
</configuration>
...
...
@@ -422,7 +422,7 @@
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-war-plugin
</artifactId>
<version>
3.2.
0
</version>
<version>
3.2.
1
</version>
</plugin>
<plugin>
<groupId>
com.github.kongchen
</groupId>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment