Browse Source

Use openjdk8

pull/76/head
Uldis Ansmits 5 years ago
parent
commit
4ff1f6560b
  1. 2
      .travis.yml
  2. 56
      pom.xml

2
.travis.yml

@ -1,3 +1,3 @@
language: java language: java
jdk: jdk:
- oraclejdk8 - openjdk8

56
pom.xml

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.englishtown</groupId> <groupId>com.englishtown</groupId>
@ -67,17 +68,16 @@
<artifactId>bitbucket-git-common</artifactId> <artifactId>bitbucket-git-common</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.sal</groupId> <groupId>com.atlassian.sal</groupId>
<artifactId>sal-api</artifactId> <artifactId>sal-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.bitbucket.server</groupId> <groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-web-common</artifactId> <artifactId>bitbucket-web-common</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.soy</groupId> <groupId>com.atlassian.soy</groupId>
<artifactId>soy-template-renderer-api</artifactId> <artifactId>soy-template-renderer-api</artifactId>
@ -86,8 +86,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.utils</groupId> <groupId>com.atlassian.utils</groupId>
<artifactId>atlassian-processutils</artifactId> <artifactId>atlassian-processutils</artifactId>
<version>1.8.3</version> <version>1.8.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -96,48 +96,24 @@
<version>1.8</version> <version>1.8</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13-atlassian-2</version> <version>1.9.13-atlassian-2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
<scope>compile</scope>
</dependency-->
<!--dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.10.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.10.0</version>
<scope>compile</scope>
</dependency-->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.soy</groupId> <groupId>com.atlassian.soy</groupId>
<artifactId>atlassian-soy-spring-mvc-support</artifactId> <artifactId>atlassian-soy-spring-mvc-support</artifactId>
<version>5.0.0</version> <version>5.0.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atlassian.bitbucket.server</groupId> <groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-test-util</artifactId> <artifactId>bitbucket-test-util</artifactId>
@ -159,8 +135,6 @@
<version>2.25.1</version> <version>2.25.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

Loading…
Cancel
Save