Skip to content

Commit 2f92892

Browse files
mmoquimmoqui
committed
Update the POM with a plugin management section and with the declaration of the
following plugins: jar signer, release, and gpg. Update the license header in each file.
1 parent 5f59f71 commit 2f92892

20 files changed

+472
-261
lines changed

‎pom.xml

+95-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (C) 2000 - 2017 Silverpeas
5+
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU Affero General Public License as
8+
published by the Free Software Foundation, either version 3 of the
9+
License, or (at your option) any later version.
10+
11+
As a special exception to the terms and conditions of version 3.0 of
12+
the GPL, you may redistribute this Program in connection with Free/Libre
13+
Open Source Software ("FLOSS") applications as described in Silverpeas's
14+
FLOSS exception. You should have received a copy of the text describing
15+
the FLOSS exception, and it is also available here:
16+
"http://www.silverpeas.org/legal/licensing"
17+
18+
This program is distributed in the hope that it will be useful,
19+
but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
GNU Affero General Public License for more details.
22+
23+
You should have received a copy of the GNU Affero General Public License
24+
along with this program. If not, see <http://www.gnu.org/licenses/>.
25+
26+
-->
27+
128
<project xmlns="http://maven.apache.org/POM/4.0.0"
229
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
330
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -16,8 +43,8 @@
1643
<url>http://www.silverpeas.org</url>
1744

1845
<scm>
19-
<connection>scm:git@github.com:Silverpeas/Silverpeas-JCR-AccessControl.git</connection>
20-
<developerConnection>scm:git@github.com:Silverpeas/Silverpeas-JCR-AccessControl.git
46+
<connection>scm:git:git@github.com:Silverpeas/Silverpeas-JCR-AccessControl.git</connection>
47+
<developerConnection>scm:git:git@github.com:Silverpeas/Silverpeas-JCR-AccessControl.git
2148
</developerConnection>
2249
<url>http://gitub.com/Silverpeas/Silverpeas-JCR-AccessControl.git</url>
2350
<tag>HEAD</tag>
@@ -69,6 +96,8 @@
6996
</distributionManagement>
7097

7198
<properties>
99+
<maven.compiler.source>1.8</maven.compiler.source>
100+
<maven.compiler.target>1.8</maven.compiler.target>
72101
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
73102
<jackrabbit.version>2.8.0</jackrabbit.version>
74103
</properties>
@@ -108,10 +137,41 @@
108137
<build>
109138
<pluginManagement>
110139
<plugins>
140+
<plugin>
141+
<groupId>org.apache.maven.plugins</groupId>
142+
<artifactId>maven-gpg-plugin</artifactId>
143+
<version>1.6</version>
144+
</plugin>
145+
<plugin>
146+
<groupId>com.mycila</groupId>
147+
<artifactId>license-maven-plugin</artifactId>
148+
<version>3.0</version>
149+
<configuration>
150+
<header>silverpeas-license.txt</header>
151+
<quiet>true</quiet>
152+
<excludes>
153+
<exclude>**/*.properties</exclude>
154+
<exclude>**/*.txt</exclude>
155+
</excludes>
156+
<encoding>UTF-8</encoding>
157+
</configuration>
158+
</plugin>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-jarsigner-plugin</artifactId>
162+
<version>1.4</version>
163+
</plugin>
111164
<plugin>
112165
<groupId>org.apache.maven.plugins</groupId>
113166
<artifactId>maven-release-plugin</artifactId>
114167
<version>2.5</version>
168+
<configuration>
169+
<localCheckout>true</localCheckout>
170+
<pushChanges>false</pushChanges>
171+
<autoVersionSubmodules>true</autoVersionSubmodules>
172+
<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
173+
<goals>deploy</goals>
174+
</configuration>
115175
</plugin>
116176
<plugin>
117177
<groupId>org.apache.maven.plugins</groupId>
@@ -135,4 +195,37 @@
135195
</plugins>
136196
</pluginManagement>
137197
</build>
198+
199+
<profiles>
200+
<profile>
201+
<id>release-sign-artifacts</id>
202+
<activation>
203+
<property>
204+
<name>performRelease</name>
205+
<value>true</value>
206+
</property>
207+
</activation>
208+
<build>
209+
<plugins>
210+
<plugin>
211+
<groupId>org.apache.maven.plugins</groupId>
212+
<artifactId>maven-gpg-plugin</artifactId>
213+
<executions>
214+
<execution>
215+
<id>sign-artifacts</id>
216+
<phase>verify</phase>
217+
<goals>
218+
<goal>sign</goal>
219+
</goals>
220+
</execution>
221+
</executions>
222+
</plugin>
223+
</plugins>
224+
</build>
225+
</profile>
226+
</profiles>
227+
228+
<prerequisites>
229+
<maven>3.2.5</maven>
230+
</prerequisites>
138231
</project>

