Revision: 1200
Author: sberlin
Date: Sun Aug 1 12:55:08 2010
Log: issue 525 - update poms to guice 3.0. patch courtesy of max bowsher,
thanks!
http://code.google.com/p/google-guice/source/detail?r=1200
Added:
/trunk/extensions/persist/pom.xml
Modified:
/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/pom.xml
/trunk/pom.xml
/trunk/servlet/pom.xml
/trunk/spring/pom.xml
/trunk/struts2/plugin/pom.xml
=======================================
--- /dev/null
+++ /trunk/extensions/persist/pom.xml Sun Aug 1 12:55:08 2010
@@ -0,0 +1,36 @@
+<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 -->
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /trunk/extensions/assistedinject/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/assistedinject/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-assisted-inject</artifactId>
<packaging>jar</packaging>
=======================================
--- /trunk/extensions/grapher/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/grapher/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-grapher</artifactId>
<packaging>jar</packaging>
=======================================
--- /trunk/extensions/jmx/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/jmx/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-jmx</artifactId>
<packaging>jar</packaging>
=======================================
--- /trunk/extensions/jndi/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/jndi/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-jndi</artifactId>
<packaging>jar</packaging>
=======================================
--- /trunk/extensions/multibindings/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/multibindings/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-multibindings</artifactId>
<packaging>jar</packaging>
=======================================
--- /trunk/extensions/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,8 @@
<parent>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../guice-parent/pom.xml</relativePath>
</parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
@@ -15,6 +16,16 @@
<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>
=======================================
--- /trunk/extensions/throwingproviders/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/extensions/throwingproviders/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-throwing-providers</artifactId>
<packaging>jar</packaging>
=======================================
--- /trunk/guice-parent/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/guice-parent/pom.xml Sun Aug 1 12:55:08 2010
@@ -10,7 +10,7 @@
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
<name>Google Guice</name>
<description>Guice (pronounced 'juice') is a lightweight dependency
injection
framework for Java 5 and above, brought to you by
Google.</description>
@@ -62,7 +62,6 @@
<source>1.5</source>
<target>1.5</target>
</configuration>
- <inherited>true</inherited>
</plugin>
</plugins>
</pluginManagement>
=======================================
--- /trunk/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,10 +5,12 @@
<parent>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>guice-parent/pom.xml</relativePath>
</parent>
<artifactId>guice</artifactId>
<packaging>jar</packaging>
+ <name>Google Guice: Core</name>
<!-- 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 -->
@@ -16,5 +18,13 @@
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+
+ <!-- Not optional, even in pure-Guice, no JSR 330 applications:
+ javax.inject.Provider is referenced in Guice code. -->
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
</dependencies>
</project>
=======================================
--- /trunk/servlet/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/servlet/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,11 +5,11 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-servlet</artifactId>
<packaging>jar</packaging>
- <name>Google Guice - Extensions: Servlet</name>
+ <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 -->
<dependencies>
=======================================
--- /trunk/spring/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/spring/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,11 +5,11 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-spring</artifactId>
<packaging>jar</packaging>
- <name>Google Guice - Extensions: Spring</name>
+ <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 -->
<dependencies>
=======================================
--- /trunk/struts2/plugin/pom.xml Sun Aug 1 12:49:16 2010
+++ /trunk/struts2/plugin/pom.xml Sun Aug 1 12:55:08 2010
@@ -5,11 +5,11 @@
<parent>
<groupId>com.google.inject.extensions</groupId>
<artifactId>extensions-parent</artifactId>
- <version>2.0</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>guice-struts2-plugin</artifactId>
<packaging>jar</packaging>
- <name>Google Guice - Extensions: Struts2 Plugin</name>
+ <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 -->
<dependencies>
--
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.