From d54f6ee43d441eb5afb132df71e96427b610533e Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Sun, 19 Aug 2018 11:30:14 +0200 Subject: [PATCH 1/7] Maven config changes --- pom.xml | 555 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 348 insertions(+), 207 deletions(-) diff --git a/pom.xml b/pom.xml index 5aee4b52..209e0fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,226 +1,367 @@ - 4.0.0 - - DiscoDNC - The Disco Deterministic Network Calculator - Deterministic Network Calculus (DNC) is a methodology for worst-case modeling and analysis of + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + DiscoDNC - The Disco Deterministic Network Calculator + Deterministic Network Calculus (DNC) is a methodology for worst-case modeling and analysis of communication networks. It enables to derive deterministic bounds on a server’s backlog as well as a flow’s end-to-end delay. Given a directed graph of servers (server graph) and the flows crossing these servers, the Disco Deterministic Network Calculator (DiscoDNC) automates the derivation of bounds. - discodnc.cs.uni-kl.de - - discodnc.cs.uni-kl.de - DiscoDNC - 2.5.0-SNAPSHOT - - - - GNU General Lesser Public License (LGPL) version 2.1 - https://www.gnu.org/licenses/lgpl-2.1.txt - - + discodnc.cs.uni-kl.de - - - Steffen Bondorf - bondorf@cs.uni-kl.de - Distributed Computer Systems (DISCO) Lab at TU Kaiserslautern - https://disco.cs.uni-kl.de - - - Zoltan Matyas - matyesz79@gmail.com - - - - + discodnc.cs.uni-kl.de + DiscoDNC + 2.5.0-SNAPSHOT - - scm:git:git://github.com/NetCal/DiscoDNC.git - scm:git:ssh://github.com/NetCal/DiscoDNC.git - https://github.com/NetCal/DiscoDNC/tree/v2.5 - - + + + GNU General Lesser Public License (LGPL) version 2.1 + https://www.gnu.org/licenses/lgpl-2.1.txt + + - - true - 1.8 - 1.8 - UTF-8 - + + + Steffen Bondorf + bondorf@cs.uni-kl.de + Distributed Computer Systems (DISCO) Lab at TU Kaiserslautern + https://disco.cs.uni-kl.de + + + Zoltan Matyas + matyesz79@gmail.com + + + + - - - org.apache.commons - commons-math3 - [3.0,3.6.1] - - - org.junit.jupiter - junit-jupiter-params - [5.2.0] - - + + scm:git:git://github.com/NetCal/DiscoDNC.git + scm:git:ssh://github.com/NetCal/DiscoDNC.git + https://github.com/NetCal/DiscoDNC/tree/v2.5 + - - - tests - - false - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - - test-jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.21.0 - - - **/*Test* - - - - - org.junit.platform - junit-platform-surefire-provider - [1.2.0] - - - org.junit.jupiter - junit-jupiter-engine - [5.2.0] - - - org.junit.jupiter - junit-jupiter-api - [5.2.0] - + + 10 + 10 + UTF-8 + UTF-8 + 1.3.0-M1 + 5.3.0-M1 + - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - 1.2.beta.100 - + + + org.apache.commons + commons-math3 + [3.0,3.6.1] + + - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - true - - - - - + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + org.junit.platform + junit-platform-surefire-provider + + + org.junit.jupiter + junit-jupiter-engine + + + org.junit.jupiter + junit-jupiter-api + + + org.junit.jupiter + junit-jupiter-params + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-test-source + generate-test-sources + + add-test-source + + + + src/functional_test/java + + + + + + + - - mpa - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - 1.2.beta.100 - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/mpa_ext - - - - - - - - + + + + tests + + DiscoDNC_tests-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/functional_test/java + src/mpa_ext/java + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + + test-jar + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.0 + + + **/*IT*.java + + + + + + integration-test + verify + + + + + + org.junit.platform + junit-platform-surefire-provider + + + org.junit.jupiter + junit-jupiter-engine + + + org.junit.jupiter + junit-jupiter-api + + + org.junit.jupiter + junit-jupiter-params + + + + + + - - exp - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/experiments - - - - - - - - + + + ext + + DiscoDNC_ext-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src/mpa_ext + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + - - - eclipse - - - org.junit.jupiter - junit-jupiter-engine - [5.2.0] - test - + + + experiments + + DiscoDNC_experiments-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src/experiments + + + + + + + + - - org.junit.platform - junit-platform-launcher - [1.2.0] - test - - - - + + + eclipse + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/experiments/java + src/functional_test/java + src/mpa_ext/java + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.platform + junit-platform-launcher + test + + + org.junit.jupiter + junit-jupiter-params + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + 1.2.beta.100 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.platform + junit-platform-launcher + ${junit.platform.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + + + From 47ec14ef13f057ff22ffbab7f4aa10744d46e4b3 Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Sun, 19 Aug 2018 12:26:01 +0200 Subject: [PATCH 2/7] Removing test from DiscoDNC build --- pom.xml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 9168bdea..54035c94 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ de.uni_kl.cs.discodnc NumBackend - [1.0] + 1.0 system ${project.basedir}/lib/NumBackend-1.0.jar @@ -81,44 +81,30 @@ rtc system ${project.basedir}/lib/rtc.jar + 1.2.beta.100 org.junit.platform junit-platform-surefire-provider + ${junit.platform.version} org.junit.jupiter junit-jupiter-engine + ${junit.jupiter.version} org.junit.jupiter junit-jupiter-api + ${junit.jupiter.version} org.junit.jupiter junit-jupiter-params + ${junit.jupiter.version} - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-test-source - generate-test-sources - - add-test-source - - - - src/functional_test/java - - - - - @@ -185,18 +171,22 @@ org.junit.platform junit-platform-surefire-provider + ${junit.platform.version} org.junit.jupiter junit-jupiter-engine + ${junit.jupiter.version} org.junit.jupiter junit-jupiter-api + ${junit.jupiter.version} org.junit.jupiter junit-jupiter-params + ${junit.jupiter.version} From 9c5a8005c55add82af2c0f0d4d891955e7f7baae Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Sun, 19 Aug 2018 13:54:29 +0200 Subject: [PATCH 3/7] POM changes --- pom.xml | 640 +++++++++++++++++++++++++++----------------------------- 1 file changed, 306 insertions(+), 334 deletions(-) diff --git a/pom.xml b/pom.xml index 54035c94..d5e24bcd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,59 +1,59 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - DiscoDNC - The Disco Deterministic Network Calculator - Deterministic Network Calculus (DNC) is a methodology for worst-case modeling and analysis of + DiscoDNC - The Disco Deterministic Network Calculator + Deterministic Network Calculus (DNC) is a methodology for worst-case modeling and analysis of communication networks. It enables to derive deterministic bounds on a server’s backlog as well as a flow’s end-to-end delay. Given a directed graph of servers (server graph) and the flows crossing these servers, the Disco Deterministic Network Calculator (DiscoDNC) automates the derivation of bounds. - discodnc.cs.uni-kl.de + discodnc.cs.uni-kl.de - discodnc.cs.uni-kl.de - DiscoDNC - 2.5.0-SNAPSHOT + discodnc.cs.uni-kl.de + DiscoDNC + 2.5.0-SNAPSHOT - - - GNU General Lesser Public License (LGPL) version 2.1 - https://www.gnu.org/licenses/lgpl-2.1.txt - - + + + GNU General Lesser Public License (LGPL) version 2.1 + https://www.gnu.org/licenses/lgpl-2.1.txt + + - - - Steffen Bondorf - bondorf@cs.uni-kl.de - Distributed Computer Systems (DISCO) Lab at TU Kaiserslautern - https://disco.cs.uni-kl.de - - - Zoltan Matyas - matyesz79@gmail.com - - - - + + + Steffen Bondorf + bondorf@cs.uni-kl.de + Distributed Computer Systems (DISCO) Lab at TU Kaiserslautern + https://disco.cs.uni-kl.de + + + Zoltan Matyas + matyesz79@gmail.com + + + + - - scm:git:git://github.com/NetCal/DiscoDNC.git - scm:git:ssh://github.com/NetCal/DiscoDNC.git - https://github.com/NetCal/DiscoDNC/tree/v2.5 - + + scm:git:git://github.com/NetCal/DiscoDNC.git + scm:git:ssh://github.com/NetCal/DiscoDNC.git + https://github.com/NetCal/DiscoDNC/tree/v2.5 + - - 10 - 10 - UTF-8 - UTF-8 - 1.3.0-M1 - 5.3.0-M1 - + + 10 + 10 + UTF-8 + UTF-8 + 1.3.0-M1 + 5.3.0-M1 + - + org.apache.commons commons-math3 @@ -63,302 +63,274 @@ de.uni_kl.cs.discodnc NumBackend 1.0 - system - ${project.basedir}/lib/NumBackend-1.0.jar + system + ${project.basedir}/lib/NumBackend-1.0.jar - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.21.0 - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - 1.2.beta.100 - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - - - - - + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + 1.2.beta.100 + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + + + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} + + + + + - - - - tests - - DiscoDNC_tests-${project.version} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/functional_test/java - src/mpa_ext/java - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - - test-jar - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.0 - - - **/*IT*.java - - - - - - integration-test - verify - - - - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - - - - - - + + + + tests + + DiscoDNC_tests-${project.version} - - - ext - - DiscoDNC_ext-${project.version} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/mpa_ext - - - - - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - - - + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/functional_test/java + src/mpa_ext/java + + + + + add-test-source + generate-sources + + add-test-source + + + + src/functional_test/java + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + org.junit.jupiter + junit-jupiter-params + + + - - - experiments - - DiscoDNC_experiments-${project.version} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/experiments - - - - - - - - + + + ext + + DiscoDNC_ext-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src/mpa_ext + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + - - - eclipse - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/experiments/java - src/functional_test/java - src/mpa_ext/java - - - - - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.platform - junit-platform-launcher - test - - - org.junit.jupiter - junit-jupiter-params - - - - + + + experiments + + DiscoDNC_experiments-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src/experiments + + + + + + + + - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - 1.2.beta.100 - - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.platform - junit-platform-launcher - ${junit.platform.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - - - - + + + eclipse + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/experiments/java + src/functional_test/java + src/mpa_ext/java + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.platform + junit-platform-launcher + test + + + org.junit.jupiter + junit-jupiter-params + + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + 1.2.beta.100 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.platform + junit-platform-launcher + ${junit.platform.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + + + + \ No newline at end of file From cac61310f4c7f69272586a38e4eed2e54a257d40 Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Mon, 20 Aug 2018 10:05:32 +0200 Subject: [PATCH 4/7] Adding exclude rules, correcting groupid. --- pom.xml | 639 ++++++++++++++++++++------------------- version-number-rules.xml | 19 ++ 2 files changed, 343 insertions(+), 315 deletions(-) create mode 100644 version-number-rules.xml diff --git a/pom.xml b/pom.xml index d5e24bcd..03332e63 100644 --- a/pom.xml +++ b/pom.xml @@ -1,336 +1,345 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - DiscoDNC - The Disco Deterministic Network Calculator - Deterministic Network Calculus (DNC) is a methodology for worst-case modeling and analysis of + DiscoDNC - The Disco Deterministic Network Calculator + Deterministic Network Calculus (DNC) is a methodology for worst-case modeling and analysis of communication networks. It enables to derive deterministic bounds on a server’s backlog as well as a flow’s end-to-end delay. Given a directed graph of servers (server graph) and the flows crossing these servers, the Disco Deterministic Network Calculator (DiscoDNC) automates the derivation of bounds. - discodnc.cs.uni-kl.de + discodnc.cs.uni-kl.de - discodnc.cs.uni-kl.de - DiscoDNC - 2.5.0-SNAPSHOT + de.uni_kl.cs.discodnc + DiscoDNC + 2.5.0-SNAPSHOT - - - GNU General Lesser Public License (LGPL) version 2.1 - https://www.gnu.org/licenses/lgpl-2.1.txt - - + + + GNU General Lesser Public License (LGPL) version 2.1 + https://www.gnu.org/licenses/lgpl-2.1.txt + + - - - Steffen Bondorf - bondorf@cs.uni-kl.de - Distributed Computer Systems (DISCO) Lab at TU Kaiserslautern - https://disco.cs.uni-kl.de - - - Zoltan Matyas - matyesz79@gmail.com - - - - + + + Steffen Bondorf + bondorf@cs.uni-kl.de + Distributed Computer Systems (DISCO) Lab at TU Kaiserslautern + https://disco.cs.uni-kl.de + + + Zoltan Matyas + matyesz79@gmail.com + + + + - - scm:git:git://github.com/NetCal/DiscoDNC.git - scm:git:ssh://github.com/NetCal/DiscoDNC.git - https://github.com/NetCal/DiscoDNC/tree/v2.5 - + + scm:git:git://github.com/NetCal/DiscoDNC.git + scm:git:ssh://github.com/NetCal/DiscoDNC.git + https://github.com/NetCal/DiscoDNC/tree/v2.5 + - - 10 - 10 - UTF-8 - UTF-8 - 1.3.0-M1 - 5.3.0-M1 - + + 10 + 10 + UTF-8 + UTF-8 + 1.3.0-M1 + 5.3.0-M1 + - - - org.apache.commons - commons-math3 - [3.0,3.6.1] - - - de.uni_kl.cs.discodnc - NumBackend - 1.0 - system - ${project.basedir}/lib/NumBackend-1.0.jar - - + + + org.apache.commons + commons-math3 + [3.0,3.6.1] + + + de.uni_kl.cs.discodnc + NumBackend + 1.0 + system + ${project.basedir}/lib/NumBackend-1.0.jar + + - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.21.0 - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - 1.2.beta.100 - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - - - - - + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + 1.2.beta.100 + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + + + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.4 + + file://${basedir}/version-number-rules.xml + + + + - - - - tests - - DiscoDNC_tests-${project.version} + + + + tests + + DiscoDNC_tests-${project.version} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/functional_test/java - src/mpa_ext/java - - - - - add-test-source - generate-sources - - add-test-source - - - - src/functional_test/java - - - - - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - - - org.junit.jupiter - junit-jupiter-params - - - + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/functional_test/java + src/mpa_ext/java + + + + + add-test-source + generate-sources + + add-test-source + + + + src/functional_test/java + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + org.junit.jupiter + junit-jupiter-params + + + - - - ext - - DiscoDNC_ext-${project.version} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/mpa_ext - - - - - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - - - + + + ext + + DiscoDNC_ext-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src/mpa_ext + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + - - - experiments - - DiscoDNC_experiments-${project.version} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/experiments - - - - - - - - + + + experiments + + DiscoDNC_experiments-${project.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src/experiments + + + + + + + + - - - eclipse - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/experiments/java - src/functional_test/java - src/mpa_ext/java - - - - - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.platform - junit-platform-launcher - test - - - org.junit.jupiter - junit-jupiter-params - - - - + + + eclipse + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/experiments/java + src/functional_test/java + src/mpa_ext/java + + + + + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.platform + junit-platform-launcher + test + + + org.junit.jupiter + junit-jupiter-params + + + + - - - - - - ch.ethz.rtc.kernel - rtc - system - ${project.basedir}/lib/rtc.jar - 1.2.beta.100 - - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.platform - junit-platform-launcher - ${junit.platform.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - - - + + + + + + ch.ethz.rtc.kernel + rtc + system + ${project.basedir}/lib/rtc.jar + 1.2.beta.100 + + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.platform + junit-platform-launcher + ${junit.platform.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + + + \ No newline at end of file diff --git a/version-number-rules.xml b/version-number-rules.xml new file mode 100644 index 00000000..25da5e98 --- /dev/null +++ b/version-number-rules.xml @@ -0,0 +1,19 @@ + + + + + + + .*[-_\.](alpha|Alpha|ALPHA|beta|Beta|BETA|rc|RC|M|EA)[-_\.]?[0-9]?.* + + + + + .*[-_\.](alpha|Alpha|ALPHA|beta|Beta|BETA|rc|RC|M|EA)[-_\.]?[0-9]?.* + + + + \ No newline at end of file From cc505400f2233f3340c47a50ba04f456d5afaeac Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Mon, 20 Aug 2018 18:20:40 +0200 Subject: [PATCH 5/7] Updates to pom --- pom.xml | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 03332e63..f9352643 100644 --- a/pom.xml +++ b/pom.xml @@ -51,18 +51,24 @@ UTF-8 1.3.0-M1 5.3.0-M1 + 3.0 + 3.6.1 + 1.0 + 2.22.0 + 2.5 + 3.0.0 org.apache.commons commons-math3 - [3.0,3.6.1] + [${apache.commons.version.from},${apache.commons.version.to}] de.uni_kl.cs.discodnc NumBackend - 1.0 + ${numbackend.version} system ${project.basedir}/lib/NumBackend-1.0.jar @@ -74,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + ${maven.plugin.surefire.version} ch.ethz.rtc.kernel @@ -109,7 +115,7 @@ org.codehaus.mojo versions-maven-plugin - 2.4 + ${maven.plugin.versions.version} file://${basedir}/version-number-rules.xml @@ -130,7 +136,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.9.1 + ${maven.build-helper.plugin.version} add-source @@ -186,7 +192,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.7 + ${maven.build-helper.plugin.version} add-source @@ -225,7 +231,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.7 + ${maven.build-helper.plugin.version} add-source @@ -256,7 +262,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.9.1 + ${maven.build-helper.plugin.version} add-source @@ -330,16 +336,6 @@ junit-jupiter-params ${junit.jupiter.version} - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - \ No newline at end of file From 57d7c59f62a2365ca8f7d3045df782d01cbbdf4c Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Fri, 24 Aug 2018 11:57:46 +0200 Subject: [PATCH 6/7] Needed changes --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f9352643..eead4006 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,8 @@ 10 UTF-8 UTF-8 - 1.3.0-M1 - 5.3.0-M1 + 1.2.0 + 5.2.0 3.0 3.6.1 1.0 @@ -185,7 +185,7 @@ - ext + mpa DiscoDNC_ext-${project.version} @@ -224,7 +224,7 @@ - experiments + ext DiscoDNC_experiments-${project.version} From 4400fd2cc7fa3a154c06b923323fafbd6f00e1ac Mon Sep 17 00:00:00 2001 From: Zoltan Matyas Date: Thu, 6 Sep 2018 06:58:12 +0200 Subject: [PATCH 7/7] Updating readme file --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 05c85b25..032029c9 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ In order to checkout all submodules, use the command `git submodule update --ini This small guide assumes you cloned the DiscoDNC repository, executed the above commands to pull the submodules, and created an Eclipse project from the code. You might also be able to do all this from Eclipse using its EGit plugin. -These steps were tested with Eclipse Juno only. +These steps were tested with Eclipse Photon only. ## Add Profiles Go to the project properties > Maven and add "eclipse,tests,exp,mpa" (no quotes) to your active profiles. @@ -53,10 +53,7 @@ On click, there are suggestions. Two offerings are to ignore this error. Choose the second on (globally ignore error cause) to prevent changes to the pom.xml file. ## Add Source Folders -Go to your Project's Properties > Java Build Path > Source and add -* `src/experiments/java` -* `src/mpa_ext/java` -* `src/functional_test/java` +Select "eclipse" maven profile in eclipse to import source folders automatically. ## Tests * In the above dialog to add source folders, change "Contains test sources:" of src/functional_test/java to Yes.