Skip to content
Snippets Groups Projects
Commit fbbb278a authored by Sören Henning's avatar Sören Henning
Browse files

Merge remote-tracking branch 'origin/master' into Trace-Aggr-Analysis

parents 64aa314f 59668486
No related branches found
No related tags found
1 merge request!17Get impletemented stages and Java 8
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 17 deletions
pom.xml
+ 17
− 17
View file @ fbbb278a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<groupId>net.sourceforge.teetime-stages</groupId> <groupId>net.sourceforge.teetime-stages</groupId>
<artifactId>teetime-stages</artifactId> <artifactId>teetime-stages</artifactId>
<version>2.1-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TeeTime-Stages</name> <name>TeeTime-Stages</name>
...@@ -71,17 +71,17 @@ ...@@ -71,17 +71,17 @@
<dependency> <dependency>
<groupId>net.sourceforge.teetime</groupId> <groupId>net.sourceforge.teetime</groupId>
<artifactId>teetime</artifactId> <artifactId>teetime</artifactId>
<version>2.1-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.kieker-monitoring</groupId> <groupId>net.kieker-monitoring</groupId>
<artifactId>kieker</artifactId> <artifactId>kieker</artifactId>
<version>1.11</version> <version>1.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -93,18 +93,18 @@ ...@@ -93,18 +93,18 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.7</version> <version>1.7.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.1.2</version> <version>1.1.5</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>18.0</version> <version>19.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tinkerpop.blueprints</groupId> <groupId>com.tinkerpop.blueprints</groupId>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.5.1</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId> <artifactId>versions-maven-plugin</artifactId>
<version>2.1</version> <version>2.2</version>
</plugin> </plugin>
<!-- goals to build a jar with binaries: jar:jar, jar:test-jar --> <!-- goals to build a jar with binaries: jar:jar, jar:test-jar -->
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version> <version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version> <version>2.10.3</version>
<configuration> <configuration>
<failOnError>false</failOnError> <failOnError>false</failOnError>
</configuration> </configuration>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId> <artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version> <version>1.6.6</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<serverId>teetime-deployment</serverId> <serverId>teetime-deployment</serverId>
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.0.3</version>
<configuration> <configuration>
<effort>Max</effort> <effort>Max</effort>
<threshold>Low</threshold> <threshold>Low</threshold>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.2</version> <version>3.6</version>
<configuration> <configuration>
<rulesets> <rulesets>
<ruleset>${project.basedir}/conf/quality-config/pmd-ruleset.xml</ruleset> <ruleset>${project.basedir}/conf/quality-config/pmd-ruleset.xml</ruleset>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>2.7</version> <version>2.11</version>
<configuration> <configuration>
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header> <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
<properties> <properties>
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version> <version>1.10</version>
<executions> <executions>
<execution> <execution>
<id>add-test-source</id> <id>add-test-source</id>
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version> <version>1.6</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
......
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