Version should really be in x.y.z form. Simplify dir location config, and actually generate source/javadoc artifacts

git-svn-id: https://zxing.googlecode.com/svn/trunk@2913 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-11-21 12:00:37 +00:00
parent a50e73ada3
commit 8e909ddb51
6 changed files with 27 additions and 50 deletions

View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>android-integration</artifactId> <artifactId>android-integration</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -40,17 +40,10 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>build</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -32,18 +32,10 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>build</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<testSourceDirectory>test/src</testSourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>javase</artifactId> <artifactId>javase</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -32,17 +32,10 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>build</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

18
pom.xml
View file

@ -19,7 +19,7 @@
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
@ -53,7 +53,23 @@
</properties> </properties>
<build> <build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test/src</testSourceDirectory>
<outputDirectory>build</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>

View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>zxing.appspot.com</artifactId> <artifactId>zxing.appspot.com</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -37,21 +37,11 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<!-- TODO use Maven GWT plugin to actually build this --> <!-- TODO use Maven GWT plugin to actually build this -->
<build>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>build</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
</build>
<name>ZXing Appspot-based encoder</name> <name>ZXing Appspot-based encoder</name>
<description>GWT-based encoder app hosted at zxing.appspot.com</description> <description>GWT-based encoder app hosted at zxing.appspot.com</description>

View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>zxingorg</artifactId> <artifactId>zxingorg</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<dependencies> <dependencies>
@ -63,17 +63,10 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>2.3-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>build</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>