Skip to content

Commit fa8672f

Browse files
mmoquimmoqui
committed
Base upon Jackrabbit 2.18.1 and hence on Silverpea JCR access controller 1.2-build190503
1 parent 0e55ebd commit fa8672f

File tree

1 file changed

+103
-38
lines changed

1 file changed

+103
-38
lines changed

‎pom.xml

+103-38
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.silverpeas.jcr</groupId>
2626
<artifactId>jackrabbit-jca</artifactId>
2727
<packaging>rar</packaging>
28-
<version>2.16.3-SNAPSHOT</version>
28+
<version>2.18.1-SNAPSHOT</version>
2929
<name>Jackrabbit JCA Resource Adapter</name>
3030
<url>http://www.silverpeas.org</url>
3131

@@ -76,17 +76,22 @@
7676

7777
<properties>
7878
<!-- property used by the CI to both deploy a build version and release the next stable version -->
79-
<next.release>2.16.3</next.release>
79+
<next.release>2.18.1</next.release>
8080
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
81-
<jackrabbit.version>2.16.3</jackrabbit.version>
82-
<tika.version>1.18</tika.version>
83-
<silverpeas-jca.version>1.2-build180829</silverpeas-jca.version>
81+
<jackrabbit.version>2.18.1</jackrabbit.version>
82+
<tika.version>1.20</tika.version>
83+
<silverpeas-jca.version>1.2-build190503</silverpeas-jca.version>
8484
</properties>
8585

8686
<build>
8787
<finalName>${project.artifactId}</finalName>
8888
<pluginManagement>
8989
<plugins>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-rar-plugin</artifactId>
93+
<version>2.4</version>
94+
</plugin>
9095
<plugin>
9196
<groupId>org.apache.maven.plugins</groupId>
9297
<artifactId>maven-gpg-plugin</artifactId>
@@ -99,10 +104,24 @@
99104
<plugin>
100105
<groupId>org.apache.maven.plugins</groupId>
101106
<artifactId>maven-jarsigner-plugin</artifactId>
102-
<version>1.4</version>
107+
<version>3.0.0</version>
103108
</plugin>
104109
</plugins>
105110
</pluginManagement>
111+
<plugins>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-rar-plugin</artifactId>
115+
<configuration>
116+
<archive>
117+
<index>true</index>
118+
<manifestEntries>
119+
<Dependencies>org.apache.xerces, org.apache.commons.lang3, org.slf4j</Dependencies>
120+
</manifestEntries>
121+
</archive>
122+
</configuration>
123+
</plugin>
124+
</plugins>
106125
</build>
107126

