Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#32 maven cleanup #37

Closed
wants to merge 9 commits into from
Closed

#32 maven cleanup #37

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d54f6ee
Maven config changes
matyesz Aug 19, 2018
deb45ce
Merge conflict
matyesz Aug 19, 2018
47ec14e
Removing test from DiscoDNC build
matyesz Aug 19, 2018
9c5a800
POM changes
matyesz Aug 19, 2018
cac6131
Adding exclude rules, correcting groupid.
matyesz Aug 20, 2018
cc50540
Updates to pom
matyesz Aug 20, 2018
57d7c59
Needed changes
matyesz Aug 24, 2018
bb029d0
Merge remote-tracking branch 'origin/v2.5' into #32_Maven_cleanup
matyesz Aug 24, 2018
4400fd2
Updating readme file
matyesz Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
269 changes: 186 additions & 83 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/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">
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">
<modelVersion>4.0.0</modelVersion>

<name>DiscoDNC - The Disco Deterministic Network Calculator</name>
<description>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
Expand Down Expand Up @@ -42,18 +42,15 @@
<connection>scm:git:git://github.com/NetCal/DiscoDNC.git</connection>
<developerConnection>scm:git:ssh://github.com/NetCal/DiscoDNC.git</developerConnection>
<url>https://github.com/NetCal/DiscoDNC/tree/v2.5</url>
<!--
<url>https://github.com/NetCal/DiscoDNCext_MPARTC/tree/v2.5</url>
<url>https://github.com/NetCal/DiscoDNC_tests/tree/v2.5</url>
<url>https://github.com/NetCal/DiscoDNC/tree/v2.5_experiments</url>
-->
</scm>

<properties>
<maven.test.skip>true</maven.test.skip>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>10</maven.compiler.source>
<maven.compiler.target>10</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<junit.platform.version>1.3.0-M1</junit.platform.version>
<junit.jupiter.version>5.3.0-M1</junit.jupiter.version>
</properties>

<dependencies>
Expand All @@ -65,97 +62,117 @@
<dependency>
<groupId>de.uni_kl.cs.discodnc</groupId>
<artifactId>NumBackend</artifactId>
<version>[1.0]</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/NumBackend-1.0.jar</systemPath>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>[5.2.0]</version>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/NumBackend-1.0.jar</systemPath>
</dependency>
</dependencies>

<build>
<plugins>
<!-- run the unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<dependencies>
<dependency>
<groupId>ch.ethz.rtc.kernel</groupId>
<artifactId>rtc</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rtc.jar</systemPath>
<version>1.2.beta.100</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<!-- To build tests jar that includes all sources classes and sources
of the tests (no experiments) (we should decide whether to use the core and
extentsion as dep. from the maven repo or add it as classes to the jar) -->
<id>tests</id>
<properties>
<maven.test.skip>false</maven.test.skip>
</properties>
<build>
<finalName>DiscoDNC_tests-${project.version}</finalName>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>test-jar</goal>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/functional_test/java</source>
<source>src/mpa_ext/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/functional_test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<configuration>
<includes>
<include>**/*Test*</include>
</includes>
</configuration>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>[1.2.0]</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.2.0]</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>[5.2.0]</version>
</dependency>

<dependency>
<groupId>ch.ethz.rtc.kernel</groupId>
<artifactId>rtc</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rtc.jar</systemPath>
<version>1.2.beta.100</version>
</dependency>

</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>mpa</id>
<dependencies>
<dependency>
<groupId>ch.ethz.rtc.kernel</groupId>
<artifactId>rtc</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rtc.jar</systemPath>
<version>1.2.beta.100</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
</dependencies>
</profile>

<profile>
<!-- Classes and sources of the extension functionality (no tests, no
experiments) (we should decide whether to use the core as dep. from the maven
repo or add it as classes to the jar) -->
<id>ext</id>
<build>
<finalName>DiscoDNC_ext-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -178,11 +195,23 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>ch.ethz.rtc.kernel</groupId>
<artifactId>rtc</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rtc.jar</systemPath>
</dependency>
</dependencies>
</profile>

<profile>
<id>exp</id>
<!-- classes and sources of the experiments functionality (no experiments)
(we should decide whether to use the core and extension as dep. from the
maven repo or add it as classes to the jar) -->
<id>experiments</id>
<build>
<finalName>DiscoDNC_experiments-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -208,26 +237,100 @@
</profile>

<profile>
<!-- Eclipse users need to activate this profile manually.
Go to your project's properties, Maven and add
eclipse (all lower case) to your Active Maven Profiles. -->
<!-- Eclipse users need to activate this profile manually. Go to your
project's properties, Maven and add eclipse (all lower case) to your Active
Maven Profiles. -->
<id>eclipse</id>
<!-- Source directories -->
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/experiments/java</source>
<source>src/functional_test/java</source>
<source>src/mpa_ext/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>ch.ethz.rtc.kernel</groupId>
<artifactId>rtc</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rtc.jar</systemPath>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.2.0]</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>[1.2.0]</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
<!-- Define common dependency versions in one place -->
<dependencyManagement>
<dependencies>
<!-- External RTC -->
<dependency>
<groupId>ch.ethz.rtc.kernel</groupId>
<artifactId>rtc</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/rtc.jar</systemPath>
<version>1.2.beta.100</version>
</dependency>
<!-- JUnit -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>