diff options
author | mcculls <mcculls@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-10-21 23:36:09 +0000 |
---|---|---|
committer | mcculls <mcculls@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-10-21 23:36:09 +0000 |
commit | bc7e1502d9e9a673b67fed3a459e714202585e8b (patch) | |
tree | 3e7c62a792a13a403234fd39818ba64104dfcd5f /extensions | |
parent | ac4cdbe137274fd83a7e8e7100653f261618eb94 (diff) | |
download | guice-bc7e1502d9e9a673b67fed3a459e714202585e8b.tar.gz |
Issue 552: add buildable maven poms
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1305 d779f126-a31b-0410-b53b-1d3aecad763e
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/assistedinject/pom.xml | 23 | ||||
-rw-r--r-- | extensions/grapher/pom.xml | 32 | ||||
-rw-r--r-- | extensions/jmx/pom.xml | 21 | ||||
-rw-r--r-- | extensions/jndi/pom.xml | 21 | ||||
-rw-r--r-- | extensions/mini/pom.xml | 16 | ||||
-rw-r--r-- | extensions/multibindings/pom.xml | 21 | ||||
-rw-r--r-- | extensions/persist/pom.xml | 53 | ||||
-rw-r--r-- | extensions/pom.xml | 86 | ||||
-rw-r--r-- | extensions/service/pom.xml | 27 | ||||
-rw-r--r-- | extensions/servlet/pom.xml | 27 | ||||
-rw-r--r-- | extensions/spring/pom.xml | 21 | ||||
-rw-r--r-- | extensions/struts2/pom.xml | 30 | ||||
-rw-r--r-- | extensions/throwingproviders/pom.xml | 23 |
13 files changed, 238 insertions, 163 deletions
diff --git a/extensions/assistedinject/pom.xml b/extensions/assistedinject/pom.xml index c2a543a0..745d6b41 100644 --- a/extensions/assistedinject/pom.xml +++ b/extensions/assistedinject/pom.xml @@ -1,21 +1,16 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> - <artifactId>guice-assisted-inject</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Assisted Inject</name> - <description>An easier way to help the Guice Injector build objects</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> - <dependencies> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - </dependencies> + + <artifactId>guice-assistedinject</artifactId> + + <name>Google Guice - Extensions - AssistedInject</name> + </project> diff --git a/extensions/grapher/pom.xml b/extensions/grapher/pom.xml index 5c94020f..015db569 100644 --- a/extensions/grapher/pom.xml +++ b/extensions/grapher/pom.xml @@ -1,21 +1,35 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-grapher</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Grapher</name> - <description>A tool to visualize Guice applications</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> + + <name>Google Guice - Extensions - Grapher</name> + <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-assistedinject</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.0</version> + <scope>test</scope> </dependency> </dependencies> + </project> diff --git a/extensions/jmx/pom.xml b/extensions/jmx/pom.xml index 7a28ecff..d8188cac 100644 --- a/extensions/jmx/pom.xml +++ b/extensions/jmx/pom.xml @@ -1,21 +1,16 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-jmx</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: JMX</name> - <description>Tools for using Guice with Java Management Extensions</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> - <dependencies> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - </dependencies> + + <name>Google Guice - Extensions - JMX</name> + </project> diff --git a/extensions/jndi/pom.xml b/extensions/jndi/pom.xml index fc0dd9f0..ff04c5fb 100644 --- a/extensions/jndi/pom.xml +++ b/extensions/jndi/pom.xml @@ -1,21 +1,16 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-jndi</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: JNDI</name> - <description>Tools for using Guice with the Java Naming and Directory Interface</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> - <dependencies> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - </dependencies> + + <name>Google Guice - Extensions - JNDI</name> + </project> diff --git a/extensions/mini/pom.xml b/extensions/mini/pom.xml new file mode 100644 index 00000000..3fa70324 --- /dev/null +++ b/extensions/mini/pom.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> + <artifactId>extensions-parent</artifactId> + <version>3.0-SNAPSHOT</version> + </parent> + + <artifactId>guice-mini</artifactId> + + <name>Google Guice - Extensions - Mini</name> + +</project> diff --git a/extensions/multibindings/pom.xml b/extensions/multibindings/pom.xml index 55a2fd8e..b49283c3 100644 --- a/extensions/multibindings/pom.xml +++ b/extensions/multibindings/pom.xml @@ -1,21 +1,16 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-multibindings</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Multibindings</name> - <description>Tools injecting collections of bound values</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> - <dependencies> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - </dependencies> + + <name>Google Guice - Extensions - MultiBindings</name> + </project> diff --git a/extensions/persist/pom.xml b/extensions/persist/pom.xml index 1815bc01..92c8e9a6 100644 --- a/extensions/persist/pom.xml +++ b/extensions/persist/pom.xml @@ -1,36 +1,59 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-persist</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Persist</name> - <description>Tools for integrating with JPA</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> + + <name>Google Guice - Extensions - Persist</name> + <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> <version>1.0</version> </dependency> - - <!-- guice-persist depends on guice-servlet to implement request-scoped units of work. --> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-servlet</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb-j5</artifactId> + <version>2.0.0</version> + <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/DynamicFinderTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/extensions/pom.xml b/extensions/pom.xml index 0958e869..d64fae75 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -1,41 +1,65 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject</groupId> <artifactId>guice-parent</artifactId> <version>3.0-SNAPSHOT</version> - <relativePath>../guice-parent/pom.xml</relativePath> </parent> + + <packaging>pom</packaging> + <groupId>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> - <packaging>pom</packaging> + <name>Google Guice - Extensions</name> - <description>A collection of extensions to Guice</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assisted-inject</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-servlet</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - </dependencies> - </dependencyManagement> + + <modules> + <module>assistedinject</module> + <module>grapher</module> + <module>jmx</module> + <module>jndi</module> + <module>multibindings</module> + <module>persist</module> + <module>servlet</module> + <module>spring</module> + <module>struts2</module> + <module>throwingproviders</module> +<!-- + <module>mini</module> + <module>service</module> +--> + </modules> + + <dependencies> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Fragment-Host>com.google.inject</Fragment-Host> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + </project> diff --git a/extensions/service/pom.xml b/extensions/service/pom.xml new file mode 100644 index 00000000..71dfecef --- /dev/null +++ b/extensions/service/pom.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> + <artifactId>extensions-parent</artifactId> + <version>3.0-SNAPSHOT</version> + </parent> + + <artifactId>guice-service</artifactId> + + <name>Google Guice - Extensions - Service</name> + + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml index 14aabfe6..2f885467 100644 --- a/extensions/servlet/pom.xml +++ b/extensions/servlet/pom.xml @@ -1,25 +1,30 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-servlet</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Servlet</name> - <description>Guice integration with servlets</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> + + <name>Google Guice - Extensions - Servlet</name> + <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.0</version> + <scope>test</scope> </dependency> </dependencies> + </project> diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index 6d37f497..c0fc7a5e 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -1,26 +1,23 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> + <artifactId>guice-spring</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Spring</name> - <description>Guice integration with the Spring container</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> + + <name>Google Guice - Extensions - Spring</name> + <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>2.0.6</version> </dependency> </dependencies> + </project> diff --git a/extensions/struts2/pom.xml b/extensions/struts2/pom.xml index 162ae0fd..6c6bc27b 100644 --- a/extensions/struts2/pom.xml +++ b/extensions/struts2/pom.xml @@ -1,35 +1,29 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> - <artifactId>guice-struts2-plugin</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Struts2 Plugin</name> - <description>Guice integration with Struts2 as a plugin</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> + + <artifactId>guice-struts2</artifactId> + + <name>Google Guice - Extensions - Struts2</name> + <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-servlet</artifactId> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>xwork</artifactId> - <version>2.0.0</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>2.0.5</version> + <version>2.2.1</version> </dependency> </dependencies> + </project> diff --git a/extensions/throwingproviders/pom.xml b/extensions/throwingproviders/pom.xml index 83bac698..bd671588 100644 --- a/extensions/throwingproviders/pom.xml +++ b/extensions/throwingproviders/pom.xml @@ -1,21 +1,16 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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>com.google.inject.extensions</groupId> <artifactId>extensions-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> - <artifactId>guice-throwing-providers</artifactId> - <packaging>jar</packaging> - <name>Google Guice - Extension: Throwing Providers</name> - <description>Providers that throw checked exceptions</description> - <!-- Note: this pom is for dependency management only. It will not build the project --> - <dependencies> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - </dependencies> + + <artifactId>guice-throwingproviders</artifactId> + + <name>Google Guice - Extensions - ThrowingProviders</name> + </project> |