Streamlining Moxie integration

build.moxie

@@ -11,6 +11,7 @@ description: 'a model-based database access wrapper for JDBC'
 groupId: com.iciql
 artifactId: iciql
 version: 1.2.0-SNAPSHOT
+packaging: jar+zip
 inceptionYear: 2011
 
 # Current stable release

build.xml

@@ -86,19 +86,10 @@
 		Build
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="build" depends="compile" description="Builds iciql from source">
-		
-		<mx:jar packageSources="true" />		
-		<mx:javadoc redirect="true" />
-		<mx:zip>
-			<artifact />
-			<artifact classifier="sources"/>
-			<artifact classifier="javadoc"/>
-			<fileset dir="${basedir}">
-				<include name="LICENSE" />
-				<include name="NOTICE" />
-			</fileset>
-		</mx:zip>
+	<target name="build" depends="compile" description="Packages iciql for deployment">
+
+		<!-- Package the jar, javadoc, sources, and zip distribution -->
+		<mx:package />
 		
 		<!-- Deploy the artifacts into the version-controlled repository -->		
 		<mx:deploy basedir="${basedir}/maven" allowSnapshots="false" />

maven

@@ -1 +1 @@
-Subproject commit a4cb7ef844cdd325c359a37b498036388951bc35
+Subproject commit 2cd53edea7e4ec121d7a98a39c7ec59306cb5fb0