update parent and bom versions, fix compiler errors, fix distribution

seam · Aug 24, 2011 · 9683c8d · 9683c8d
1 parent 41fb8b0
commit 9683c8d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -3,6 +3,8 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
+   <id>distribution</id>
+
    <formats>
       <format>zip</format>
    </formats>
@@ -29,6 +31,7 @@
          <outputDirectory>artifacts</outputDirectory>
          <useProjectArtifact>false</useProjectArtifact>
          <includes>
+            <include>org.jboss.seam.international:seam-international-api</include>
             <include>org.jboss.seam.international:seam-international</include>
          </includes>
          <excludes>

diff --git a/docs/src/main/docbook/en-US/version_info.xml b/docs/src/main/docbook/en-US/version_info.xml
@@ -0,0 +1 @@
+<releaseinfo>3.1.0-SNAPSHOT</releaseinfo>
diff --git a/.../org/jboss/seam/international/examples/timeanddate/worldclock/AvailableTimeZonesBean.java b/.../org/jboss/seam/international/examples/timeanddate/worldclock/AvailableTimeZonesBean.java
@@ -12,7 +12,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;

diff --git a/.../src/main/java/org/jboss/seam/international/datetimezone/DefaultDateTimeZoneProducer.java b/.../src/main/java/org/jboss/seam/international/datetimezone/DefaultDateTimeZoneProducer.java
@@ -25,7 +25,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.international.timezone.DefaultTimeZone;
 import org.joda.time.DateTimeZone;
 

diff --git a/impl/src/main/java/org/jboss/seam/international/jdktimezone/DefaultTimeZoneProducer.java b/impl/src/main/java/org/jboss/seam/international/jdktimezone/DefaultTimeZoneProducer.java
@@ -26,7 +26,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.international.timezone.DefaultTimeZone;
 
 /**

diff --git a/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java b/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
@@ -28,7 +28,7 @@
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 
 @ApplicationScoped
 public class AvailableLocales {

diff --git a/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java b/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
@@ -26,7 +26,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 
 @ApplicationScoped
 public class DefaultLocaleProducer implements Serializable {

diff --git a/.../src/main/java/org/jboss/seam/international/status/TypedStatusMessageBundleExtension.java b/.../src/main/java/org/jboss/seam/international/status/TypedStatusMessageBundleExtension.java
@@ -46,7 +46,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessInjectionTarget;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.solder.literal.MessageBundleLiteral;
 import org.jboss.seam.solder.messages.MessageBundle;
 import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;

diff --git a/.../src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java b/.../src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
@@ -20,7 +20,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.international.status.ApplicationBundles;
 import org.jboss.seam.international.status.Level;
 import org.jboss.seam.international.status.Message;

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.seam</groupId>
       <artifactId>seam-parent</artifactId>
-      <version>12</version>
+      <version>14</version>
    </parent>
 
    <groupId>org.jboss.seam.international</groupId>
@@ -25,7 +25,7 @@
    </modules>
 
    <properties>
-      <seam.version>3.1.0.Beta1</seam.version>
+      <seam.version>3.1.0.Beta2</seam.version>
    </properties>
 
    <dependencyManagement>