‎silverpeas-license.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright (C) 2000 - 2017 Silverpeas
2+
3+
This program is free software: you can redistribute it and/or modify
4+
it under the terms of the GNU Affero General Public License as
5+
published by the Free Software Foundation, either version 3 of the
6+
License, or (at your option) any later version.
7+
8+
As a special exception to the terms and conditions of version 3.0 of
9+
the GPL, you may redistribute this Program in connection with Free/Libre
10+
Open Source Software ("FLOSS") applications as described in Silverpeas's
11+
FLOSS exception. You should have received a copy of the text describing
12+
the FLOSS exception, and it is also available here:
13+
"http://www.silverpeas.org/legal/licensing"
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <http://www.gnu.org/licenses/>.

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
/**
2-
* Copyright (C) 2000 - 2016 Silverpeas
2+
* Copyright (C) 2000 - 2017 Silverpeas
33
*
4-
* This program is free software: you can redistribute it and/or modify it under the terms of the
5-
* GNU Affero General Public License as published by the Free Software Foundation, either version 3
6-
* of the License, or (at your option) any later version.
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
78
*
89
* As a special exception to the terms and conditions of version 3.0 of
910
* the GPL, you may redistribute this Program in connection with Free/Libre
1011
* Open Source Software ("FLOSS") applications as described in Silverpeas's
1112
* FLOSS exception. You should have received a copy of the text describing
1213
* the FLOSS exception, and it is also available here:
13-
* "http://www.silverpeas.org/docs/core/legal/floss_exception.html"
14+
* "http://www.silverpeas.org/legal/licensing"
1415
*
15-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
16-
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Affero General Public License for more details.
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
1820
*
19-
* You should have received a copy of the GNU Affero General Public License along with this program.
20-
* If not, see <http://www.gnu.org/licenses/>.
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2123
*/
2224
package org.silverpeas.jcr;
2325

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

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
/*
2-
* Copyright (C) 2000 - 2016 Silverpeas
1+
/**
2+
* Copyright (C) 2000 - 2017 Silverpeas
33
*
4-
* This program is free software: you can redistribute it and/or modify it under the terms of the
5-
* GNU Affero General Public License as published by the Free Software Foundation, either version 3
6-
* of the License, or (at your option) any later version.
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
78
*
8-
* As a special exception to the terms and conditions of version 3.0 of the GPL, you may
9-
* redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
10-
* applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
11-
* text describing the FLOSS exception, and it is also available here:
12-
* "http://www.silverpeas.org/docs/core/legal/floss_exception.html"
9+
* As a special exception to the terms and conditions of version 3.0 of
10+
* the GPL, you may redistribute this Program in connection with Free/Libre
11+
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12+
* FLOSS exception. You should have received a copy of the text describing
13+
* the FLOSS exception, and it is also available here:
14+
* "http://www.silverpeas.org/legal/licensing"
1315
*
14-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
15-
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16-
* Affero General Public License for more details.
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
1720
*
18-
* You should have received a copy of the GNU Affero General Public License along with this program.
19-
* If not, see <http://www.gnu.org/licenses/>.
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2023
*/
21-
2224
package org.silverpeas.jcr.auth;
2325

