Revision 1cd65199
.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath
/lib : added ignore for cdm-server jar
CacheLoader : reverted update of cached entity field
cdmlib-remote-webapp.war : updated to latest version
eu.etaxonomy.taxeditor.cdmlib/pom.xml | ||
---|---|---|
39 | 39 |
cdmlib-remote-webapp |
40 | 40 |
</excludeArtifactIds> |
41 | 41 |
<includeArtifactIds> |
42 |
cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote |
|
42 |
cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdm-server
|
|
43 | 43 |
</includeArtifactIds> |
44 | 44 |
<outputDirectory>${basedir}/lib</outputDirectory> |
45 | 45 |
<overWriteReleases>true</overWriteReleases> |
... | ... | |
105 | 105 |
<move todir="./lib"> |
106 | 106 |
<fileset dir="./lib" /> |
107 | 107 |
<mapper type="regexp" |
108 |
from="(^cdm\-server\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" |
|
109 |
to="\1SNAPSHOT\2" /> |
|
110 |
</move> |
|
111 |
<move todir="./lib"> |
|
112 |
<fileset dir="./lib" /> |
|
113 |
<mapper type="regexp" |
|
108 | 114 |
from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" |
109 | 115 |
to="\1SNAPSHOT\2" /> |
110 | 116 |
</move> |
117 |
<move todir="./lib"> |
|
118 |
<fileset dir="./lib" /> |
|
119 |
<mapper type="regexp" |
|
120 |
from="(^cdm\-server\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" |
|
121 |
to="\1SNAPSHOT\2" /> |
|
122 |
</move> |
|
111 | 123 |
</target> |
112 | 124 |
</configuration> |
113 | 125 |
</execution> |
... | ... | |
224 | 236 |
</dependency> |
225 | 237 |
<dependency> |
226 | 238 |
<groupId>eu.etaxonomy</groupId> |
239 |
<artifactId>cdm-server</artifactId> |
|
240 |
<version>3.5.2-SNAPSHOT</version> |
|
241 |
</dependency> |
|
242 |
<dependency> |
|
243 |
<groupId>eu.etaxonomy</groupId> |
|
227 | 244 |
<artifactId>cdmlib-commons</artifactId> |
228 | 245 |
<version>${cdmlib.version}</version> |
229 | 246 |
</dependency> |
... | ... | |
534 | 551 |
</dependency> |
535 | 552 |
|
536 | 553 |
<!-- For Unit Tests Start --> |
537 |
|
|
554 |
|
|
538 | 555 |
<dependency> |
539 | 556 |
<groupId>org.unitils</groupId> |
540 | 557 |
<artifactId>unitils-core</artifactId> |
Also available in: Unified diff