[exo-jcr-commits] exo-jcr SVN: r5719 - in jcr/branches/1.15.x: exo.jcr.component.core and 9 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 1 06:32:23 EST 2012
Author: andrew.plotnikov
Date: 2012-03-01 06:32:22 -0500 (Thu, 01 Mar 2012)
New Revision: 5719
Modified:
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/pom.xml
jcr/branches/1.15.x/exo.jcr.component.core/pom.xml
jcr/branches/1.15.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.15.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.15.x/exo.jcr.component.statistics/pom.xml
jcr/branches/1.15.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.15.x/exo.jcr.connectors.jca/pom.xml
jcr/branches/1.15.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.15.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.15.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.15.x/pom.xml
Log:
EXOJCR-1771: Checked the scope and the dependency list of each project
Modified: jcr/branches/1.15.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.component.core/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -396,6 +396,7 @@
<executions>
<execution>
<id>attach-sources</id>
+ <phase>generate-sources</phase>
<goals>
<goal>test-jar-no-fork</goal>
</goals>
@@ -454,7 +455,7 @@
<id>delete-sources</id>
<phase>process-sources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Remove files that have been customized</echo>
<delete>
<fileset dir="${project.build.directory}/generated-sources/javacc/org/exoplatform/services/jcr/impl/core/query">
@@ -465,7 +466,7 @@
<include name="xpath/SimpleNode.java" />
</fileset>
</delete>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -475,7 +476,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -490,7 +491,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -548,6 +549,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<!-- Generate java files from ANTLR grammar files
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -94,6 +94,43 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.database</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.spec.ee</groupId>
+ <artifactId>ow2-jta-1.1-spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>3.0.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
<!-- Excludes jboss-logging-spi since it is in conflict with the
latest version that is required by infinispan -->
<dependency>
@@ -250,7 +287,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -258,7 +295,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -273,7 +310,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -291,6 +328,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -148,6 +148,38 @@
<version>5.1.14</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -208,7 +240,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -223,7 +255,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -282,7 +314,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -297,7 +329,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ftp/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.component.ftp/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -63,11 +63,6 @@
<artifactId>exo.jcr.component.core</artifactId>
</dependency>
<dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.framework.command</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
@@ -84,6 +79,10 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -112,7 +111,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -127,7 +126,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: jcr/branches/1.15.x/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.statistics/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.component.statistics/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -42,11 +42,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.core</artifactId>
</dependency>
-
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
Modified: jcr/branches/1.15.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.webdav/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.component.webdav/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -87,10 +87,6 @@
<artifactId>xpp3</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
@@ -99,6 +95,22 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -124,7 +136,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -139,7 +151,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: jcr/branches/1.15.x/exo.jcr.connectors.jca/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.connectors.jca/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.connectors.jca/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -40,7 +40,40 @@
<groupId>javax.resource</groupId>
<artifactId>connector-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.spec.ee</groupId>
+ <artifactId>ow2-jta-1.1-spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<resources>
Modified: jcr/branches/1.15.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.framework.command/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.framework.command/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -77,6 +77,10 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -94,7 +98,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -109,7 +113,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: jcr/branches/1.15.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.framework.ftpclient/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.framework.ftpclient/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -38,8 +38,8 @@
<artifactId>exo.kernel.commons</artifactId>
</dependency>
<dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons.test</artifactId>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons.test</artifactId>
</dependency>
</dependencies>
<build>
@@ -76,7 +76,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -91,7 +91,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: jcr/branches/1.15.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.framework.web/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/exo.jcr.framework.web/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -73,6 +73,10 @@
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
Modified: jcr/branches/1.15.x/pom.xml
===================================================================
--- jcr/branches/1.15.x/pom.xml 2012-02-29 15:27:03 UTC (rev 5718)
+++ jcr/branches/1.15.x/pom.xml 2012-03-01 11:32:22 UTC (rev 5719)
@@ -234,7 +234,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -420,6 +420,38 @@
<version>3.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.ow2.spec.ee</groupId>
+ <artifactId>ow2-jta-1.1-spec</artifactId>
+ <version>1.0-M1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <version>1.0.1.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0-2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.7.6</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
More information about the exo-jcr-commits
mailing list