[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[srowen]

The following commit has been merged in the upstream branch:
commit b0b1d0e75e6aead0a83a4ed4c18504a2b962963b
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Tue Apr 6 12:38:26 2010 +0000

    Back up and restore poms to prerelease state
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1285 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/pom.xml b/core/pom.xml
index d256acb..5e3dc29 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,9 +18,9 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.zxing</groupId>
   <artifactId>core</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>ZXing Core</name>
-  <version>1.5</version>
+  <version>1.6-SNAPSHOT</version>
   <description>Core barcode encoding/decoding library</description>
   <url>http://code.google.com/p/zxing</url>
   <inceptionYear>2007</inceptionYear>
@@ -46,9 +46,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:http://zxing.googlecode.com/svn/tags/core-1.5</connection>
-    <developerConnection>scm:svn:https://zxing.googlecode.com/svn/tags/core-1.5</developerConnection>
-    <url>http://zxing.googlecode.com/svn/tags/core-1.5</url>
+    <connection>scm:svn:http://zxing.googlecode.com/svn/trunk</connection>
+    <developerConnection>scm:svn:https://zxing.googlecode.com/svn/trunk</developerConnection>
+    <url>http://zxing.googlecode.com/svn/trunk</url>
   </scm>
   <build>
     <sourceDirectory>src</sourceDirectory>
diff --git a/core/pom.xml b/javase/pom.xml
similarity index 79%
copy from core/pom.xml
copy to javase/pom.xml
index d256acb..fbe25da 100644
--- a/core/pom.xml
+++ b/javase/pom.xml
@@ -17,11 +17,11 @@
 <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.zxing</groupId>
-  <artifactId>core</artifactId>
-  <packaging>jar</packaging>
-  <name>ZXing Core</name>
-  <version>1.5</version>
-  <description>Core barcode encoding/decoding library</description>
+  <artifactId>javase</artifactId>
+  <packaging>pom</packaging>
+  <name>ZXing Java SE extensions</name>
+  <version>1.6-SNAPSHOT</version>
+  <description>Java SE-specific extensions to core ZXing library</description>
   <url>http://code.google.com/p/zxing</url>
   <inceptionYear>2007</inceptionYear>
   <issueManagement>
@@ -46,16 +46,31 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:http://zxing.googlecode.com/svn/tags/core-1.5</connection>
-    <developerConnection>scm:svn:https://zxing.googlecode.com/svn/tags/core-1.5</developerConnection>
-    <url>http://zxing.googlecode.com/svn/tags/core-1.5</url>
+    <connection>scm:svn:http://zxing.googlecode.com/svn/trunk</connection>
+    <developerConnection>scm:svn:https://zxing.googlecode.com/svn/trunk</developerConnection>
+    <url>http://zxing.googlecode.com/svn/trunk</url>
   </scm>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>core</artifactId>
+      <version>1.6-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <outputDirectory>build</outputDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>6</source>
+          <target>6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
       </plugin>
     </plugins>

-- 
Multi-format 1D/2D barcode image processing library