Skip to content

Commit 7e61b37

Browse files
eric-martineric-martin
committed
Merge pull request #3 from blackopseng3/master
Using the latest stackify-api
2 parents 42b33ed + 86474f3 commit 7e61b37

4 files changed

Lines changed: 133 additions & 135 deletions

File tree

‎pom.xml‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -14,118 +14,118 @@
1414
<artifactId>oss-parent</artifactId>
1515
<version>7</version>
1616
</parent>
17-
17+
1818
<licenses>
19-
<license>
20-
<name>The Apache Software License, Version 2.0</name>
21-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
22-
</license>
23-
</licenses>
24-
25-
<scm>
26-
<connection>scm:git:git://github.com/stackify/stackify-api-common.git</connection>
27-
<developerConnection>scm:git:git@github.com:stackify/stackify-api-common.git</developerConnection>
28-
<url>https://github.com/stackify/stackify-api-common</url>
29-
</scm>
30-
31-
<organization>
32-
<name>Stackify, LLC</name>
33-
<url>http://www.stackify.com</url>
34-
</organization>
35-
36-
<developers>
37-
<developer>
38-
<id>eric-martin</id>
19+
<license>
20+
<name>The Apache Software License, Version 2.0</name>
21+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
22+
</license>
23+
</licenses>
24+
25+
<scm>
26+
<connection>scm:git:git://github.com/stackify/stackify-api-common.git</connection>
27+
<developerConnection>scm:git:git@github.com:stackify/stackify-api-common.git</developerConnection>
28+
<url>https://github.com/stackify/stackify-api-common</url>
29+
</scm>
30+
31+
<organization>
32+
<name>Stackify, LLC</name>
33+
<url>http://www.stackify.com</url>
34+
</organization>
35+
36+
<developers>
37+
<developer>
38+
<id>eric-martin</id>
3939
<name>Eric Martin</name>
40-
</developer>
41-
</developers>
40+
</developer>
41+
</developers>
42+
43+
<properties>
44+
<java.version>1.6</java.version>
45+
</properties>
4246

43-
<properties>
44-
<java.version>1.6</java.version>
45-
</properties>
46-
4747
<dependencies>
48-
48+
4949
<!-- Compile time dependencies -->
50-
50+
5151
<dependency>
5252
<groupId>com.stackify</groupId>
53-
<artifactId>stackify-api</artifactId>
54-
<version>1.0.5</version>
53+
<artifactId>stackify-api</artifactId>
54+
<version>1.0.6-SNAPSHOT</version>
5555
</dependency>
56-
56+
5757
<dependency>
58-
<groupId>com.google.guava</groupId>
59-
<artifactId>guava</artifactId>
60-
<version>15.0</version>
58+
<groupId>com.google.guava</groupId>
59+
<artifactId>guava</artifactId>
60+
<version>15.0</version>
6161
</dependency>
62-
62+
6363
<dependency>
64-
<groupId>org.slf4j</groupId>
65-
<artifactId>slf4j-api</artifactId>
66-
<version>1.7.5</version>
67-
</dependency>
68-
64+
<groupId>org.slf4j</groupId>
65+
<artifactId>slf4j-api</artifactId>
66+
<version>1.7.5</version>
67+
</dependency>
68+
6969
<!-- Runtime dependencies -->
7070

