github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make it run more or less on Java 14

pull/1536/head
Justin Richer 2020-05-11 14:07:27 -04:00
parent 0d4ef2cb4f
commit b299dfcc49
7 changed files with 7305 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ bin
/target
.springBeans
nb-configuration.xml
.factorypath

5
openid-connect-common/pom.xml
View File

@ -87,6 +87,11 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
</dependency>
</dependencies>
<packaging>jar</packaging>

12
openid-connect-server-webapp/pom.xml
View File

@ -142,11 +142,21 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<description>Deployable package of the OpenID Connect server</description>
</project>

4
openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag
View File

@ -16,11 +16,11 @@
<meta name="author" content="">
<!-- stylesheets -->
<link href="resources/bootstrap2/css/bootstrap.css" rel="stylesheet">
<link href="resources/css/bootstrap.css" rel="stylesheet">
<link href="resources/css/bootstrap-sheet.css" rel="stylesheet">
<link href="resources/css/mitreid-connect.css" rel="stylesheet">
<link href="resources/css/mitreid-connect-local.css" rel="stylesheet">
<link href="resources/bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
<link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
<link href="resources/css/mitreid-connect-responsive.css" rel="stylesheet">
<link href="resources/css/mitreid-connect-responsive-local.css" rel="stylesheet">

1109
openid-connect-server-webapp/src/main/webapp/resources/css/bootstrap-responsive.css Normal file
View File

File diff suppressed because it is too large Load Diff

6167
openid-connect-server-webapp/src/main/webapp/resources/css/bootstrap.css Normal file
View File

File diff suppressed because it is too large Load Diff

18
pom.xml
View File

@ -91,12 +91,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<version>0.8.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -178,7 +178,7 @@
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>1.8.0</version>
<version>1.9.0</version>
<executions>
<execution>
<phase>compile</phase>
@ -191,7 +191,7 @@
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-extensions</artifactId>
<version>1.8.0</version>
<version>1.9.0</version>
</dependency>
</dependencies>
</plugin>
@ -210,6 +210,8 @@
<doctitle>MITREid Connect v. ${project.version}</doctitle>
<overview>${basedir}/src/main/javadoc/overview.html</overview>
<additionalparam>-Xdoclint:none</additionalparam>
<source>8</source>
<failOnError>false</failOnError>
</configuration>
<executions>
<execution>
@ -564,12 +566,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.0-jre</version>
<version>29.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@ -585,7 +587,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>5.4</version>
<version>8.15</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@ -605,7 +607,7 @@
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-extensions</artifactId>
<version>1.8.0</version>
<version>1.9.0</version>
</dependency>
</dependencies>
</dependencyManagement>