summaryrefslogtreecommitdiffstats
path: root/infra/it
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-04-10 17:43:54 +0200
committerMichal Cmarada <mcmarada@cisco.com>2019-04-10 17:43:54 +0200
commita7a8f9822082e533096e5bdecc531cbaea0f3931 (patch)
tree0b13a21e2360c273eb3d3593bccc37d6474ffb2b /infra/it
parent9401e2bf0cd137b0cb57b2ac86cbd643d5460b60 (diff)
HONEYCOMB-448: JAVA 11 support
- updated dependencies - compilation error fixes Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'infra/it')
-rw-r--r--infra/it/it-test/pom.xml5
-rw-r--r--infra/it/memory-benchmark-scripts/pom.xml13
-rw-r--r--infra/it/memory-benchmark/pom.xml52
3 files changed, 49 insertions, 21 deletions
diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml
index f8ebf56..427eaa7 100644
--- a/infra/it/it-test/pom.xml
+++ b/infra/it/it-test/pom.xml
@@ -91,6 +91,11 @@
<artifactId>mdsal-netconf-connector</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/infra/it/memory-benchmark-scripts/pom.xml b/infra/it/memory-benchmark-scripts/pom.xml
index 8585c91..0502e49 100644
--- a/infra/it/memory-benchmark-scripts/pom.xml
+++ b/infra/it/memory-benchmark-scripts/pom.xml
@@ -7,10 +7,10 @@
<properties>
<!-- groovy -->
- <maven.groovy.version>2.0</maven.groovy.version>
- <groovy.version>2.4.7</groovy.version>
- <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
- <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+ <maven.groovy.version>1.6.2</maven.groovy.version>
+ <groovy.version>2.5.5</groovy.version>
+ <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+ <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -42,9 +42,12 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<!-- 2.8.0-01 and later require maven-compiler-plugin 3.1 or higher -->
<configuration>
<compilerId>groovy-eclipse-compiler</compilerId>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
<dependencies>
<dependency>
@@ -53,6 +56,7 @@
<version>${groovy.eclipse.compiler.version}</version>
</dependency>
<!-- for 2.8.0-01 and later you must have an explicit dependency on groovy-eclipse-batch -->
+ <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-eclipse-batch -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
@@ -68,6 +72,7 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
</project> \ No newline at end of file
diff --git a/infra/it/memory-benchmark/pom.xml b/infra/it/memory-benchmark/pom.xml
index 34f8668..2139bc2 100644
--- a/infra/it/memory-benchmark/pom.xml
+++ b/infra/it/memory-benchmark/pom.xml
@@ -33,12 +33,12 @@
<!-- Static version, we don't want it to be deployed anyway-->
<version>1.0.0</version>
<properties>
- <commons-csv.version>1.4</commons-csv.version>
+ <commons-csv.version>1.6</commons-csv.version>
<honeycomb.version>1.19.04-SNAPSHOT</honeycomb.version>
- <maven.groovy.version>2.0</maven.groovy.version>
- <groovy.version>2.4.7</groovy.version>
- <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
- <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+ <maven.groovy.version>1.6.2</maven.groovy.version>
+ <groovy.version>2.5.5</groovy.version>
+ <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+ <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
</properties>
<!-- to be runnable from command line -->
<packaging>jar</packaging>
@@ -72,6 +72,7 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
@@ -102,9 +103,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>2.22.0</version>
<configuration>
<skipTests>true</skipTests>
+ <!-- allow reflection for documentation -->
+ <argLine>--illegal-access=permit</argLine>
</configuration>
</plugin>
@@ -128,8 +131,8 @@
<!-- generate scripts for benchmarks -->
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<!-- script for on-rest memory benchmark -->
<execution>
@@ -140,9 +143,14 @@
</goals>
<!-- 0 data samples == empty config file, therefore same as honeycomb on rest -->
<configuration>
- <source>
- io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-on-rest-out", 0)
- </source>
+ <scripts>
+ <script>
+ <![CDATA[
+ import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator
+ MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-on-rest-out", 0)
+ ]]>
+ </script>
+ </scripts>
</configuration>
</execution>
<!-- script for memory benchmark with 1000 nodes in config data-->
@@ -153,9 +161,14 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 1000)
- </source>
+ <scripts>
+ <script>
+ <![CDATA[
+ import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator
+ MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 1000)
+ ]]>
+ </script>
+ </scripts>
</configuration>
</execution>
<!-- script for memory benchmark with 10000 nodes in config data-->
@@ -166,9 +179,14 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 10000)
- </source>
+ <scripts>
+ <script>
+ <![CDATA[
+ import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator
+ MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 10000)
+ ]]>
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>