Skip to content

Commit 75a67e8

Browse files
rmllrrmllr
authored
Merge pull request #7 from softvis-research/development
merge development into master
2 parents 25e86b5 + ccd2e3d commit 75a67e8

37 files changed

Lines changed: 845 additions & 384 deletions

‎pom.xml‎

Lines changed: 70 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,47 @@
66
<parent>
77
<groupId>org.jqassistant.contrib.common</groupId>
88
<artifactId>parent</artifactId>
9-
<version>1.7.0</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

1212
<groupId>org.jqassistant.contrib.plugin.kieker</groupId>
1313
<artifactId>jqa-kieker-plugin</artifactId>
14-
<version>0.0.1</version>
14+
<version>1.0.0</version>
1515

1616
<name>jQAssistant Kieker Plugin</name>
17-
<description>The jQAssistant plugin to scan and to analyze Kieker trace logs.</description>
17+
<description>A jQAssistant plugin to scan and to analyze Kieker trace event logs.
18+
</description>
1819
<url>http://jqassistant.org/</url>
1920

2021
<developers>
22+
<developer>
23+
<id>richard-mueller</id>
24+
<name>Richard Müller</name>
25+
<email>[email protected]</email>
26+
</developer>
2127
<developer>
2228
<id>matteo-fischer</id>
2329
<name>Matteo Fischer</name>
2430
</developer>
2531
<developer>
26-
<id>richard-mueller</id>
27-
<name>Richard Mueller</name>
28-
<email>[email protected]</email>
32+
<id>tom-strempel</id>
33+
<name>Tom Strempel</name>
2934
</developer>
3035
</developers>
3136

32-
<scm>
33-
<connection>scm:git:[email protected]:softvis-research/jqa-kieker-plugin.git</connection>
34-
<developerConnection>scm:git:[email protected]:/softvis-research/jqa-kieker-plugin.git</developerConnection>
35-
<url>https://github.com//softvis-research/jqa-kieker-plugin</url>
36-
<tag>HEAD</tag>
37-
</scm>
38-
3937
<licenses>
4038
<license>
4139
<name>GNU General Public License, v3</name>
4240
<url>http://www.gnu.org/licenses/gpl-3.0.html</url>
4341
</license>
4442
</licenses>
4543

46-
<properties>
47-
<org.hamcrest.version>2.0.0.0</org.hamcrest.version>
48-
</properties>
44+
<scm>
45+
<connection>scm:git:[email protected]:softvis-research/jqa-kieker-plugin.git</connection>
46+
<developerConnection>scm:git:[email protected]:softvis-research/jqa-kieker-plugin.git</developerConnection>
47+
<url>https://github.com/softvis-research/jqa-kieker-plugin.git</url>
48+
<tag>HEAD</tag>
49+
</scm>
4950

