Updated Branches: refs/heads/master a5cbba599 -> 02d698788
DELTASPIKE-394 Cleaning out data module POMs Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/02d69878 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/02d69878 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/02d69878 Branch: refs/heads/master Commit: 02d6987886075a42bf2bba9d46aa3424c92ca9c9 Parents: a5cbba5 Author: Thomas Hug <[email protected]> Authored: Wed Jul 17 21:29:14 2013 +0200 Committer: Thomas Hug <[email protected]> Committed: Wed Jul 17 21:29:14 2013 +0200 ---------------------------------------------------------------------- deltaspike/modules/data/api/pom.xml | 26 ++----- deltaspike/modules/data/impl/pom.xml | 98 ++------------------------ deltaspike/modules/data/pom.xml | 113 +----------------------------- 3 files changed, 10 insertions(+), 227 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/02d69878/deltaspike/modules/data/api/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/api/pom.xml b/deltaspike/modules/data/api/pom.xml index 9e20112..1c449dd 100755 --- a/deltaspike/modules/data/api/pom.xml +++ b/deltaspike/modules/data/api/pom.xml @@ -19,7 +19,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.deltaspike.modules</groupId> <artifactId>data-module-project</artifactId> @@ -31,10 +31,6 @@ <name>Apache DeltaSpike Data-Module API</name> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <properties> <deltaspike.osgi.export.pkg> org.apache.deltaspike.data.* @@ -49,29 +45,15 @@ <dependencies> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> </dependency> <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-api</artifactId> - <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.deltaspike.modules</groupId> <artifactId>deltaspike-partial-bean-module-api</artifactId> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/02d69878/deltaspike/modules/data/impl/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml index f9c55de..926d89c 100755 --- a/deltaspike/modules/data/impl/pom.xml +++ b/deltaspike/modules/data/impl/pom.xml @@ -32,10 +32,6 @@ <name>Apache DeltaSpike Data-Module Impl</name> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <properties> <deltaspike.osgi.export.pkg> org.apache.deltaspike.data.impl.* @@ -48,11 +44,6 @@ </properties> <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> <pluginManagement> <plugins> <plugin> @@ -97,28 +88,13 @@ <dependencies> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <scope>provided</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.components</groupId> - <artifactId>geronimo-transaction</artifactId> - <version>3.1.1</version> - <scope>provided</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> </dependency> <dependency> @@ -128,23 +104,12 @@ <dependency> <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-partial-bean-module-api</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> <artifactId>deltaspike-partial-bean-module-impl</artifactId> <scope>runtime</scope> </dependency> @@ -152,18 +117,6 @@ <!-- Tests --> <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> <scope>test</scope> @@ -222,50 +175,7 @@ <directory>src/test/resources-openejb</directory> </testResource> </testResources> - <plugins> - <plugin> - <groupId>org.bsc.maven</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>2.0.7</version> - <executions> - <execution> - <id>process-test</id> - <goals> - <goal>process-test</goal> - </goals> - <phase>generate-test-sources</phase> - </execution> - </executions> - <configuration combine.self="override"> - <processors> - <processor>org.apache.openjpa.persistence.meta.AnnotationProcessor6</processor> - </processors> - <compilerArguments>-Aopenjpa.metamodel=true -Aopenjpa.log=TRACE</compilerArguments> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence</artifactId> - <version>2.2.2</version> - </dependency> - </dependencies> - </plugin> - </plugins> </build> - <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence</artifactId> - <version>2.2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.2.5</version> - <scope>test</scope> - </dependency> - </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/02d69878/deltaspike/modules/data/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/pom.xml b/deltaspike/modules/data/pom.xml index 22ac5a7..3297c15 100755 --- a/deltaspike/modules/data/pom.xml +++ b/deltaspike/modules/data/pom.xml @@ -30,111 +30,19 @@ <packaging>pom</packaging> <name>Apache DeltaSpike Data-Module</name> - <developers> - <developer> - <name>Thomas Hug</name> - <email>[email protected]</email> - </developer> - <developer> - <name>Bartosz Majsak</name> - <email>[email protected]</email> - </developer> - </developers> - <modules> <module>api</module> <module>impl</module> </modules> <properties> - <jdk.source>1.6</jdk.source> - <jdk.target>1.6</jdk.target> - <shrinkwrap.version>2.0.0-beta-3</shrinkwrap.version> + <shrinkwrap.version>2.0.0</shrinkwrap.version> </properties> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${jdk.source}</source> - <target>${jdk.target}</target> - </configuration> - </plugin> - - </plugins> - </build> - - <repositories> - <repository> - <id>apache.snapshots</id> - <url>http://repository.apache.org/snapshots</url> - </repository> - </repositories> - <dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-data-module-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-data-module-impl</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-impl</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-partial-bean-module-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-partial-bean-module-impl</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.0.Final</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.0-SP4</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <version>1.0.2.Final</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-bom</artifactId> <version>${shrinkwrap.version}</version> @@ -146,28 +54,11 @@ <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> <version>${shrinkwrap.version}</version> + <scope>test</scope> </dependency> </dependencies> </dependencyManagement> - <profiles> - <profile> - <id>tomee-build-managed</id> - </profile> - <profile> - <id>jbossas-build-managed-7</id> - </profile> - <profile> - <id>jbossas-remote-7</id> - </profile> - <profile> - <id>glassfish-remote-3.1</id> - </profile> - <profile> - <id>OWB</id> - </profile> - </profiles> - </project>
