Commit 35ca3ebd authored by Tobias Meuser's avatar Tobias Meuser
Browse files

Merge branch 'master' of...

Merge branch 'master' of ssh://dev.kom.e-technik.tu-darmstadt.de/simonstrator/simonstrator-peerfactsim into tm/master-thesis-bjoern-bueschke
parents 6d39106a 705984e5
variables:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line.
# `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
......@@ -9,18 +9,18 @@ variables:
# Cache downloaded dependencies and plugins between builds.
cache:
paths:
- /root/.m2/repository/
- .m2/repository/
# This will only validate and compile stuff and run e.g. maven-enforcer-plugin.
# Because some enforcer rules might check dependency convergence and class duplications
# we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
validate:
validate: &validate
stage: build
script:
- 'mvn $MAVEN_CLI_OPTS test-compile'
image: maven:3.3.9-jdk-8
# For merge requests do not `deploy` but only run `verify`.
# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
verify:
verify: &verify
stage: test
script:
- 'mvn $MAVEN_CLI_OPTS verify'
......@@ -35,4 +35,4 @@ deploy:
- 'mvn $MAVEN_CLI_OPTS deploy'
only:
- master
image: maven:3.3.9-jdk-8
\ No newline at end of file
image: maven:3.3.9-jdk-8
......@@ -29,7 +29,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
......@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
......@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
......@@ -71,7 +71,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.10</version>
<version>3.0.0</version>
</extension>
</extensions>
</build>
......@@ -82,14 +82,19 @@
<repository>
<id>simonstrator</id>
<url>https://dev.kom.e-technik.tu-darmstadt.de/mvn/</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<updatePolicy>always</updatePolicy>
</releases>
</repository>
<!-- local kom repository -->
<repository>
<!-- <repository>
<id>maven.kom</id>
<!-- <url>file://D:/simcfgm2</url> -->
<url>http://www.kom.tu-darmstadt.de/~stingl/PeerfactSim.KOM-Libraries/maven2/</url>
</repository>
</repository> -->
<!-- jgrapht can be found there -->
<repository>
......@@ -109,14 +114,6 @@
<dependencies>
<!-- Meta: to remove unused dependencies :) -->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version>
</dependency>
<!-- XML -->
<dependency>
<groupId>dom4j</groupId>
......@@ -165,6 +162,13 @@
<artifactId>log4j</artifactId>
<version>1.2.16</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<!-- Parsing, Bytecode, ... -->
<!-- Unused <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId>
......@@ -223,7 +227,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>10.0.1</version>
<version>18.0</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment