Skip to content

Commit 5a80ebd

Browse files
stalleyjstalleyj
authored
Merge pull request #21 from tobespc/master
implement all the pom.xml files for maven building
2 parents 0a2aa0a + b7fe156 commit 5a80ebd

File tree

89 files changed

+2659
-484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2659
-484
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
/web/.project
2+
/distribution/target
3+
dashboard/target
4+
javaagent/target
5+

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "web/WebContent/graphmetrics"]
2-
path = web/WebContent/graphmetrics
1+
[submodule "dashboard/src/main/webapp/graphmetrics"]
2+
path = dashboard/src/main/webapp/graphmetrics
33
url = https://github.com/RuntimeTools/graphmetrics

‎java/.project‎ renamed to ‎.project‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>javametrics.java</name>
3+
<name>javametrics</name>
44
<comment></comment>
55
<projects>
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.jdt.core.javabuilder</name>
14+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
</buildSpec>
1919
<natures>
20-
<nature>org.eclipse.jdt.core.javanature</nature>
2120
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
21+
<nature>org.eclipse.jdt.core.javanature</nature>
2222
</natures>
2323
</projectDescription>

‎dashboard/pom.xml‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.ibm.runtimetools</groupId>
5+
<version>1.0.0</version>
6+
<artifactId>javametrics-dash</artifactId>
7+
<packaging>war</packaging>
8+
<name>dashboard</name>
9+
<description>Application Metrics for Java (web UI)</description>
10+
<url>https://github.com/RuntimeTools/javametrics</url>
11+
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
15+
</properties>
16+
17+
<licenses>
18+
<license>
19+
<name>The Apache Software License, Version 2.0</name>
20+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
21+
</license>
22+
</licenses>
23+
24+
<scm>
25+
<connection>scm:git:git://github.com/runtimetools/javametrics.git</connection>
26+
<developerConnection>scm:git:ssh://github.com/runtimetools/javametrics.git</developerConnection>
27+
<url>http://github.com/runtimetools/javametrics.git/tree/master</url>
28+
</scm>
29+
30+
<developers>
31+
<developer>
32+
<name>Toby Corbin</name>
33+
<email>[email protected]</email>
34+
<organization>IBM</organization>
35+
<organizationUrl>http://www.ibm.com</organizationUrl>
36+
</developer>
37+
</developers>
38+
39+
<distributionManagement>
40+
<snapshotRepository>
41+
<id>ossrh</id>
42+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
43+
</snapshotRepository>
44+
<repository>
45+
<id>ossrh</id>
46+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
47+
</repository>
48+
</distributionManagement>
49+
<dependencies>
50+
<dependency>
51+
<groupId>javax.json</groupId>
52+
<artifactId>javax.json-api</artifactId>
53+
<version>1.1</version>
54+
<scope>compile</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.ibm.runtimetools</groupId>
58+
<artifactId>javametrics-agent</artifactId>
59+
<version>1.0.0</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>javax.websocket</groupId>
63+
<artifactId>javax.websocket-api</artifactId>
64+
<version>1.1</version>
65+
<scope>compile</scope>
66+
</dependency>
67+
</dependencies>
68+
<build>
69+
<plugins>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-source-plugin</artifactId>
73+
<version>2.2.1</version>
74+
<executions>
75+
<execution>
76+
<id>attach-sources</id>
77+
<goals>
78+
<goal>jar-no-fork</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-javadoc-plugin</artifactId>
86+
<version>2.9.1</version>
87+
<executions>
88+
<execution>
89+
<id>attach-javadocs</id>
90+
<goals>
91+
<goal>jar</goal>
92+
</goals>
93+
</execution>
94+
</executions>
95+
</plugin>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-gpg-plugin</artifactId>
99+
<version>1.5</version>
100+
<executions>
101+
<execution>
102+
<id>sign-artifacts</id>
103+
<phase>verify</phase>
104+
<goals>
105+
<goal>sign</goal>
106+
</goals>
107+
</execution>
108+
</executions>
109+
</plugin>
110+
<plugin>
111+
<groupId>org.sonatype.plugins</groupId>
112+
<artifactId>nexus-staging-maven-plugin</artifactId>
113+
<version>1.6.7</version>
114+
<extensions>true</extensions>
115+
<configuration>
116+
<serverId>ossrh</serverId>
117+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
118+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
119+
</configuration>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-war-plugin</artifactId>
124+
<version>3.1.0</version>
125+
<configuration>
126+
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
127+
<packagingExcludes>WEB-INF/lib*</packagingExcludes>
128+
</configuration>
129+
</plugin>
130+
<plugin>
131+
<artifactId>maven-compiler-plugin</artifactId>
132+
<version>3.6.1</version>
133+
<configuration>
134+
<source>1.8</source>
135+
<target>1.8</target>
136+
</configuration>
137+
</plugin>
138+
</plugins>
139+
</build>
140+
</project>

‎web/src/com/ibm/javametrics/web/DataHandler.java‎ renamed to ‎dashboard/src/main/java/com/ibm/javametrics/web/DataHandler.java‎

File renamed without changes.

‎web/src/com/ibm/javametrics/web/Emitter.java‎ renamed to ‎dashboard/src/main/java/com/ibm/javametrics/web/Emitter.java‎

File renamed without changes.

‎web/src/com/ibm/javametrics/web/HttpDataAggregator.java‎ renamed to ‎dashboard/src/main/java/com/ibm/javametrics/web/HttpDataAggregator.java‎

File renamed without changes.

‎web/src/com/ibm/javametrics/web/JavametricsWebSocket.java‎ renamed to ‎dashboard/src/main/java/com/ibm/javametrics/web/JavametricsWebSocket.java‎

File renamed without changes.

‎web/.classpath‎ renamed to ‎dashboard/src/main/webapp/.classpath‎

File renamed without changes.

‎web/.gitignore‎ renamed to ‎dashboard/src/main/webapp/.gitignore‎

File renamed without changes.

0 commit comments

Comments
 (0)