Permalink
Browse files

simplifying maven: removed unneeded liquibase-dist in favor of doing …

…everything in liquibase-core

git-svn-id: http://liquibase.jira.com/svn/CORE/trunk@1473 e6edf6fb-f266-4316-afb4-e53d95876a76
  • Loading branch information...
1 parent 4c7f7db commit 7da41b740824d5e54981f52b5d37ba231f99f0f2 nvoxland committed Jun 9, 2010
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="Osmorc" name="OSGi">
+ <configuration osmorcControlsManifest="true" manifestLocation="" jarfileLocation="$MODULE_DIR$/target/liquibase-core.jar" useBndFile="false" bndFileLocation="" bundleActivator="" bundleSymbolicName="org.liquibase.liquibase" bundleVersion="2.0-rc2-SNAPSHOT" ignoreFilePattern="" useProjectDefaultManifestFileLocation="true" alwaysRebuildBundleJAR="false">
+ <additionalProperties>
+ <property key="_include" value="-osgi.bnd" />
+ </additionalProperties>
+ <additionalJARContents />
+ </configuration>
+ </facet>
+ </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -8,6 +18,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/.settings" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
File renamed without changes.
View
@@ -1,31 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>liquibase-all</artifactId>
- <groupId>org.liquibase</groupId>
- <version>2.0-rc2-SNAPSHOT</version>
- </parent>
+ <parent>
+ <artifactId>liquibase-all</artifactId>
+ <groupId>org.liquibase</groupId>
+ <version>2.0-rc2-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>liquibase</artifactId>
- <packaging>jar</packaging>
- <name>LiquiBase Library</name>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>liquibase</artifactId>
+ <packaging>jar</packaging>
+ <name>LiquiBase Library</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
+ <properties>
+ <bundle.namespace>liquibase.*</bundle.namespace>
+ </properties>
- <dependency>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
@@ -44,51 +48,127 @@
<optional>true</optional>
</dependency>
- </dependencies>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
+ <finalName>liquibase-${version}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/TestContext.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>liquibase.default.logger.level</name>
+ <value>severe</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>../liquibase-core/src/main/java</source>
+ </sources>
+ </configuration>
+
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>api</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <sourcepath>../liquibase-core/src/main/java;../liquibase-core-jvm/src/main/java</sourcepath>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestContext.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>liquibase.default.logger.level</name>
- <value>severe</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>maven-bundle-plugin</artifactId>-->
+ <!--<extensions>true</extensions>-->
+ <!--<configuration>-->
+ <!--<instructions>-->
+ <!--<_include>-osgi.bnd</_include>-->
+ <!--</instructions>-->
+ <!--<manifestLocation>${project.build.directory}/jar-with-deps/META-INF</manifestLocation>-->
+ <!--</configuration>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>bundle-manifest</id>-->
+ <!--<phase>process-classes</phase>-->
+ <!--<goals>-->
+ <!--<goal>manifest</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
- </plugins>
- </build>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <!-- create the distribution archives -->
+ <descriptor>src/main/resources/assembly/bin.xml</descriptor>
+ </descriptors>
+ <!--<archive>
+ <manifestFile>../liquibase-core/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
@@ -2,13 +2,12 @@
<id>bin</id>
<formats>
<format>tar.gz</format>
- <format>tar.bz2</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources/dist</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/assembly/</exclude>
@@ -25,9 +24,15 @@
</fileSets>
<files>
<file>
- <source>src/main/resources/liquibase</source>
+ <source>${project.build.directory}/${project.build.finalName}.jar</source>
<outputDirectory>/</outputDirectory>
- <fileMode>0777</fileMode>
+ <destName>liquibase.jar</destName>
+ <fileMode>0644</fileMode>
</file>
+ <!--<file>-->
+ <!--<source>src/main/resources/liquibase</source>-->
+ <!--<outputDirectory>/</outputDirectory>-->
+ <!--<fileMode>0777</fileMode>-->
+ <!--</file>-->
</files>
</assembly>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>liquibase-dist</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
@@ -1,5 +0,0 @@
-#Thu Aug 06 15:26:54 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
@@ -1,9 +0,0 @@
-#Thu Aug 06 15:26:40 CDT 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Osmorc" name="OSGi">
- <configuration osmorcControlsManifest="true" manifestLocation="" jarfileLocation="$MODULE_DIR$/target/liquibase-dist.jar" useBndFile="false" bndFileLocation="" bundleActivator="" bundleSymbolicName="org.liquibase.liquibase-dist" bundleVersion="2.0-rc2-SNAPSHOT" ignoreFilePattern="" useProjectDefaultManifestFileLocation="true" alwaysRebuildBundleJAR="false">
- <additionalProperties>
- <property key="_include" value="-osgi.bnd" />
- </additionalProperties>
- <additionalJARContents />
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: ant:ant:1.6.5" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring:2.0.6" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.12" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: logkit:logkit:1.0.1" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: avalon-framework:avalon-framework:4.1.3" level="project" />
- <orderEntry type="module" module-name="liquibase-core" exported="" />
- </component>
-</module>
-
Oops, something went wrong. Retry.

0 comments on commit 7da41b7

Please sign in to comment.