Skip to content

Commit 8bf9a06

Browse files
committed
Feature #12866
Take into account the JCR is now provided by the Silverpeas JCR lib. Update in consequence the integration tests based upon the JCR.
1 parent 086cc1e commit 8bf9a06

File tree

14 files changed

+27
-13
lines changed

14 files changed

+27
-13
lines changed

community/community-library/src/integration-test/java/org/silverpeas/components/community/CommunityWarBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected <T> CommunityWarBuilder(final Class<T> test) {
4444
addMavenDependencies("org.silverpeas.core.services:silverpeas-core-comment");
4545
addMavenDependencies("org.silverpeas.core:silverpeas-core-test");
4646
addPackages(true, test.getPackageName());
47-
47+
addAsResource("silverpeas-oak.properties");
4848
addAsResource("org/silverpeas/jobStartPagePeas/settings/jobStartPagePeasSettings.properties");
4949
addAsResource("org/silverpeas/util/attachment/Attachment.properties");
5050
addAsResource("org/silverpeas/components/community/settings/communitySettings.properties");

community/community-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar,
98
jdk.unsupported
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#
2+
# Copyright (C) 2000 - 2022 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+
# "https://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 <https://www.gnu.org/licenses/>.
23+
#
24+
25+
storage = memory

delegatednews/delegatednews-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar
8+
jdk.unsupported

formsOnline/formsOnline-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar,
98
jdk.unsupported

forums/forums-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar,
98
jdk.unsupported

gallery/gallery-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar,
98
jdk.unsupported

infoLetter/infoLetter-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar,
98
jdk.unsupported

kmelia/kmelia-library/src/integration-test/resources/META-INF/test-MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ Dependencies: org.jboss.as.naming,
55
org.apache.xerces,
66
org.antlr,
77
org.apache.lucene-7,
8-
deployment.jackrabbit-jca.rar,
98
jdk.unsupported

mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/MailingListWarBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ protected <T> MailingListWarBuilder(final Class<T> test) {
4848
*/
4949
public static <T> MailingListWarBuilder onWarForTestClass(Class<T> test) {
5050
MailingListWarBuilder warBuilder = new MailingListWarBuilder(test);
51-
warBuilder.addMavenDependencies("javax.jcr:jcr");
5251
warBuilder.addMavenDependenciesWithPersistence("org.silverpeas.core:silverpeas-core");
5352
warBuilder.addMavenDependencies("org.silverpeas.core.services:silverpeas-core-tagcloud");
5453
warBuilder.addMavenDependencies("org.silverpeas.core.services:silverpeas-core-personalorganizer");

0 commit comments

Comments
 (0)