Skip to content

Commit e9c330e

Browse files
gasparez15gasparez15
committed
Removed not used jackabbit dependencies
1 parent 0c678f6 commit e9c330e

File tree

4 files changed

+20
-52
lines changed

4 files changed

+20
-52
lines changed

‎logicaldoc-webdav/build.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
<include name="**/context-webservice.xml" />
7070
-->
7171
<include name="**/ResourceServiceImpl*.class" />
72+
<include name="**/DavResourceImpl*.class" />
73+
<include name="**/AbstractWebdavServlet*.class" />
7274
</fileset>
7375
</copy>
7476
</sequential>

‎logicaldoc-webdav/pom.xml‎

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,11 @@
2525
<version>2.5</version>
2626
<scope>provided</scope>
2727
</dependency>
28-
29-
<!-- <dependency>
30-
<groupId>org.apache.jackrabbit</groupId>
31-
<artifactId>jackrabbit-jcr-commons</artifactId>
32-
<version>${jackrabbit.version}</version>
33-
</dependency>-->
3428
<dependency>
3529
<groupId>org.apache.jackrabbit</groupId>
36-
<artifactId>jackrabbit-webdav</artifactId>
30+
<artifactId>jackrabbit-jcr-commons</artifactId>
3731
<version>${jackrabbit.version}</version>
3832
</dependency>
39-
<!--
4033
<dependency>
4134
<groupId>org.apache.jackrabbit</groupId>
4235
<artifactId>jackrabbit-jcr-server</artifactId>
@@ -47,45 +40,12 @@
4740
<artifactId>tika-core</artifactId>
4841
</exclusion>
4942
</exclusions>
50-
</dependency>
51-
-->
52-
<dependency>
53-
<groupId>org.apache.jackrabbit</groupId>
54-
<artifactId>jackrabbit-webapp</artifactId>
55-
<version>${jackrabbit.version}</version>
56-
<exclusions>
57-
<exclusion>
58-
<groupId>org.apache.tika</groupId>
59-
<artifactId>tika-parsers</artifactId>
60-
</exclusion>
61-
<exclusion>
62-
<groupId>org.apache.tika</groupId>
63-
<artifactId>tika-core</artifactId>
64-
</exclusion>
65-
<exclusion>
66-
<groupId>ch.qos.logback</groupId>
67-
<artifactId>logback-classic</artifactId>
68-
</exclusion>
69-
</exclusions>
70-
</dependency>
71-
72-
<!-- Evaluate -->
73-
<!-- <dependency>
74-
<groupId>org.apache.jackrabbit</groupId>
75-
<artifactId>jackrabbit-core</artifactId>
76-
<version>${jackrabbit.version}</version>
7743
</dependency>
7844
<dependency>
7945
<groupId>org.apache.jackrabbit</groupId>
80-
<artifactId>jackrabbit-data</artifactId>
81-
<version>${jackrabbit.version}</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.apache.jackrabbit</groupId>
85-
<artifactId>jackrabbit-jcr-servlet</artifactId>
46+
<artifactId>jackrabbit-webdav</artifactId>
8647
<version>${jackrabbit.version}</version>
87-
</dependency>
88-
-->
48+
</dependency>
8949
<dependency>
9050
<groupId>org.slf4j</groupId>
9151
<artifactId>slf4j-api</artifactId>
@@ -200,22 +160,20 @@
200160
<repositories>
201161
<repository>
202162
<id>central</id>
203-
<name>Central Repository</name>
163+
<name>Central Repository</name>
204164
<url>https://repo1.maven.org/maven2/</url>
205165
</repository>
206166
<repository>
207167
<id>mulesoft-public</id>
208168
<name>Mulesoft Repository</name>
209-
<url>
210-
https://repository.mulesoft.org/nexus/content/repositories/public/</url>
211-
</repository>
169+
<url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
170+
</repository>
212171
<repository>
213172
<id>logicaldoc</id>
214173
<name>LogicalDOC Repository</name>
215174
<url>http://logicaldoc.sourceforge.net/maven</url>
216-
</repository>
217-
218-
</repositories>
175+
</repository>
176+
</repositories>
219177

220178
<build>
221179
<plugins>

‎logicaldoc-webdav/src/test/java/com/logicaldoc/webdav/web/WebdavServletTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
import javax.servlet.http.HttpServletResponse;
1212

13+
import org.apache.commons.lang3.StringUtils;
1314
import org.apache.jackrabbit.webdav.DavConstants;
1415
import org.apache.jackrabbit.webdav.DavMethods;
15-
import org.eclipse.jetty.util.StringUtil;
1616
import org.junit.Test;
1717

1818
import com.logicaldoc.core.PersistenceException;
@@ -317,7 +317,7 @@ public void testPROPFIND() throws IOException {
317317
File tempFile = FileUtil.createTempFile("webdav", ".xml");
318318
try {
319319
String responseBody = callPROPFIND();
320-
assertFalse(StringUtil.isEmpty(responseBody));
320+
assertFalse(StringUtils.isEmpty(responseBody));
321321
assertTrue(responseBody.contains(PREFIX + "/one.pdf"));
322322
assertTrue(responseBody.contains(PREFIX + "/folder6"));
323323
} finally {

‎logicaldoc-webdav/test-addopens.bat‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
rem java -XX:+IgnoreUnrecognizedVMOptions --add-opens=java.activation/*=ALL-UNNAMED --add-opens=java.transaction/*=ALL-UNNAMED --add-opens=java.xml.ws.annotation/*=ALL-UNNAMED --add-opens=java.xml.ws/*=ALL-UNNAMED --add-opens=java.xml.bind/*=ALL-UNNAMED --add-opens=java.corba/*=ALL-UNNAMED -jar logicaldoc-installer.jar
2+
3+
rem SET ANT_OPTS="--add-modules java.util"
4+
rem SET ANT_OPTS="--add-opens=java.util"
5+
SET ANT_OPTS=
6+
7+
SET JDK_JAVA_OPTIONS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
8+
mvn test

0 commit comments

Comments
 (0)