7171
<!-- Test dependencies -->
72-
72+
7373
<dependency>
7474
<groupId>junit</groupId>
7575
<artifactId>junit</artifactId>
7676
<version>4.11</version>
7777
<scope>test</scope>
7878
</dependency>
79-
79+
8080
<dependency>
8181
<groupId>org.mockito</groupId>
8282
<artifactId>mockito-all</artifactId>
8383
<version>1.9.5</version>
8484
<scope>test</scope>
8585
</dependency>
86-
86+
8787
<dependency>
8888
<groupId>org.powermock</groupId>
8989
<artifactId>powermock-api-mockito</artifactId>
9090
<version>1.5</version>
9191
<scope>test</scope>
9292
</dependency>
93-
93+
9494
<dependency>
9595
<groupId>org.powermock</groupId>
9696
<artifactId>powermock-module-junit4</artifactId>
9797
<version>1.5</version>
9898
<scope>test</scope>
9999
</dependency>
100-
100+
101101
<dependency>
102102
<groupId>org.slf4j</groupId>
103103
<artifactId>slf4j-log4j12</artifactId>
104104
<version>1.7.5</version>
105105
<scope>test</scope>
106106
</dependency>
107-
107+
108108
</dependencies>
109109

110-
<build>
111-
112-
<resources>
110+
<build>
111+
112+
<resources>
113113
<resource>
114114
<directory>src/main/resources</directory>
115115
<filtering>true</filtering>
116116
</resource>
117117
</resources>
118-
118+
119119
<extensions>
120120
<extension>
121121
<groupId>org.apache.maven.wagon</groupId>
122122
<artifactId>wagon-webdav-jackrabbit</artifactId>
123123
<version>2.2</version>
124124
</extension>
125125
</extensions>
126-
126+
127127
<plugins>
128-
128+
129129
<plugin>
130130
<groupId>org.apache.maven.plugins</groupId>
131131
<artifactId>maven-compiler-plugin</artifactId>
@@ -135,7 +135,7 @@
135135
<target>${java.version}</target>
136136
</configuration>
137137
</plugin>
138-
138+
139139
<plugin>
140140
<groupId>org.apache.maven.plugins</groupId>
141141
<artifactId>maven-jar-plugin</artifactId>
@@ -146,7 +146,7 @@
146146
</archive>
147147
</configuration>
148148
</plugin>
149-
149+
150150
<plugin>
151151
<groupId>org.apache.maven.plugins</groupId>
152152
<artifactId>maven-javadoc-plugin</artifactId>
@@ -159,7 +159,7 @@
159159
</execution>
160160
</executions>
161161
</plugin>
162-
162+
163163
<plugin>
164164
<groupId>org.apache.maven.plugins</groupId>
165165
<artifactId>maven-source-plugin</artifactId>
@@ -172,7 +172,7 @@
172172
</execution>
173173
</executions>
174174
</plugin>
175-
175+
176176
<plugin>
177177
<groupId>org.apache.felix</groupId>
178178
<artifactId>maven-bundle-plugin</artifactId>
@@ -187,7 +187,7 @@
187187
</execution>
188188
</executions>
189189
</plugin>
190-
190+
191191
<plugin>
192192
<groupId>org.codehaus.mojo</groupId>
193193
<artifactId>cobertura-maven-plugin</artifactId>
@@ -198,31 +198,31 @@
198198
</formats>
199199
</configuration>
200200
</plugin>
201-
201+
202202
<plugin>
203-
<groupId>org.eluder.coveralls</groupId>
204-
<artifactId>coveralls-maven-plugin</artifactId>
205-
<version>2.2.0</version>
203+
<groupId>org.eluder.coveralls</groupId>
204+
<artifactId>coveralls-maven-plugin</artifactId>
205+
<version>2.2.0</version>
206206
</plugin>
207207

208208
</plugins>
209-
209+
210210
</build>
211-
211+
212212
<reporting>
213-
213+
214214
<plugins>
215-
215+
216216
<plugin>
217217
<groupId>org.apache.maven.plugins</groupId>
218218
<artifactId>maven-javadoc-plugin</artifactId>
219219
<version>2.9.1</version>
220220
</plugin>
221-
221+
222222
</plugins>
223-
223+
224224
</reporting>
225-
225+
226226
<profiles>
227227
<profile>
228228
<id>release-sign-artifacts</id>
@@ -252,5 +252,5 @@
252252
</build>
253253
</profile>
254254
</profiles>
255-
255+
256256
</project>

0 commit comments

Comments
 (0)