2426
import org.silverpeas.jcr.jaas.SilverpeasJcrSystemPrincipal;

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

+17-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
/**
2-
* Copyright (C) 2000 - 2016 Silverpeas
2+
* Copyright (C) 2000 - 2017 Silverpeas
33
*
4-
* This program is free software: you can redistribute it and/or modify it under the terms of the
5-
* GNU Affero General Public License as published by the Free Software Foundation, either version 3
6-
* of the License, or (at your option) any later version.
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
78
*
8-
* As a special exception to the terms and conditions of version 3.0 of the GPL, you may
9-
* redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
10-
* applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
11-
* text describing the FLOSS exception, and it is also available here:
12-
* "http://www.silverpeas.org/docs/core/legal/floss_exception.html"
9+
* As a special exception to the terms and conditions of version 3.0 of
10+
* the GPL, you may redistribute this Program in connection with Free/Libre
11+
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12+
* FLOSS exception. You should have received a copy of the text describing
13+
* the FLOSS exception, and it is also available here:
14+
* "http://www.silverpeas.org/legal/licensing"
1315
*
14-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
15-
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16-
* Affero General Public License for more details.
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
1720
*
18-
* You should have received a copy of the GNU Affero General Public License along with this program.
19-
* If not, see <http://www.gnu.org/licenses/>.
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2023
*/
2124
package org.silverpeas.jcr.auth;
2225

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

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/**
2+
* Copyright (C) 2000 - 2017 Silverpeas
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
8+
*
9+
* As a special exception to the terms and conditions of version 3.0 of
10+
* the GPL, you may redistribute this Program in connection with Free/Libre
11+
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12+
* FLOSS exception. You should have received a copy of the text describing
13+
* the FLOSS exception, and it is also available here:
14+
* "http://www.silverpeas.org/legal/licensing"
15+
*
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
*/
124
package org.silverpeas.jcr.auth;
225

326
/**

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

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/**
2+
* Copyright (C) 2000 - 2017 Silverpeas
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
8+
*
9+
* As a special exception to the terms and conditions of version 3.0 of
10+
* the GPL, you may redistribute this Program in connection with Free/Libre
11+
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12+
* FLOSS exception. You should have received a copy of the text describing
13+
* the FLOSS exception, and it is also available here:
14+
* "http://www.silverpeas.org/legal/licensing"
15+
*
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
*/
124
package org.silverpeas.jcr.auth;
225

326
/**

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

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
/*
2-
* Copyright (C) 2000 - 2016 Silverpeas
1+
/**
2+
* Copyright (C) 2000 - 2017 Silverpeas
33
*
4-
* This program is free software: you can redistribute it and/or modify it under the terms of the
5-
* GNU Affero General Public License as published by the Free Software Foundation, either version 3
6-
* of the License, or (at your option) any later version.
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
78
*
8-
* As a special exception to the terms and conditions of version 3.0 of the GPL, you may
9-
* redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
10-
* applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
11-
* text describing the FLOSS exception, and it is also available here:
12-
* "http://www.silverpeas.org/docs/core/legal/floss_exception.html"
9+
* As a special exception to the terms and conditions of version 3.0 of
10+
* the GPL, you may redistribute this Program in connection with Free/Libre
11+
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12+
* FLOSS exception. You should have received a copy of the text describing
13+
* the FLOSS exception, and it is also available here:
14+
* "http://www.silverpeas.org/legal/licensing"
1315
*
14-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
15-
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16-
* Affero General Public License for more details.
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
1720
*
18-
* You should have received a copy of the GNU Affero General Public License along with this program.
19-
* If not, see <http://www.gnu.org/licenses/>.
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2023
*/
21-
2224
package org.silverpeas.jcr.auth;
2325

2426
import org.silverpeas.jcr.auth.encryption.PasswordEncryption;

0 commit comments

Comments
 (0)