Skip to content

Commit 584719e

Browse files
committed
Depends now on Jackrabbit 2.20.2
1 parent cab7c1c commit 584719e

19 files changed

+48
-48
lines changed

pom.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (C) 2000 - 2019 Silverpeas
4+
Copyright (C) 2000 - 2021 Silverpeas
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU Affero General Public License as
@@ -96,10 +96,10 @@
9696
<properties>
9797
<!-- property used by the CI to both deploy a build version and release the next stable version -->
9898
<next.release>1.4</next.release>
99-
<maven.compiler.source>1.8</maven.compiler.source>
100-
<maven.compiler.target>1.8</maven.compiler.target>
99+
<maven.compiler.release>11</maven.compiler.release>
101100
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
102-
<jackrabbit.version>2.18.4</jackrabbit.version>
101+
<jackrabbit.version>2.20.2</jackrabbit.version>
102+
<junit.version>5.7.1</junit.version>
103103
</properties>
104104

105105
<dependencies>
@@ -109,12 +109,6 @@
109109
<version>2.0</version>
110110
<scope>provided</scope>
111111
</dependency>
112-
<dependency>
113-
<groupId>org.apache.jackrabbit</groupId>
114-
<artifactId>jackrabbit-api</artifactId>
115-
<version>${jackrabbit.version}</version>
116-
<scope>provided</scope>
117-
</dependency>
118112
<dependency>
119113
<groupId>org.apache.jackrabbit</groupId>
120114
<artifactId>jackrabbit-core</artifactId>
@@ -124,13 +118,31 @@
124118
<dependency>
125119
<groupId>commons-codec</groupId>
126120
<artifactId>commons-codec</artifactId>
127-
<version>1.13</version>
121+
<version>1.15</version>
128122
<scope>provided</scope>
129123
</dependency>
130124
<dependency>
131-
<groupId>junit</groupId>
132-
<artifactId>junit</artifactId>
133-
<version>4.13.1</version>
125+
<groupId>org.junit.jupiter</groupId>
126+
<artifactId>junit-jupiter-api</artifactId>
127+
<version>${junit.version}</version>
128+
<scope>test</scope>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.junit.jupiter</groupId>
132+
<artifactId>junit-jupiter-params</artifactId>
133+
<version>${junit.version}</version>
134+
<scope>test</scope>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.junit.jupiter</groupId>
138+
<artifactId>junit-jupiter-engine</artifactId>
139+
<version>${junit.version}</version>
140+
<scope>test</scope>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.junit.platform</groupId>
144+
<artifactId>junit-platform-runner</artifactId>
145+
<version>1.7.1</version>
134146
<scope>test</scope>
135147
</dependency>
136148
</dependencies>
@@ -169,18 +181,6 @@
169181
<artifactId>maven-jarsigner-plugin</artifactId>
170182
<version>3.0.0</version>
171183
</plugin>
172-
<plugin>
173-
<groupId>org.apache.maven.plugins</groupId>
174-
<artifactId>maven-release-plugin</artifactId>
175-
<version>2.5.3</version>
176-
<configuration>
177-
<localCheckout>true</localCheckout>
178-
<pushChanges>false</pushChanges>
179-
<autoVersionSubmodules>true</autoVersionSubmodules>
180-
<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
181-
<goals>deploy</goals>
182-
</configuration>
183-
</plugin>
184184
<plugin>
185185
<groupId>org.apache.maven.plugins</groupId>
186186
<artifactId>maven-resources-plugin</artifactId>
@@ -194,16 +194,16 @@
194194
<artifactId>maven-compiler-plugin</artifactId>
195195
<version>3.8.1</version>
196196
<configuration>
197-
<source>1.8</source>
198-
<target>1.8</target>
197+
<release>${maven.compiler.release}</release>
199198
<encoding>UTF-8</encoding>
199+
<forceJavacCompilerUse>true</forceJavacCompilerUse>
200200
<showDeprecation>true</showDeprecation>
201201
</configuration>
202202
</plugin>
203203
<plugin>
204204
<groupId>org.apache.maven.plugins</groupId>
205205
<artifactId>maven-source-plugin</artifactId>
206-
<version>3.2.0</version>
206+
<version>3.2.1</version>
207207
<configuration>
208208
<archive>
209209
<manifestEntries>
@@ -231,7 +231,7 @@
231231
<plugin>
232232
<groupId>pl.project13.maven</groupId>
233233
<artifactId>git-commit-id-plugin</artifactId>
234-
<version>3.0.1</version>
234+
<version>4.0.4</version>
235235
<configuration>
236236
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
237237
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>

silverpeas-license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2000 - 2019 Silverpeas
1+
Copyright (C) 2000 - 2021 Silverpeas
22

33
This program is free software: you can redistribute it and/or modify
44
it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/JcrProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/AbstractAuthentication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/Authentication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/AuthenticationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/AuthenticationProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/SQLSimpleAuthentication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/SilverpeasUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/TokenAuthentication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/encryption/PasswordEncryption.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/encryption/PasswordEncryptionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/encryption/UnixDESEncryption.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/encryption/UnixMD5Encryption.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/auth/encryption/UnixSHA512Encryption.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/jaas/SilverpeasAccessManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/jaas/SilverpeasJcrLoginModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/jaas/SilverpeasJcrSystemPrincipal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

src/main/java/org/silverpeas/jcr/jaas/SilverpeasUserPrincipal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2000 - 2019 Silverpeas
2+
* Copyright (C) 2000 - 2021 Silverpeas
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU Affero General Public License as

0 commit comments

Comments
 (0)