5051
<build>
5152
<plugins>
@@ -59,20 +60,36 @@
5960
</plugin>
6061
<plugin>
6162
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-dependency-plugin</artifactId>
63-
<version>3.1.1</version>
63+
<artifactId>maven-shade-plugin</artifactId>
64+
<version>3.2.2</version>
65+
<configuration>
66+
<minimizeJar>false</minimizeJar>
67+
<filters>
68+
<!-- include only necessary classes and resources from kieker to avoid SLF4J error -->
69+
<filter>
70+
<artifact>net.kieker-monitoring:kieker</artifact>
71+
<includes>
72+
<include>kieker/analysisteetime/*/**</include>
73+
<include>kieker/analysis/plugin/*/**</include>
74+
<include>kieker/common/*/**</include>
75+
</includes>
76+
</filter>
77+
</filters>
78+
<!-- exclude artifacts to avoid collisions with existing plugins in command line distribution -->
79+
<artifactSet>
80+
<excludes>
81+
<exclude>com.buschmais.jqassistant.core:*</exclude>
82+
<exclude>com.buschmais.xo:*</exclude>
83+
<exclude>javax.xml.bind:*</exclude>
84+
</excludes>
85+
</artifactSet>
86+
</configuration>
6487
<executions>
6588
<execution>
66-
<id>copy-dependencies</id>
6789
<phase>package</phase>
6890
<goals>
69-
<goal>copy-dependencies</goal>
91+
<goal>shade</goal>
7092
</goals>
71-
<configuration>
72-
<outputDirectory>${project.build.directory}/plugin-dependencies</outputDirectory>
73-
<includeScope>runtime</includeScope>
74-
<prependGroupId>true</prependGroupId>
75-
</configuration>
7693
</execution>
7794
</executions>
7895
</plugin>
@@ -81,48 +98,41 @@
8198

8299
<dependencyManagement>
83100
<dependencies>
84-
<!-- jQAssistant -->
85-
<!-- unit tests -->
86101
<dependency>
87102
<groupId>junit</groupId>
88103
<artifactId>junit</artifactId>
89104
<version>4.12</version>
90105
<scope>test</scope>
91106
</dependency>
92-
<dependency>
93-
<groupId>org.mockito</groupId>
94-
<artifactId>mockito-core</artifactId>
95-
<version>1.10.19</version>
96-
<scope>test</scope>
97-
</dependency>
98107
</dependencies>
99108
</dependencyManagement>
100109

101110
<dependencies>
102111
<dependency>
103112
<groupId>com.buschmais.jqassistant.plugin</groupId>
104113
<artifactId>common</artifactId>
105-
<scope>provided</scope>
106114
</dependency>
107115
<dependency>
108116
<groupId>com.buschmais.jqassistant.core</groupId>
109117
<artifactId>shared</artifactId>
110-
<scope>provided</scope>
118+
<exclusions>
119+
<exclusion>
120+
<groupId>org.slf4j</groupId>
121+
<artifactId>slf4j-api</artifactId>
122+
</exclusion>
123+
</exclusions>
111124
</dependency>
112125
<dependency>
113126
<groupId>com.buschmais.jqassistant.core</groupId>
114127
<artifactId>scanner</artifactId>
115-
<scope>provided</scope>
116128
</dependency>
117129
<dependency>
118130
<groupId>com.buschmais.jqassistant.core</groupId>
119131
<artifactId>report</artifactId>
120-
<scope>provided</scope>
121132
</dependency>
122133
<dependency>
123134
<groupId>com.buschmais.jqassistant.core</groupId>
124135
<artifactId>plugin</artifactId>
125-
<scope>provided</scope>
126136
</dependency>
127137
<dependency>
128138
<groupId>com.buschmais.jqassistant.plugin</groupId>
@@ -134,13 +144,11 @@
134144
<groupId>com.buschmais.jqassistant.core</groupId>
135145
<artifactId>store</artifactId>
136146
<type>test-jar</type>
137-
<scope>provided</scope>
138147
</dependency>
139148
<dependency>
140149
<groupId>com.buschmais.jqassistant.core</groupId>
141150
<artifactId>analysis</artifactId>
142151
<type>test-jar</type>
143-
<scope>provided</scope>
144152
</dependency>
145153
<dependency>
146154
<groupId>com.buschmais.xo</groupId>
@@ -152,32 +160,41 @@
152160
<artifactId>neo4jv3</artifactId>
153161
<scope>test</scope>
154162
</dependency>
163+
<dependency>
164+
<groupId>org.junit.jupiter</groupId>
165+
<artifactId>junit-jupiter-engine</artifactId>
166+
</dependency>
155167
<dependency>
156168
<groupId>org.hamcrest</groupId>
157169
<artifactId>java-hamcrest</artifactId>
158-
<version>${org.hamcrest.version}</version>
159170
</dependency>
160171
<dependency>
161-
<groupId>junit</groupId>
162-
<artifactId>junit</artifactId>
163-
<scope>test</scope>
172+
<groupId>org.assertj</groupId>
173+
<artifactId>assertj-core</artifactId>
174+
</dependency>
175+
<dependency>
176+
<groupId>org.mockito</groupId>
177+
<artifactId>mockito-junit-jupiter</artifactId>
164178
</dependency>
165179
<dependency>
166180
<groupId>org.slf4j</groupId>
167181
<artifactId>slf4j-simple</artifactId>
168-
<scope>provided</scope>
169182
</dependency>
170183
<dependency>
171184
<groupId>net.kieker-monitoring</groupId>
172185
<artifactId>kieker</artifactId>
173-
<version>1.14-SNAPSHOT</version>
186+
<version>1.14</version>
187+
</dependency>
188+
<dependency>
189+
<groupId>org.tukaani</groupId>
190+
<artifactId>xz</artifactId>
191+
<version>1.6</version>
192+
</dependency>
193+
<dependency>
194+
<groupId>org.projectlombok</groupId>
195+
<artifactId>lombok</artifactId>
196+
<version>1.18.12</version>
197+
<scope>provided</scope>
174198
</dependency>
175199
</dependencies>
176-
177-
<repositories>
178-
<repository>
179-
<id>sonatype.oss.snapshots</id>
180-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
181-
</repository>
182-
</repositories>
183200
</project>

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallEventDescriptor.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallsDescriptor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import com.buschmais.xo.neo4j.api.annotation.Relation;
55

66
@Relation("CALLS")
7-
public interface CallsDescriptor extends Descriptor {
7+
public interface CallsDescriptor extends Descriptor, WeightDescriptor {
88

99
@Relation.Outgoing
1010
MethodDescriptor getCallee();
1111

1212
@Relation.Incoming
1313
MethodDescriptor getCaller();
14+
1415
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CpuUtilizationMeasurementDescriptor.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package org.jqassistant.contrib.plugin.kieker.api.model;
2+
3+
import com.buschmais.jqassistant.plugin.common.api.model.NamedDescriptor;
4+
import com.buschmais.xo.neo4j.api.annotation.Label;
5+
6+
@Label("CpuUtilization")
7+
public interface CpuUtilizationMeasurementDescriptor extends NamedDescriptor, MeasurementDescriptor {
8+
9+
void setCpuID(String cpuID);
10+
11+
String getCpuID();
12+
13+
void setIdle(double idle);
14+
15+
double getIdle();
16+
17+
void setIrq(double irq);
18+
19+
double getIrq();
20+
21+
void setNice(double nice);
22+
23+
double getNice();
24+
25+
void setSystem(double system);
26+
27+
double getSystem();
28+
29+
void setTotalUtilization(double totalUtilization);
30+
31+
double getTotalUtilization();
32+
33+
void setWait(double wait);
34+
35+
double getWait();
36+
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/DiskUsageMeasurementDescriptor.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.jqassistant.contrib.plugin.kieker.api.model;
2+
3+
import com.buschmais.jqassistant.plugin.common.api.model.NamedDescriptor;
4+
import com.buschmais.xo.neo4j.api.annotation.Label;
5+
6+
@Label("DiskUsage")
7+
public interface DiskUsageMeasurementDescriptor extends NamedDescriptor, MeasurementDescriptor {
8+
9+
// String/Path -> handle unescaped backslashes
10+
void setDeviceName(String deviceName);
11+
12+
String getDeviceName();
13+
14+
void setQueue(double queue);
15+
16+
double getQueue();
17+
18+
void setReadBytesPerSecond(double readBytesPerSecond);
19+
20+
double getReadBytesPerSecond();
21+
22+
void setReadsPerSecond(double readsPerSecond);
23+
24+
double getReadsPerSecond();
25+
26+
void setServiceTime(double serviceTime);
27+
28+
double getServiceTime();
29+
30+
void setWriteBytesPerSecond(double writeBytesPerSecond);
31+
32+
double getWriteBytesPerSecond();
33+
34+
void setWritesPerSecond(double writesPerSecond);
35+
36+
double getWritesPerSecond();
37+
}

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/EventDescriptor.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/ExecutionEventDescriptor.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)