Skip to content

Commit f8f9ef7

Browse files
committed
update infra
1 parent e284c88 commit f8f9ef7

2 files changed

Lines changed: 27 additions & 35 deletions

File tree

azure-pipelines.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,9 @@ resources:
2525
name: terracotta/terracotta
2626

2727
jobs:
28-
- template: build-templates/maven-common.yml@templates
28+
- template: build-templates/maven-common.yml@templates
29+
parameters:
30+
jobName: Linux_Java_8
31+
timeoutInMinutes: 180
32+
options: -B -Djava.test.version=1.8
33+
mavenGoals: 'clean verify'

pom.xml

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License. -->
1515
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
16-
<modelVersion>4.0.0</modelVersion>
16+
<parent>
17+
<groupId>org.terracotta</groupId>
18+
<artifactId>terracotta-parent</artifactId>
19+
<version>6.0</version>
20+
</parent>
21+
22+
<modelVersion>4.0.0</modelVersion>
1723
<groupId>org.terracotta</groupId>
1824
<artifactId>statistics</artifactId>
1925
<version>2.1-SNAPSHOT</version>
@@ -38,11 +44,10 @@
3844
<java.version>1.8</java.version>
3945
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4046
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
41-
<terracotta-os-snapshots-url>http://nexus.terracotta.eur.ad.sag/content/repositories/terracotta-os-snapshots</terracotta-os-snapshots-url>
42-
<terracotta-os-releases-url>http://nexus.terracotta.eur.ad.sag/content/repositories/terracotta-os-releases</terracotta-os-releases-url>
4347
<slf4j.base.version>1.7.32</slf4j.base.version>
4448
<slf4j.range.version>[${slf4j.base.version},3)</slf4j.range.version>
4549
<spotbugs.version>3.1.6</spotbugs.version>
50+
<license.skip>true</license.skip>
4651
</properties>
4752

4853
<dependencies>
@@ -128,19 +133,6 @@
128133
<artifactId>versions-maven-plugin</artifactId>
129134
<version>2.5</version>
130135
</plugin>
131-
<plugin>
132-
<groupId>org.sonatype.plugins</groupId>
133-
<artifactId>nexus-staging-maven-plugin</artifactId>
134-
<version>1.6.8</version>
135-
<extensions>true</extensions>
136-
<configuration>
137-
<!-- The Base URL of Nexus instance where we want to stage -->
138-
<nexusUrl>https://oss.sonatype.org</nexusUrl>
139-
<!-- The server "id" element from settings to use authentication from -->
140-
<serverId>sonatype-nexus-staging</serverId>
141-
<skipNexusStagingDeployMojo>${maven.deploy.skip}</skipNexusStagingDeployMojo>
142-
</configuration>
143-
</plugin>
144136
</plugins>
145137
</pluginManagement>
146138
<plugins>
@@ -262,10 +254,6 @@
262254
</execution>
263255
</executions>
264256
</plugin>
265-
<plugin>
266-
<groupId>org.sonatype.plugins</groupId>
267-
<artifactId>nexus-staging-maven-plugin</artifactId>
268-
</plugin>
269257
</plugins>
270258
</build>
271259

@@ -314,25 +302,12 @@
314302
</profile>
315303
</profiles>
316304

317-
<distributionManagement>
318-
<repository>
319-
<id>sonatype-nexus-staging</id>
320-
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
321-
</repository>
322-
<snapshotRepository>
323-
<id>terracotta-os-snapshots</id>
324-
<uniqueVersion>false</uniqueVersion>
325-
<name>Terracotta OS Snapshots Repository</name>
326-
<url>${terracotta-os-snapshots-url}</url>
327-
</snapshotRepository>
328-
</distributionManagement>
329-
330305
<scm>
331306
<url>https://github.com/Terracotta-OSS/statistics</url>
332307
<connection>scm:git:https://github.com/Terracotta-OSS/statistics.git</connection>
333308
<developerConnection>scm:git:git@github.com:Terracotta-OSS/statistics.git</developerConnection>
334309
</scm>
335-
310+
336311
<developers>
337312
<developer>
338313
<name>Terracotta Engineers</name>
@@ -341,4 +316,16 @@
341316
<organizationUrl>https://terracotta.org</organizationUrl>
342317
</developer>
343318
</developers>
319+
320+
<repositories>
321+
<!-- required to resolve parent pom -->
322+
<repository>
323+
<id>terracotta-releases</id>
324+
<url>https://repo.terracotta.org/maven2</url>
325+
<snapshots>
326+
<enabled>false</enabled>
327+
</snapshots>
328+
</repository>
329+
</repositories>
330+
344331
</project>

0 commit comments

Comments
 (0)