Revision: 1199
Author: [email protected]
Date: Sun Aug 1 12:49:16 2010
Log: Merge 2.0-maven branch into trunk.
http://code.google.com/p/google-guice/source/detail?r=1199
Added:
/trunk/extensions/assistedinject/pom.xml
/trunk/extensions/grapher/pom.xml
/trunk/extensions/jmx/pom.xml
/trunk/extensions/jndi/pom.xml
/trunk/extensions/multibindings/pom.xml
/trunk/extensions/pom.xml
/trunk/extensions/throwingproviders/pom.xml
/trunk/guice-parent
/trunk/servlet/pom.xml
/trunk/spring/pom.xml
/trunk/struts2/plugin/pom.xml
Modified:
/trunk
/trunk/pom.xml
Replaced:
/trunk/guice-parent/pom.xml
=======================================
--- /dev/null
+++ /trunk/extensions/assistedinject/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,21 @@
+<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>2.0</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>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/grapher/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,21 @@
+<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>2.0</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 -->
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/jmx/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,21 @@
+<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>2.0</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>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/jndi/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,21 @@
+<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>2.0</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>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/multibindings/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,21 @@
+<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>2.0</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>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice-parent</artifactId>
+ <version>2.0</version>
+ </parent>
+ <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-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>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/throwingproviders/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,21 @@
+<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>2.0</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>
+</project>
=======================================
--- /dev/null
+++ /trunk/servlet/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,25 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-servlet</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extensions: Servlet</name>
+ <description>Guice integration with servlets</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>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /dev/null
+++ /trunk/spring/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +1,26 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-spring</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extensions: Spring</name>
+ <description>Guice integration with the Spring container</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>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /dev/null
+++ /trunk/struts2/plugin/pom.xml Sun Aug 1 12:49:16 2010
@@ -0,0 +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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>2.0</version>
+ </parent>
+ <artifactId>guice-struts2-plugin</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extensions: 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 -->
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /trunk/pom.xml Sun Feb 25 16:07:01 2007
+++ /trunk/pom.xml Sun Aug 1 12:49:16 2010
@@ -1,30 +1,20 @@
-<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";>
+<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>
- <groupId>com.google.inject</groupId>
+ <parent>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice-parent</artifactId>
+ <version>2.0</version>
+ </parent>
<artifactId>guice</artifactId>
<packaging>jar</packaging>
- <version>1.0-RC2</version>
- <name>guice</name>
- <url>http://maven.apache.org</url>
+ <!-- Note: this pom is for dependency management only. It will not
build the project -->
<dependencies>
+ <!-- CGLib is not listed because it has been repackaged with JarJar -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
