Commit graph

2651 commits

Author SHA1 Message Date
srowen fe555e001b Avoid NPE for camera with no params
git-svn-id: https://zxing.googlecode.com/svn/trunk@2995 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-17 15:11:33 +00:00
srowen 9a5391b653 Issue 1821: structured append support in QR code from mike06j
git-svn-id: https://zxing.googlecode.com/svn/trunk@2994 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-13 15:50:26 +00:00
srowen 21d22400b9 mike06j contributed patch for Issue 1820
git-svn-id: https://zxing.googlecode.com/svn/trunk@2993 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-12 15:59:19 +00:00
srowen cce6d80637 Issue 1820 add Code 128 FNC4 support
git-svn-id: https://zxing.googlecode.com/svn/trunk@2992 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-12 13:37:09 +00:00
srowen 4aa5348526 Remove lang3 dependency as Guava can take over its one usage
git-svn-id: https://zxing.googlecode.com/svn/trunk@2991 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-11 20:41:18 +00:00
srowen 4550d1d762 Reject non-HTTP URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@2990 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-07 22:50:22 +00:00
srowen da9d32846a Whitespace cleanup and other inspections from IDEA 13
git-svn-id: https://zxing.googlecode.com/svn/trunk@2989 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-06 11:17:57 +00:00
srowen@gmail.com 49e2bca2aa Add back symlinks at proguard config name that Android build expects
git-svn-id: https://zxing.googlecode.com/svn/trunk@2988 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-05 11:05:56 +00:00
srowen@gmail.com f4329e7d15 Issue 1817 don't include name/title in map search
git-svn-id: https://zxing.googlecode.com/svn/trunk@2987 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-04 18:42:19 +00:00
srowen@gmail.com cf6cbcd84a Now that Elastic Beanstalk supports Java 7 and Amazon Linux 2013.09 we don't need a few workarounds
git-svn-id: https://zxing.googlecode.com/svn/trunk@2986 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-03 15:06:08 +00:00
srowen@gmail.com b2f2615b56 Standardize proguard config
git-svn-id: https://zxing.googlecode.com/svn/trunk@2985 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-03 09:23:46 +00:00
srowen@gmail.com 6ece248e1a Add back site plugin config and <developers> to satisfy OSS sonatype check and versions plugin
git-svn-id: https://zxing.googlecode.com/svn/trunk@2984 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-02 23:40:51 +00:00
srowen@gmail.com 8d7eb91faa Remove explicit luminance conversion option -- always do it in tests
git-svn-id: https://zxing.googlecode.com/svn/trunk@2983 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-02 22:26:59 +00:00
srowen@gmail.com 3de3374dd2 Bump to BS 4.5.2
git-svn-id: https://zxing.googlecode.com/svn/trunk@2982 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-02 18:23:20 +00:00
srowen@gmail.com a53c659b0e Boldly move to Java 7 for everything, including Android.
git-svn-id: https://zxing.googlecode.com/svn/trunk@2981 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-12-02 18:18:46 +00:00
srowen@gmail.com 1b0c3c7b3a Remove Android v4 intent support
git-svn-id: https://zxing.googlecode.com/svn/trunk@2979 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-30 16:15:20 +00:00
srowen@gmail.com 4856e86a46 For 3.0.0, retire iphone/, cpp/, objc/ and remove temporary pointers in csharp/, qt/
git-svn-id: https://zxing.googlecode.com/svn/trunk@2978 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-30 10:51:50 +00:00
srowen@gmail.com 00f634024c Restore some pom settings that were probably not needed after the <site> tag problem was found
git-svn-id: https://zxing.googlecode.com/svn/trunk@2977 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-30 10:13:21 +00:00
srowen@gmail.com 092e0e9572 Bump android/androidtest to 3.0.0 manually
git-svn-id: https://zxing.googlecode.com/svn/trunk@2976 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 23:02:33 +00:00
srowen@gmail.com e281559cc8 Manually bump android/androidtest modules to 2.3.0 since weren't enabled from parent
git-svn-id: https://zxing.googlecode.com/svn/trunk@2972 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 22:52:35 +00:00
srowen@gmail.com 1a2a011cc7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://zxing.googlecode.com/svn/trunk@2971 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:39:36 +00:00
srowen@gmail.com 9a0b6cec39 [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2969 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:39:24 +00:00
srowen@gmail.com e0e5276f57 Remove problematic distributionManagement/site element
git-svn-id: https://zxing.googlecode.com/svn/trunk@2968 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:33:32 +00:00
srowen@gmail.com 1ce4516d00 [maven-release-plugin] rollback the release of zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2966 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:31:32 +00:00
srowen@gmail.com 54a3bfabab [maven-release-plugin] prepare for next development iteration
git-svn-id: https://zxing.googlecode.com/svn/trunk@2965 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:22:18 +00:00
srowen@gmail.com ca14065f0d [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2963 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:22:07 +00:00
srowen@gmail.com 979d382726 Remove problematic dependency plugin for zxingorg javadoc
git-svn-id: https://zxing.googlecode.com/svn/trunk@2962 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:16:28 +00:00
srowen@gmail.com 0a89cdddf2 [maven-release-plugin] rollback the release of zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2960 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 18:14:42 +00:00
srowen@gmail.com b852b82042 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://zxing.googlecode.com/svn/trunk@2959 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:59:41 +00:00
srowen@gmail.com 5fc526df04 [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2957 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:59:31 +00:00
srowen@gmail.com c1411513e5 Remove site plugin causing release problems
git-svn-id: https://zxing.googlecode.com/svn/trunk@2955 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:54:13 +00:00
srowen@gmail.com 1b6986abe3 [maven-release-plugin] rollback the release of zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2954 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:52:28 +00:00
srowen@gmail.com d7f11da90b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://zxing.googlecode.com/svn/trunk@2953 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:26:37 +00:00
srowen@gmail.com e1949f057d [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2951 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:26:27 +00:00
srowen@gmail.com eb4690b589 Fix scm reference in zxing-parent pom
git-svn-id: https://zxing.googlecode.com/svn/trunk@2950 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:21:54 +00:00
srowen@gmail.com a7f213f060 [maven-release-plugin] rollback the release of zxing-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2949 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:19:30 +00:00
srowen@gmail.com 39899fd9aa [maven-release-plugin] prepare release zxing-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2948 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:17:35 +00:00
srowen@gmail.com 7d988572d4 [maven-release-plugin] rollback the release of zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2947 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:11:59 +00:00
srowen@gmail.com d01ddc6d70 [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2946 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 17:02:40 +00:00
srowen@gmail.com c1d7c521a4 Careful with clean target and pom files
git-svn-id: https://zxing.googlecode.com/svn/trunk@2945 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 16:57:57 +00:00
srowen@gmail.com a741181e8d Roll back to 2.3.0-SNAPSHOT again
git-svn-id: https://zxing.googlecode.com/svn/trunk@2944 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 16:57:21 +00:00
srowen@gmail.com afe159b22e [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2943 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 16:49:00 +00:00
srowen@gmail.com 2a6a928dac Remove some recurisve symlinks to try to fix build
git-svn-id: https://zxing.googlecode.com/svn/trunk@2942 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 16:44:55 +00:00
srowen@gmail.com 13a092262b Roll back to 2.3.0-SNAPSHOT for another attempt
git-svn-id: https://zxing.googlecode.com/svn/trunk@2941 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 16:41:16 +00:00
srowen@gmail.com fc705e85b2 Use latest plexus-utils to avoid recursion bug?
git-svn-id: https://zxing.googlecode.com/svn/trunk@2940 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 16:37:13 +00:00
srowen@gmail.com 8d846457e0 [maven-release-plugin] prepare release zxing-parent-2.3.0
git-svn-id: https://zxing.googlecode.com/svn/trunk@2934 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 14:37:04 +00:00
srowen@gmail.com e7400da79d Suppress one compile warning
git-svn-id: https://zxing.googlecode.com/svn/trunk@2933 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 14:18:41 +00:00
srowen@gmail.com c080901577 One last improvement to clean target
git-svn-id: https://zxing.googlecode.com/svn/trunk@2932 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 13:02:11 +00:00
srowen@gmail.com d935b0bc9b Pull common dependencies up into parent
git-svn-id: https://zxing.googlecode.com/svn/trunk@2931 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 12:28:10 +00:00
srowen@gmail.com e429d205dc Don't build android modules from the top level; they're not really supported by Android yet as build artifacts
git-svn-id: https://zxing.googlecode.com/svn/trunk@2930 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-11-29 12:21:40 +00:00