108127
<dependencies>
@@ -116,6 +135,7 @@
116135
<artifactId>access-control</artifactId>
117136
<version>${silverpeas-jca.version}</version>
118137
</dependency>
138+
<!-- Excludes the Tika dependencies to specify our own version of them (more recent) -->
119139
<dependency>
120140
<groupId>org.apache.jackrabbit</groupId>
121141
<artifactId>jackrabbit-jca</artifactId>
@@ -134,6 +154,26 @@
134154
<groupId>org.apache.derby</groupId>
135155
<artifactId>derby</artifactId>
136156
</exclusion>
157+
<exclusion>
158+
<groupId>org.apache.httpcomponents</groupId>
159+
<artifactId>httpcore</artifactId>
160+
</exclusion>
161+
<exclusion>
162+
<groupId>org.apache.httpcomponents</groupId>
163+
<artifactId>httpclient</artifactId>
164+
</exclusion>
165+
<exclusion>
166+
<groupId>org.apache.httpcomponents</groupId>
167+
<artifactId>httpmime</artifactId>
168+
</exclusion>
169+
<exclusion>
170+
<groupId>org.slf4j</groupId>
171+
<artifactId>slf4j-api</artifactId>
172+
</exclusion>
173+
<exclusion>
174+
<groupId>org.slf4j</groupId>
175+
<artifactId>jcl-over-slf4j</artifactId>
176+
</exclusion>
137177
</exclusions>
138178
</dependency>
139179
<dependency>
@@ -149,73 +189,98 @@
149189
<groupId>commons-fileupload</groupId>
150190
<artifactId>commons-fileupload</artifactId>
151191
</exclusion>
192+
<exclusion>
193+
<groupId>org.apache.httpcomponents</groupId>
194+
<artifactId>httpcore</artifactId>
195+
</exclusion>
152196
<exclusion>
153197
<groupId>org.apache.httpcomponents</groupId>
154198
<artifactId>httpclient</artifactId>
155199
</exclusion>
200+
<exclusion>
201+
<groupId>org.apache.httpcomponents</groupId>
202+
<artifactId>httpmime</artifactId>
203+
</exclusion>
204+
<exclusion>
205+
<groupId>org.slf4j</groupId>
206+
<artifactId>slf4j-api</artifactId>
207+
</exclusion>
208+
<exclusion>
209+
<groupId>org.slf4j</groupId>
210+
<artifactId>jcl-over-slf4j</artifactId>
211+
</exclusion>
156212
</exclusions>
157213
</dependency>
214+
<!-- We define our own version of Tika. But we exclude some of its dependencies to specify our
215+
own version of them (more recent) -->
216+
<dependency>
217+
<groupId>org.apache.tika</groupId>
218+
<artifactId>tika-core</artifactId>
219+
<version>1.20</version>
220+
</dependency>
158221
<dependency>
159222
<groupId>org.apache.tika</groupId>
160223
<artifactId>tika-parsers</artifactId>
161224
<version>${tika.version}</version>
162225
<exclusions>
163226
<exclusion>
164-
<groupId>com.drewnoakes</groupId>
165-
<artifactId>metadata-extractor</artifactId>
227+
<groupId>com.rometools</groupId>
228+
<artifactId>rome</artifactId>
166229
</exclusion>
167230
<exclusion>
168-
<groupId>commons-logging</groupId>
169-
<artifactId>commons-logging</artifactId>
231+
<groupId>org.jdom</groupId>
232+
<artifactId>jdom2</artifactId>
170233
</exclusion>
171234
<exclusion>
172-
<groupId>org.apache.james</groupId>
173-
<artifactId>apache-mime4j-core</artifactId>
235+
<groupId>de.l3s.boilerpipe</groupId>
236+
<artifactId>boilerpipe</artifactId>
174237
</exclusion>
175238
<exclusion>
176-
<groupId>org.apache.james</groupId>
177-
<artifactId>apache-mime4j-dom</artifactId>
239+
<groupId>org.apache.commons</groupId>
240+
<artifactId>commons-lang3</artifactId>
178241
</exclusion>
179242
<exclusion>
180-
<groupId>de.l3s.boilerpipe</groupId>
181-
<artifactId>boilerpipe</artifactId>
243+
<groupId>com.fasterxml.jackson.core</groupId>
244+
<artifactId>jackson-core</artifactId>
182245
</exclusion>
183246
<exclusion>
184-
<groupId>org.ow2.asm</groupId>
185-
<artifactId>asm-debug-all</artifactId>
247+
<groupId>com.fasterxml.jackson.core</groupId>
248+
<artifactId>jackson-databind</artifactId>
186249
</exclusion>
187250
<exclusion>
188-
<groupId>edu.ucar</groupId>
189-
<artifactId>netcdf</artifactId>
251+
<groupId>com.fasterxml.jackson.core</groupId>
252+
<artifactId>jackson-annotations</artifactId>
190253
</exclusion>
191254
<exclusion>
192-
<groupId>com.rometools</groupId>
193-
<artifactId>rome</artifactId>
255+
<groupId>javax.annotation</groupId>
256+
<artifactId>javax.annotation-api</artifactId>
194257
</exclusion>
195258
<exclusion>
196-
<groupId>org.quartz-scheduler0</groupId>
197-
<artifactId>quartz</artifactId>
259+
<groupId>com.sun.activation</groupId>
260+
<artifactId>javax.activation</artifactId>
198261
</exclusion>
199262
<exclusion>
200-
<groupId>com.uwyn</groupId>
201-
<artifactId>jhighlight</artifactId>
263+
<groupId>org.glassfish.jaxb</groupId>
264+
<artifactId>jaxb-runtime</artifactId>
202265
</exclusion>
203266
<exclusion>
204-
<groupId>org.apache.httpcomponents</groupId>
205-
<artifactId>httpcore</artifactId>
267+
<groupId>org.apache.cxf</groupId>
268+
<artifactId>cxf-rt-rs-client</artifactId>
269+
</exclusion>
270+
<exclusion>
271+
<groupId>org.slf4j</groupId>
272+
<artifactId>slf4j-api</artifactId>
273+
</exclusion>
274+
<exclusion>
275+
<groupId>org.slf4j</groupId>
276+
<artifactId>jul-to-slf4j </artifactId>
277+
</exclusion>
278+
<exclusion>
279+
<groupId>org.slf4j</groupId>
280+
<artifactId>jcl-over-slf4j</artifactId>
206281
</exclusion>
207282
</exclusions>
208283
</dependency>
209-
<dependency>
210-
<groupId>com.drewnoakes</groupId>
211-
<artifactId>metadata-extractor</artifactId>
212-
<version>2.10.1</version>
213-
</dependency>
214-
<dependency>
215-
<groupId>org.apache.httpcomponents</groupId>
216-
<artifactId>httpclient</artifactId>
217-
<version>4.5.5</version>
218-
</dependency>
219284
</dependencies>
220285

221286
<profiles>

0 commit comments

Comments
 (0)