Skip to content

Commit

Permalink
Bygg på java 11
Browse files Browse the repository at this point in the history 
Oppgraderer lombok og legger til dependencies fra jakarta for
å få digipost-data-types til å bygge på java 11.
  • Loading branch information
@eivinhb
eivinhb committed Dec 4, 2019
1 parent f39fd7f commit db8b946
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
7 changes: 7 additions & 0 deletions NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@ under the License.
This project includes:
ClassMate under The Apache Software License, Version 2.0
Digipost Data Types under The Apache Software License, Version 2.0
Extended StAX API under Eclipse Distribution License - v 1.0
fastinfoset under Apache License, Version 2.0 or Eclipse Distribution License - v 1.0
Hibernate Validator Engine under Apache License 2.0
istack common utility code runtime under Eclipse Distribution License - v 1.0
Jackson datatype: JSR310 under The Apache Software License, Version 2.0
Jackson-annotations under The Apache Software License, Version 2.0
Jackson-core under The Apache Software License, Version 2.0
jackson-databind under The Apache Software License, Version 2.0
Jakarta Bean Validation API under Apache License 2.0
Jakarta Expression Language 3.0 under EPL 2.0 or GPL2 w/ CPE
jakarta.xml.bind-api under Eclipse Distribution License - v 1.0
JavaBeans Activation Framework API jar under EDL 1.0
JAXB Runtime under Eclipse Distribution License - v 1.0
JBoss Logging 3 under Apache License, version 2.0
Project Lombok under The MIT License
TXW2 Runtime under Eclipse Distribution License - v 1.0

41 changes: 39 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.8</version>
<version>1.18.10</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -83,6 +83,17 @@
<version>3.0.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -217,7 +228,7 @@
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>1.16.16.0</version>
<version>1.18.10.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -244,6 +255,19 @@
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<sources>
<source>${project.build.directory}/schemagen-work/lombok</source>
Expand Down Expand Up @@ -335,6 +359,19 @@
<phase>generate-resources</phase>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit db8b946

Please sign in to comment.