Commit a57d11ef authored by cdanger's avatar cdanger

- Changed company name in license headers

- Upgraded managed dependency versions:
	- jaxb2-basics: 1.11.1
	- guava: 24.1.1-jre
- Replaced plugin maven-jaxb2-plugin with maven-jaxb22-plugin for java
1.8 compatibility
- Upgraded jaxb2-rich-contact-plugin version: 2.0.1
parent dc8e6421
......@@ -5,7 +5,7 @@
<version>7.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>Authzforce - Parent of all AuthzForce components</description>
<description>AuthzForce - Parent of all AuthzForce components</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Controls maven compiler plugin -source -->
......@@ -19,7 +19,7 @@
<!-- Fix the project URL for all Authzforce project -->
<project.url>https://authzforce.ow2.org</project.url>
<git.url.base>https://gitlab.ow2.org/authzforce</git.url.base>
<jaxb2-basics.version>0.11.1</jaxb2-basics.version>
<jaxb2-basics.version>1.11.1</jaxb2-basics.version>
<jaxb2-value-constructor.version>3.0</jaxb2-value-constructor.version>
<slf4j.version>1.7.25</slf4j.version>
<!-- This version must match the Spring version's MAJOR.MINOR used by 'logback-ext-spring' and cxf-spring-boot-* in dependencyManagement. (All 4.3.x versions up to 4.3.16 are affected by CVEs.) -->
......@@ -36,9 +36,9 @@
</licenses>
<developers>
<developer>
<name>The AuthZForce Team</name>
<name>The AuthzForce Team</name>
<email>http://scr.im/azteam</email>
<organization>Thales Services</organization>
<organization>THALES</organization>
<organizationUrl>http://thalesgroup.com</organizationUrl>
</developer>
</developers>
......@@ -160,7 +160,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
<version>24.1.1-jre</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
......@@ -214,7 +214,7 @@
<!-- Values to be substituted in template -->
<inceptionYear>${project.inceptionYear}</inceptionYear>
<currentYear>${currentYear}</currentYear>
<copyrightOwner>Thales Services SAS</copyrightOwner>
<copyrightOwner>THALES</copyrightOwner>
<projectName>AuthzForce CE</projectName>
</properties>
<!-- <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header> -->
......@@ -252,6 +252,17 @@
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb22-plugin</artifactId>
<version>0.14.0</version>
<configuration>
<debug>false</debug>
<strict>false</strict>
<verbose>false</verbose>
<removeOldOutput>true</removeOldOutput>
</configuration>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
......
......@@ -57,7 +57,7 @@
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<artifactId>maven-jaxb22-plugin</artifactId>
<configuration>
<verbose>false</verbose>
<extension>true</extension>
......@@ -85,7 +85,7 @@
<plugin>
<groupId>net.codesup.util</groupId>
<artifactId>jaxb2-rich-contract-plugin</artifactId>
<version>1.15.0</version>
<version>2.0.1</version>
</plugin>
</plugins>
<bindingDirectory>src/main/jaxb</bindingDirectory>
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
/**
* Copyright 2012-2018 Thales Services SAS.
* Copyright 2012-2018 THALES.
*
* This file is part of AuthzForce CE.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment