Skip to content
Permalink
Browse files

Make cilla build on Java 11

  • Loading branch information...
shred committed Apr 26, 2019
1 parent a3d9a51 commit 283c5505b1f04a61d6d5058e161ccd3dfc4ae2b3
@@ -243,6 +243,16 @@
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
@@ -26,7 +26,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.util.Map;
import java.util.WeakHashMap;

import javax.activation.DataHandler;
@@ -41,6 +41,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -17,33 +17,37 @@
<szo.commons.text.version>2.4</szo.commons.text.version>
<szo.commons.view.version>1.3</szo.commons.view.version>

<aspectj.version>1.9.1</aspectj.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<aspectj.version>1.9.2</aspectj.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.io.version>2.6</commons.io.version>
<cxf.version>3.2.6</cxf.version>
<cxf.version>3.2.7</cxf.version>
<ehcache.version>2.6.11</ehcache.version>
<freemarker.version>2.3.28</freemarker.version>
<hamcrest.version>1.3</hamcrest.version>
<hamcrest.version>2.1</hamcrest.version>
<hibernate.version>5.3.7.Final</hibernate.version>
<hibernate.jpa.version>1.0.0.Final</hibernate.jpa.version>
<hibernate.search.version>5.10.4.Final</hibernate.search.version>
<hibernate.validator.version>5.4.2.Final</hibernate.validator.version>
<javax.activation.version>1.1.1</javax.activation.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<javax.el.version>3.0.0</javax.el.version>
<javax.jaxb.version>2.3.1</javax.jaxb.version>
<javax.jaxws.version>2.3.1</javax.jaxws.version>
<javax.jsp.version>2.3.3</javax.jsp.version>
<javax.jstl.version>1.2.2</javax.jstl.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<javax.jws.version>1.1</javax.jws.version>
<javax.servlet.version>4.0.1</javax.servlet.version>
<javax.validation.version>2.0.1.Final</javax.validation.version>
<el.version>2.2</el.version>
<jgroups.version>4.0.15.Final</jgroups.version>
<jgroups.version>4.0.16.Final</jgroups.version>
<jsf.version>2.1.29-11</jsf.version>
<junit.version>[4,)</junit.version>
<junit.version>4.12</junit.version>
<lucene.version>5.5.5</lucene.version><!-- Cannot update because of Hibernate -->
<metadataextractor.version>2.11.0</metadataextractor.version>
<mockito.version>2.23.0</mockito.version>
<mockito.version>2.23.4</mockito.version>
<primefaces.version>3.5</primefaces.version>
<primefaces.themes.version>1.0.10</primefaces.themes.version>
<rome.version>1.11.1</rome.version>
<rome.version>1.12.0</rome.version>
<simplemagic.version>1.14</simplemagic.version>
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.3.20.RELEASE</spring.version>
@@ -192,6 +196,10 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@@ -222,7 +230,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
</dependency>
<dependency>
@@ -403,11 +411,21 @@
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>${javax.el.version}</version>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>${javax.jws.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -428,6 +446,16 @@
<artifactId>validation-api</artifactId>
<version>${javax.validation.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${javax.jaxb.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>${javax.jaxws.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
@@ -50,6 +50,13 @@
<type>CREATE</type>
<outputFile>${project.build.directory}/schema/schema.sql</outputFile>
</configuration>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
<pluginManagement>
@@ -190,6 +197,11 @@
<artifactId>spring-tx</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
@@ -45,6 +45,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -157,6 +157,16 @@
<artifactId>activation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
@@ -165,7 +175,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -45,6 +45,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -90,6 +90,11 @@
<artifactId>spring-core</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
@@ -45,6 +45,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -105,6 +105,11 @@
<artifactId>spring-web</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
@@ -45,6 +45,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -86,5 +86,16 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
@@ -45,6 +45,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -42,10 +42,25 @@
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
@@ -45,6 +45,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
@@ -211,6 +211,11 @@
<artifactId>thumbnailator</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
@@ -41,6 +41,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.4</version>
<version>1.7</version>
</skin>
</project>
Oops, something went wrong.

0 comments on commit 283c550

Please sign in to comment.
You can’t perform that action at this time.