From 34fbdc8b24b58b0b23093eed30ac992c07078a1b Mon Sep 17 00:00:00 2001
From: carnold <carnold@d8937260-d917-0410-8237-ad64d1a5881f>
Date: Wed, 2 Apr 2008 23:30:49 +0000
Subject: [PATCH] Bug 1760649: Make Maven and Ant built jars have identical
 structure

---
 build.xml | 38 +++++++++++++++++++++++---------------
 pom.xml   |  3 ++-
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index aa4dbdb..ed3a0f7 100644
--- a/build.xml
+++ b/build.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2001-2006 The Ant-Contrib project
+ Licensed to the Ant-Contrib Project under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
 
 -->
 <project default="jars" basedir=".">
@@ -22,7 +23,7 @@ Copyright 2001-2006 The Ant-Contrib project
 
   <property name="Name" value="cpptasks"/>
   <property name="name" value="cpptasks"/>
-  <property name="version" value="1.0b4"/>
+  <property name="version" value="1.0b5"/>
 
   <property name="debug" value="true" />
   <property name="deprecation" value="false" />
@@ -147,10 +148,17 @@ Copyright 2001-2006 The Ant-Contrib project
           depends="build"
           description="--> creates the jar">
     <mkdir dir="${build.lib}"/>
-    <jar jarfile="${build.lib}/${name}.jar" manifest="${resources.dir}/cpptasks.mf">
-                 <fileset dir="." includes="LICENSE NOTICE"/>
+    <jar jarfile="${build.lib}/${name}.jar">
          <fileset dir="${build.classes}"/>
-                 <fileset dir="${resources.dir}" includes="cpptasks.tasks,cpptasks.types,net/sf/antcontrib/cpptasks/antlib.xml"/>
+         <fileset dir="${resources.dir}" excludes="META-INF"/>
+ 		 <manifest>
+ 		 	<section name="net.sf.antcontrib.cpptasks">
+ 		 		<attribute name="Implementation-Title" value="cpptasks: Compiler Tasks for Apache Ant."/>
+ 		 		<attribute name="Implementation-Vendor" value="Ant-Contrib Project"/>
+ 		 		<attribute name="Implementation-Version" value="${version}"/>
+ 		 	</section>
+ 		 </manifest>
+ 		 <metainf dir="${resources.dir}/META-INF"/>                
     </jar>
   </target>
 
diff --git a/pom.xml b/pom.xml
index f279996..995526e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,8 +81,9 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-            <source>1.2</source>
+            <source>1.3</source>
             <target>1.1</target>
+            <optimize>true</optimize>
         </configuration>
       </plugin>
 	  <plugin>