Skip to content

Commit 221a39c

Browse files
committed
Re-organized build-related files
1 parent 1c834c3 commit 221a39c

File tree

6 files changed

+18
-29
lines changed

6 files changed

+18
-29
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ script:
2525

2626
# If we're going to deploy, we first resolve variables in our bintray config.
2727
before_deploy:
28-
- cat bintray-config.template | envsubst >bintray-config.json
28+
- cat build/bintray-config.template | envsubst >bintray-config.json
2929
- cat bintray-config.json
3030

3131
deploy:
File renamed without changes.
File renamed without changes.
File renamed without changes.

checkstyle-suppressions.xml

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

pom.xml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>com.ibm.cloud.sdk</groupId>
56
<artifactId>java-sdk-core</artifactId>
@@ -10,16 +11,16 @@
1011
<url>https://github.com/IBM/java-sdk-core</url>
1112

1213
<licenses>
13-
<license>
14-
<name>Apache License, Version 2.0</name>
15-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
16-
</license>
14+
<license>
15+
<name>Apache License, Version 2.0</name>
16+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
17+
</license>
1718
</licenses>
1819

1920
<scm>
2021
<connection>scm:git:https://github.com/IBM/java-sdk-core</connection>
2122
<developerConnection>scm:git:https://github.com/IBM/java-sdk-core</developerConnection>
22-
<url>https://github.com/IBM/java-sdk-core/tree/master</url>
23+
<url>https://github.com/IBM/java-sdk-core/tree/master</url>
2324
</scm>
2425

2526
<issueManagement>
@@ -50,7 +51,7 @@
5051
<jersey-version>2.25.1</jersey-version>
5152
</properties>
5253

53-
<!-- we use the travis providers for deployment -->
54+
<!-- we use the travis providers for deployment so don't need to specify repositories here -->
5455
<distributionManagement>
5556
</distributionManagement>
5657

@@ -162,7 +163,7 @@
162163
</goals>
163164
</execution>
164165
</executions>
165-
</plugin>
166+
</plugin>
166167
<plugin>
167168
<groupId>org.apache.maven.plugins</groupId>
168169
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -178,7 +179,7 @@
178179
</executions>
179180
<configuration>
180181
<failsOnError>true</failsOnError>
181-
<configLocation>checkstyle.xml</configLocation>
182+
<configLocation>build/checkstyle.xml</configLocation>
182183
<consoleOutput>true</consoleOutput>
183184
</configuration>
184185
</plugin>
@@ -188,7 +189,7 @@
188189
<version>${findbugs-plugin-version}</version>
189190
<configuration>
190191
<xmlOutput>true</xmlOutput>
191-
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
192+
<excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
192193
<effort>Max</effort>
193194
<threshold>Low</threshold>
194195
</configuration>
@@ -228,7 +229,8 @@
228229
<configuration>
229230
<append>true</append>
230231
<destFile>${sonar.jacoco.reportPath}</destFile>
231-
<!-- Sets the VM argument line used when unit tests are run. -->
232+
<!-- Sets the VM argument line used when unit
233+
tests are run. -->
232234
<propertyName>surefireArgLine</propertyName>
233235
</configuration>
234236
</execution>
@@ -252,14 +254,9 @@
252254
<groupId>org.apache.maven.plugins</groupId>
253255
<artifactId>maven-surefire-plugin</artifactId>
254256
<version>${surefire-version}</version>
255-
<!--
256-
<configuration>
257-
<suiteXmlFiles>
258-
<suiteXmlFile>src/test/java/testng.xml</suiteXmlFile>
259-
</suiteXmlFiles>
260-
</configuration>
261-
-->
262-
</plugin>
257+
<!-- <configuration> <suiteXmlFiles> <suiteXmlFile>src/test/java/testng.xml</suiteXmlFile>
258+
</suiteXmlFiles> </configuration> -->
259+
</plugin>
263260
</plugins>
264261
</build>
265262

0 commit comments

Comments
 (0)