Author: cbegin
Date: Sun Mar 28 15:27:53 2010
New Revision: 928431
URL: http://svn.apache.org/viewvc?rev=928431&view=rev
Log:
removed ant build, using maven exclusively now
Added:
ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml
ibatis/java/ibatis-3/trunk/ibatis-3-core/doc/
- copied from r928231, ibatis/java/ibatis-3/trunk/doc/
ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml
Removed:
ibatis/java/ibatis-3/trunk/ant-lib/
ibatis/java/ibatis-3/trunk/build.xml
ibatis/java/ibatis-3/trunk/doc/
ibatis/java/ibatis-3/trunk/version.properties
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml
Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml?rev=928431&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml Sun Mar 28 15:27:53 2010
@@ -0,0 +1,19 @@
+<assembly>
+ <id>bundle</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <files>
+ <file>
+
<source>target/${project.artifactId}-${project.version}.${project.packaging}</source>
+ </file>
+ <file>
+
<source>target/${project.artifactId}-${project.version}-sources.${project.packaging}</source>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>optional/${dependency.artifactId}</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml?rev=928431&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml Sun Mar 28 15:27:53
2010
@@ -0,0 +1,19 @@
+<assembly>
+ <id>migrations</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <outputDirectory>ibatis-migrations</outputDirectory>
+ <files>
+ <file>
+
<source>target/${project.artifactId}-${project.version}.${project.packaging}</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/scripts</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml?rev=928431&r1=928430&r2=928431&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml Sun Mar 28 15:27:53 2010
@@ -42,6 +42,16 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>bundle.xml</descriptor>
+ <descriptor>migrations.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
@@ -76,8 +86,6 @@
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <id>attach-sources</id>
- <phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
@@ -89,7 +97,7 @@
<resource>
<directory>src/main/java</directory>
<excludes>
- <exclude>*.java</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
@@ -97,7 +105,7 @@
<testResource>
<directory>src/test/java</directory>
<excludes>
- <exclude>*.java</exclude>
+ <exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
@@ -119,19 +127,19 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
- <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
- <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.1_3</version>
- <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!-- Test dependencies -->
<dependency>
