Skip to content

Commit 050662d

Browse files
jricherjricher
committed
updated dependencies
1 parent 7767c7a commit 050662d

File tree

7 files changed

+69
-89
lines changed

7 files changed

+69
-89
lines changed

‎openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class TestSignedAuthRequestUrlBuilder {
9191
@Before
9292
public void prepare() throws NoSuchAlgorithmException, InvalidKeySpecException {
9393

94-
RSAKey key = new RSAKey(new Base64URL(n), new Base64URL(e), new Base64URL(d), KeyUse.SIGNATURE, null, new Algorithm(alg), kid, null, null, null);
94+
RSAKey key = new RSAKey(new Base64URL(n), new Base64URL(e), new Base64URL(d), KeyUse.SIGNATURE, null, new Algorithm(alg), kid, null, null, null, null);
9595
Map<String, JWK> keys = Maps.newHashMap();
9696
keys.put("client", key);
9797

‎openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/SymmetricKeyJWTValidatorCacheService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public JWTSigningAndValidationService load(String key) throws Exception {
101101

102102
String id = "SYMMETRIC-KEY";
103103

104-
JWK jwk = new OctetSequenceKey(Base64URL.encode(key), KeyUse.SIGNATURE, null, null, id, null, null, null);
104+
JWK jwk = new OctetSequenceKey(Base64URL.encode(key), KeyUse.SIGNATURE, null, null, id, null, null, null, null);
105105
Map<String, JWK> keys = ImmutableMap.of(id, jwk);
106106
JWTSigningAndValidationService service = new DefaultJWTSigningAndValidationService(keys);
107107

‎openid-connect-common/src/test/java/org/mitre/jose/TestJWKSetKeyStore.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class TestJWKSetKeyStore {
6262
"qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
6363
"t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
6464
"VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
65-
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null);
65+
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null);
6666

6767
private String RSAkid_rsa2 = "rsa_2";
6868
private JWK RSAjwk_rsa2 = new RSAKey(
@@ -79,7 +79,7 @@ public class TestJWKSetKeyStore {
7979
"qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
8080
"t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
8181
"VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
82-
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_rsa2, null, null, null);
82+
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_rsa2, null, null, null, null);
8383

8484

8585
List<JWK> keys_list = new LinkedList<>();

‎openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public class TestDefaultJWTEncryptionAndDecryptionService {
105105
"qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
106106
"t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
107107
"VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
108-
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null);
108+
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null, null);
109109

110110
private String RSAkid_2 = "rsa3210";
111111
private JWK RSAjwk_2 = new RSAKey(
@@ -122,12 +122,12 @@ public class TestDefaultJWTEncryptionAndDecryptionService {
122122
"qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
123123
"t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
124124
"VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
125-
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_2, null, null, null);
125+
KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_2, null, null, null, null);
126126

127127
private String AESkid = "aes123";
128-
private JWK AESjwk = new OctetSequenceKey( new Base64URL("GawgguFyGrWKav7AX4VKUg"),
128+
private JWK AESjwk = new OctetSequenceKey(new Base64URL("GawgguFyGrWKav7AX4VKUg"),
129129
KeyUse.ENCRYPTION, null, JWEAlgorithm.A128KW,
130-
AESkid, null, null, null);
130+
AESkid, null, null, null, null);
131131

132132

133133
private Map<String, JWK> keys = new ImmutableMap.Builder<String, JWK>()

‎openid-connect-server-webapp/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@
9494
<jsDestinationFolder>${project.build.directory}/${project.build.finalName}/js/</jsDestinationFolder>
9595
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
9696
</configuration>
97-
<dependencies>
98-
<dependency>
99-
<groupId>ro.isdc.wro4j</groupId>
100-
<artifactId>wro4j-extensions</artifactId>
101-
<version>1.8.0</version>
102-
</dependency>
103-
</dependencies>
10497
</plugin>
10598

10699
</plugins>

‎pom.xml‎

Lines changed: 60 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
<properties>
7272
<java-version>1.8</java-version>
73-
<org.slf4j-version>1.7.21</org.slf4j-version>
73+
<org.slf4j-version>1.7.25</org.slf4j-version>
7474
</properties>
7575
<description>A reference implementation of OpenID Connect (http://openid.net/connect/), OAuth 2.0, and UMA built on top of Java, Spring, and Spring Security. The project contains a fully functioning server, client, and utility library.</description>
7676
<url>https://github.com/mitreid-connect</url>
@@ -80,48 +80,43 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-jar-plugin</artifactId>
83-
<version>2.4</version>
83+
<version>3.0.2</version>
8484
</plugin>
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-war-plugin</artifactId>
88-
<version>2.6</version>
89-
</plugin>
90-
<plugin>
91-
<groupId>org.apache.maven.plugins</groupId>
92-
<artifactId>maven-archiver</artifactId>
93-
<version>2.5</version>
88+
<version>3.0.0</version>
9489
</plugin>
9590
<plugin>
9691
<groupId>org.apache.maven.plugins</groupId>
9792
<artifactId>maven-javadoc-plugin</artifactId>
98-
<version>2.9</version>
93+
<version>2.10.4</version>
9994
</plugin>
10095
<plugin>
10196
<groupId>org.apache.maven.plugins</groupId>
10297
<artifactId>maven-deploy-plugin</artifactId>
103-
<version>2.7</version>
98+
<version>2.8.2</version>
10499
</plugin>
105100
<plugin>
106101
<groupId>org.apache.maven.plugins</groupId>
107102
<artifactId>maven-source-plugin</artifactId>
108-
<version>2.2</version>
103+
<version>3.0.1</version>
109104
</plugin>
110105
<plugin>
111106
<groupId>org.apache.maven.plugins</groupId>
112107
<artifactId>maven-compiler-plugin</artifactId>
113-
<version>2.5.1</version>
108+
<version>3.6.1</version>
114109
</plugin>
115110
<plugin>
116111
<groupId>org.eclipse.jetty</groupId>
117112
<artifactId>jetty-maven-plugin</artifactId>
118-
<version>9.3.3.v20150827</version>
113+
<version>9.4.3.v20170317</version>
119114
</plugin>
120115
<plugin>
121116
<inherited>true</inherited>
122117
<groupId>org.apache.maven.plugins</groupId>
123118
<artifactId>maven-enforcer-plugin</artifactId>
124-
<version>1.3</version>
119+
<version>1.4.1</version>
125120
</plugin>
126121
<plugin>
127122
<groupId>org.appfuse.plugins</groupId>
@@ -131,24 +126,43 @@
131126
<plugin>
132127
<groupId>org.apache.maven.plugins</groupId>
133128
<artifactId>maven-site-plugin</artifactId>
134-
<version>3.3</version>
129+
<version>3.6</version>
135130
</plugin>
136131
<plugin>
137132
<groupId>org.apache.maven.plugins</groupId>
138133
<artifactId>maven-project-info-reports-plugin</artifactId>
139134
<version>2.9</version>
140135
</plugin>
136+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
141137
<plugin>
142-
<groupId>org.lesscss</groupId>
143-
<artifactId>lesscss-maven-plugin</artifactId>
144-
<version>1.7.0.1.1</version>
145-
<executions>
146-
<execution>
147-
<goals>
148-
<goal>compile</goal>
149-
</goals>
150-
</execution>
151-
</executions>
138+
<groupId>org.eclipse.m2e</groupId>
139+
<artifactId>lifecycle-mapping</artifactId>
140+
<version>1.0.0</version>
141+
<configuration>
142+
<lifecycleMappingMetadata>
143+
<pluginExecutions>
144+
<pluginExecution>
145+
<pluginExecutionFilter>
146+
<groupId>
147+
org.appfuse.plugins
148+
</groupId>
149+
<artifactId>
150+
warpath-maven-plugin
151+
</artifactId>
152+
<versionRange>
153+
[3.5.0,)
154+
</versionRange>
155+
<goals>
156+
<goal>add-classes</goal>
157+
</goals>
158+
</pluginExecutionFilter>
159+
<action>
160+
<execute />
161+
</action>
162+
</pluginExecution>
163+
</pluginExecutions>
164+
</lifecycleMappingMetadata>
165+
</configuration>
152166
</plugin>
153167
<plugin>
154168
<groupId>ro.isdc.wro4j</groupId>
@@ -162,6 +176,13 @@
162176
</goals>
163177
</execution>
164178
</executions>
179+
<dependencies>
180+
<dependency>
181+
<groupId>ro.isdc.wro4j</groupId>
182+
<artifactId>wro4j-extensions</artifactId>
183+
<version>1.8.0</version>
184+
</dependency>
185+
</dependencies>
165186
</plugin>
166187
</plugins>
167188
</pluginManagement>
@@ -336,7 +357,7 @@
336357
<dependency>
337358
<groupId>org.springframework</groupId>
338359
<artifactId>spring-framework-bom</artifactId>
339-
<version>4.3.4.RELEASE</version>
360+
<version>4.3.7.RELEASE</version>
340361
<type>pom</type>
341362
<scope>import</scope>
342363
</dependency>
@@ -345,26 +366,26 @@
345366
<dependency>
346367
<groupId>com.fasterxml.jackson.core</groupId>
347368
<artifactId>jackson-databind</artifactId>
348-
<version>2.3.4</version>
369+
<version>2.9.0.pr2</version>
349370
</dependency>
350371
<dependency>
351372
<groupId>com.fasterxml.jackson.core</groupId>
352373
<artifactId>jackson-annotations</artifactId>
353-
<version>2.3.4</version>
374+
<version>2.9.0.pr2</version>
354375
</dependency>
355376

356377
<!-- Spring Security -->
357378
<dependency>
358379
<groupId>org.springframework.security</groupId>
359380
<artifactId>spring-security-bom</artifactId>
360-
<version>4.2.0.RELEASE</version>
381+
<version>4.2.2.RELEASE</version>
361382
<type>pom</type>
362383
<scope>import</scope>
363384
</dependency>
364385
<dependency>
365386
<groupId>org.springframework.security.oauth</groupId>
366387
<artifactId>spring-security-oauth2</artifactId>
367-
<version>2.0.12.RELEASE</version>
388+
<version>2.1.0.RELEASE</version>
368389
</dependency>
369390

370391
<!-- Servlet -->
@@ -390,7 +411,7 @@
390411
<dependency>
391412
<groupId>mysql</groupId>
392413
<artifactId>mysql-connector-java</artifactId>
393-
<version>5.1.34</version>
414+
<version>6.0.6</version>
394415
</dependency>
395416
<dependency>
396417
<groupId>org.hsqldb</groupId>
@@ -400,7 +421,7 @@
400421
<dependency>
401422
<groupId>org.postgresql</groupId>
402423
<artifactId>postgresql</artifactId>
403-
<version>9.4-1201-jdbc4</version>
424+
<version>42.0.0.jre7</version>
404425
</dependency>
405426
<dependency>
406427
<groupId>com.oracle</groupId>
@@ -420,7 +441,7 @@
420441
<dependency>
421442
<groupId>com.zaxxer</groupId>
422443
<artifactId>HikariCP</artifactId>
423-
<version>2.4.1</version>
444+
<version>2.6.1</version>
424445
</dependency>
425446

426447

@@ -450,7 +471,7 @@
450471
<dependency>
451472
<groupId>log4j</groupId>
452473
<artifactId>log4j</artifactId>
453-
<version>1.2.15</version>
474+
<version>1.2.17</version>
454475
<exclusions>
455476
<exclusion>
456477
<groupId>javax.mail</groupId>
@@ -476,13 +497,13 @@
476497
<dependency>
477498
<groupId>junit</groupId>
478499
<artifactId>junit</artifactId>
479-
<version>4.7</version>
500+
<version>4.12</version>
480501
<scope>test</scope>
481502
</dependency>
482503
<dependency>
483504
<groupId>org.easymock</groupId>
484505
<artifactId>easymock</artifactId>
485-
<version>2.0</version>
506+
<version>3.4</version>
486507
<scope>test</scope>
487508
</dependency>
488509
<dependency>
@@ -543,7 +564,7 @@
543564
<dependency>
544565
<groupId>com.google.guava</groupId>
545566
<artifactId>guava</artifactId>
546-
<version>20.0</version>
567+
<version>21.0</version>
547568
</dependency>
548569
<dependency>
549570
<groupId>com.google.code.gson</groupId>
@@ -553,7 +574,7 @@
553574
<dependency>
554575
<groupId>org.apache.httpcomponents</groupId>
555576
<artifactId>httpclient</artifactId>
556-
<version>4.5.2</version>
577+
<version>4.5.3</version>
557578
<exclusions>
558579
<exclusion>
559580
<groupId>commons-logging</groupId>
@@ -564,7 +585,7 @@
564585
<dependency>
565586
<groupId>com.nimbusds</groupId>
566587
<artifactId>nimbus-jose-jwt</artifactId>
567-
<version>4.33</version>
588+
<version>4.34.2</version>
568589
</dependency>
569590
<dependency>
570591
<groupId>org.bouncycastle</groupId>

‎uma-server-webapp/pom.xml‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<artifactId>openid-connect-server-webapp</artifactId>
6161
</overlay>
6262
</overlays>
63+
<failOnMissingWebXml>false</failOnMissingWebXml>
6364
</configuration>
6465
</plugin>
6566
<plugin>
@@ -73,41 +74,6 @@
7374
</configuration>
7475
</plugin>
7576
</plugins>
76-
<pluginManagement>
77-
<plugins>
78-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
79-
<plugin>
80-
<groupId>org.eclipse.m2e</groupId>
81-
<artifactId>lifecycle-mapping</artifactId>
82-
<version>1.0.0</version>
83-
<configuration>
84-
<lifecycleMappingMetadata>
85-
<pluginExecutions>
86-
<pluginExecution>
87-
<pluginExecutionFilter>
88-
<groupId>
89-
org.appfuse.plugins
90-
</groupId>
91-
<artifactId>
92-
warpath-maven-plugin
93-
</artifactId>
94-
<versionRange>
95-
[3.5.0,)
96-
</versionRange>
97-
<goals>
98-
<goal>add-classes</goal>
99-
</goals>
100-
</pluginExecutionFilter>
101-
<action>
102-
<execute />
103-
</action>
104-
</pluginExecution>
105-
</pluginExecutions>
106-
</lifecycleMappingMetadata>
107-
</configuration>
108-
</plugin>
109-
</plugins>
110-
</pluginManagement>
11177
</build>
11278
<dependencies>
11379
<dependency>

0 commit comments

Comments
 (0)