knguyen 2005/10/03 12:11:44 CEST
Modified files:
core project.properties project.xml
Log:
- move compass, lucene jars to jahia maven repo
- use slide from maven repo
Revision Changes Path
1.40 +0 -19 jahia/core/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.properties.diff?r1=1.39&r2=1.40&f=h
1.81 +11 -18 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.80&r2=1.81&f=h
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.properties,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- project.properties 1 Oct 2005 15:32:14 -0000 1.39
+++ project.properties 3 Oct 2005 10:11:44 -0000 1.40
@@ -43,24 +43,11 @@
maven.jar.pdfbox = ${basedir}/lib/PDFBox-0.6.7a-patched.jar
-
-maven.jar.cglib-full = ${basedir}/lib/cglib-full-2.0.2.jar
-
-maven.jar.compass-core = ${basedir}/lib/compass-core-0.6.0.jar
-maven.jar.compass-gps = ${basedir}/lib/compass-gps-0.6.0.jar
-maven.jar.compass-spring = ${basedir}/lib/compass-spring-0.6.0.jar
-maven.jar.compass-vocabulary = ${basedir}/lib/compass-vocabulary-0.6.0.jar
-
maven.jar.jsf-api = ${basedir}/lib/jsf-api-1.1.jar
maven.jar.jsf-impl = ${basedir}/lib/jsf-impl-1.1.jar
maven.jar.jackrabbit = ${basedir}/lib/jackrabbit-0.16.2-dev.jar
-#maven.jar.lucene = ${basedir}/lib/lucene-1.4-final.jar
-maven.jar.lucene-core = ${basedir}/lib/lucene-core-1.9-rc1-dev.jar
-maven.jar.lucene-snowball = ${basedir}/lib/lucene-snowball-1.9-rc1-dev.jar
-maven.jar.lucene-analyzers = ${basedir}/lib/lucene-analyzers-1.9-rc1-dev.jar
-
maven.jar.pdfbox = ${basedir}/lib/PDFBox-0.6.7a-patched.jar
maven.jar.poi = ${basedir}/lib/poi-2.5-final-20040428.jar
@@ -74,12 +61,6 @@
maven.jar.fastmd5 = ${basedir}/lib/fastmd5-2.6.jar
-maven.jar.slide-kernel = ${basedir}/lib/slide-kernel-2.2pre1.jar
-maven.jar.slide-roles = ${basedir}/lib/slide-roles-2.2pre1.jar
-maven.jar.slide-stores = ${basedir}/lib/slide-stores-2.2pre1.jar
-maven.jar.jakarta-slide-webdavlib =
${basedir}/lib/jakarta-slide-webdavlib-2.2pre1.jar
-maven.jar.slide-webdavservlet =
${basedir}/lib/slide-webdavservlet-2.2pre1.jar
-maven.jar.slide-log4jlogger = ${basedir}/lib/slide-log4jlogger-2.2pre1.jar
# Set to true if you want JSP precompilation to happen after war:webapp goal
precompile.jsp=false
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- project.xml 1 Oct 2005 15:32:14 -0000 1.80
+++ project.xml 3 Oct 2005 10:11:44 -0000 1.81
@@ -90,14 +90,6 @@
</properties>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- <version>2.0.2</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
@@ -253,15 +245,16 @@
</dependency>
<dependency>
<groupId>compass</groupId>
- <id>compass-core</id>
+ <artifactId>compass-core</artifactId>
<version>0.6.0</version>
+ <url>http://maven.jahia.org/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>compass</groupId>
- <id>compass-gps</id>
+ <artifactId>compass-gps</artifactId>
<version>0.6.0</version>
<properties>
<war.bundle>true</war.bundle>
@@ -269,7 +262,7 @@
</dependency>
<dependency>
<groupId>compass</groupId>
- <id>compass-spring</id>
+ <artifactId>compass-spring</artifactId>
<version>0.6.0</version>
<properties>
<war.bundle>true</war.bundle>
@@ -277,7 +270,7 @@
</dependency>
<dependency>
<groupId>compass</groupId>
- <id>compass-vocabulary</id>
+ <artifactId>compass-vocabulary</artifactId>
<version>0.6.0</version>
<properties>
<war.bundle>true</war.bundle>
@@ -708,7 +701,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>slide-kernel</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -717,7 +710,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>slide-roles</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -726,7 +719,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>slide-stores</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -735,7 +728,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>jakarta-slide-webdavlib</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -744,7 +737,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>slide-webdavservlet</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -752,7 +745,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>slide-log4jlogger</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
