Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 7da41b740824d5e54981f52b5d37ba231f99f0f2 1 parent 4c7f7db
authored June 09, 2010
11  liquibase-core/liquibase-core.iml
... ...
@@ -1,5 +1,15 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
  3
+  <component name="FacetManager">
  4
+    <facet type="Osmorc" name="OSGi">
  5
+      <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">
  6
+        <additionalProperties>
  7
+          <property key="_include" value="-osgi.bnd" />
  8
+        </additionalProperties>
  9
+        <additionalJARContents />
  10
+      </configuration>
  11
+    </facet>
  12
+  </component>
3 13
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
4 14
     <output url="file://$MODULE_DIR$/target/classes" />
5 15
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -8,6 +18,7 @@
8 18
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
9 19
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10 20
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
  21
+      <excludeFolder url="file://$MODULE_DIR$/.settings" />
11 22
       <excludeFolder url="file://$MODULE_DIR$/target" />
12 23
     </content>
13 24
     <orderEntry type="inheritedJdk" />
0  liquibase-dist/osgi.bnd → liquibase-core/osgi.bnd
File renamed without changes
198  liquibase-core/pom.xml
... ...
@@ -1,31 +1,35 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3  
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  3
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 4
 
5  
-	<parent>
6  
-		<artifactId>liquibase-all</artifactId>
7  
-		<groupId>org.liquibase</groupId>
8  
-		<version>2.0-rc2-SNAPSHOT</version>
9  
-	</parent>
  5
+    <parent>
  6
+        <artifactId>liquibase-all</artifactId>
  7
+        <groupId>org.liquibase</groupId>
  8
+        <version>2.0-rc2-SNAPSHOT</version>
  9
+    </parent>
10 10
 
11  
-	<modelVersion>4.0.0</modelVersion>
12  
-	<artifactId>liquibase</artifactId>
13  
-	<packaging>jar</packaging>
14  
-	<name>LiquiBase Library</name>
  11
+    <modelVersion>4.0.0</modelVersion>
  12
+    <artifactId>liquibase</artifactId>
  13
+    <packaging>jar</packaging>
  14
+    <name>LiquiBase Library</name>
15 15
 
16  
-	<dependencies>
17  
-		<dependency>
18  
-			<groupId>junit</groupId>
19  
-			<artifactId>junit</artifactId>
20  
-			<scope>test</scope>
21  
-		</dependency>
22  
-		<dependency>
23  
-			<groupId>org.easymock</groupId>
24  
-			<artifactId>easymockclassextension</artifactId>
25  
-			<scope>test</scope>
26  
-		</dependency>
  16
+    <properties>
  17
+        <bundle.namespace>liquibase.*</bundle.namespace>
  18
+    </properties>
27 19
 
28  
-                <dependency>
  20
+    <dependencies>
  21
+        <dependency>
  22
+            <groupId>junit</groupId>
  23
+            <artifactId>junit</artifactId>
  24
+            <scope>test</scope>
  25
+        </dependency>
  26
+        <dependency>
  27
+            <groupId>org.easymock</groupId>
  28
+            <artifactId>easymockclassextension</artifactId>
  29
+            <scope>test</scope>
  30
+        </dependency>
  31
+
  32
+        <dependency>
29 33
             <groupId>ant</groupId>
30 34
             <artifactId>ant</artifactId>
31 35
             <scope>provided</scope>
@@ -44,51 +48,127 @@
44 48
             <optional>true</optional>
45 49
         </dependency>
46 50
 
47  
-	</dependencies>
  51
+    </dependencies>
48 52
 
49  
-	<build>
50  
-		<resources>
51  
-			<resource>
52  
-				<directory>src/main/resources</directory>
53  
-				<filtering>true</filtering>
54  
-			</resource>
55  
-		</resources>
  53
+    <build>
  54
+        <finalName>liquibase-${version}</finalName>
56 55
 
57  
-		<plugins>
58  
-			<plugin>
59  
-				<groupId>org.apache.maven.plugins</groupId>
60  
-				<artifactId>maven-jar-plugin</artifactId>
  56
+        <resources>
  57
+            <resource>
  58
+                <directory>src/main/resources</directory>
  59
+                <filtering>true</filtering>
  60
+            </resource>
  61
+        </resources>
  62
+
  63
+        <plugins>
  64
+            <plugin>
  65
+                <groupId>org.apache.maven.plugins</groupId>
  66
+                <artifactId>maven-jar-plugin</artifactId>
61 67
                 <configuration>
62 68
                     <archive>
63 69
                         <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
64 70
                     </archive>
65 71
                 </configuration>
66  
-				<executions>
67  
-					<execution>
68  
-						<goals>
69  
-							<goal>test-jar</goal>
70  
-						</goals>
71  
-					</execution>
72  
-				</executions>
73  
-			</plugin>
  72
+            </plugin>
  73
+
  74
+            <plugin>
  75
+                <groupId>org.apache.maven.plugins</groupId>
  76
+                <artifactId>maven-surefire-plugin</artifactId>
  77
+                <configuration>
  78
+                    <excludes>
  79
+                        <exclude>**/TestContext.java</exclude>
  80
+                    </excludes>
  81
+                    <systemProperties>
  82
+                        <property>
  83
+                            <name>liquibase.default.logger.level</name>
  84
+                            <value>severe</value>
  85
+                        </property>
  86
+                    </systemProperties>
  87
+                </configuration>
  88
+            </plugin>
  89
+
  90
+            <plugin>
  91
+                <groupId>org.codehaus.mojo</groupId>
  92
+                <artifactId>build-helper-maven-plugin</artifactId>
  93
+                <version>1.4</version>
  94
+                <executions>
  95
+                    <execution>
  96
+                        <id>add-source</id>
  97
+                        <phase>generate-sources</phase>
  98
+                        <goals>
  99
+                            <goal>add-source</goal>
  100
+                        </goals>
  101
+                        <configuration>
  102
+                            <sources>
  103
+                                <source>../liquibase-core/src/main/java</source>
  104
+                            </sources>
  105
+                        </configuration>
  106
+                        
  107
+                    </execution>
  108
+                </executions>
  109
+            </plugin>
  110
+
  111
+            <plugin>
  112
+                <groupId>org.apache.maven.plugins</groupId>
  113
+                <artifactId>maven-javadoc-plugin</artifactId>
  114
+                <executions>
  115
+                    <execution>
  116
+                        <id>api</id>
  117
+                        <phase>prepare-package</phase>
  118
+                        <goals>
  119
+                            <goal>javadoc</goal>
  120
+                        </goals>
  121
+                        <configuration>
  122
+                            <sourcepath>../liquibase-core/src/main/java;../liquibase-core-jvm/src/main/java</sourcepath>
  123
+                            <encoding>UTF-8</encoding>
  124
+                        </configuration>
  125
+                    </execution>
  126
+                </executions>
  127
+            </plugin>
74 128
 
75  
-			<plugin>
76  
-				<groupId>org.apache.maven.plugins</groupId>
77  
-				<artifactId>maven-surefire-plugin</artifactId>
78  
-				<configuration>
79  
-					<excludes>
80  
-						<exclude>**/TestContext.java</exclude>
81  
-					</excludes>
82  
-					<systemProperties>
83  
-						<property>
84  
-							<name>liquibase.default.logger.level</name>
85  
-							<value>severe</value>
86  
-						</property>
87  
-					</systemProperties>
88  
-				</configuration>
89  
-			</plugin>
  129
+            <!--<plugin>-->
  130
+                <!--<groupId>org.apache.felix</groupId>-->
  131
+                <!--<artifactId>maven-bundle-plugin</artifactId>-->
  132
+                <!--<extensions>true</extensions>-->
  133
+                <!--<configuration>-->
  134
+                    <!--<instructions>-->
  135
+                        <!--<_include>-osgi.bnd</_include>-->
  136
+                    <!--</instructions>-->
  137
+                    <!--<manifestLocation>${project.build.directory}/jar-with-deps/META-INF</manifestLocation>-->
  138
+                <!--</configuration>-->
  139
+                <!--<executions>-->
  140
+                    <!--<execution>-->
  141
+                        <!--<id>bundle-manifest</id>-->
  142
+                        <!--<phase>process-classes</phase>-->
  143
+                        <!--<goals>-->
  144
+                            <!--<goal>manifest</goal>-->
  145
+                        <!--</goals>-->
  146
+                    <!--</execution>-->
  147
+                <!--</executions>-->
  148
+            <!--</plugin>-->
90 149
 
91  
-		</plugins>
92  
-	</build>
  150
+            <plugin>
  151
+                <artifactId>maven-assembly-plugin</artifactId>
  152
+                <executions>
  153
+                    <execution>
  154
+                        <id>distro</id>
  155
+                        <phase>package</phase>
  156
+                        <goals>
  157
+                            <goal>single</goal>
  158
+                        </goals>
  159
+                        <configuration>
  160
+                            <descriptors>
  161
+                                <!-- create the distribution archives -->
  162
+                                <descriptor>src/main/resources/assembly/bin.xml</descriptor>
  163
+                            </descriptors>
  164
+                            <!--<archive>
  165
+                              <manifestFile>../liquibase-core/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
  166
+                            </archive>-->
  167
+                        </configuration>
  168
+                    </execution>
  169
+                </executions>
  170
+            </plugin>
  171
+        </plugins>
  172
+    </build>
93 173
 
94 174
 </project>
13  liquibase-dist/src/main/resources/assembly/bin.xml → liquibase-core/src/main/resources/assembly/bin.xml
@@ -2,13 +2,12 @@
2 2
   <id>bin</id>
3 3
   <formats>
4 4
     <format>tar.gz</format>
5  
-    <format>tar.bz2</format>
6 5
     <format>zip</format>
7 6
   </formats>
8 7
   <includeBaseDirectory>false</includeBaseDirectory>
9 8
   <fileSets>
10 9
     <fileSet>
11  
-      <directory>src/main/resources</directory>
  10
+      <directory>src/main/resources/dist</directory>
12 11
       <outputDirectory>/</outputDirectory>
13 12
       <excludes>
14 13
         <exclude>**/assembly/</exclude>
@@ -25,9 +24,15 @@
25 24
   </fileSets>
26 25
   <files>
27 26
     <file>
28  
-      <source>src/main/resources/liquibase</source>
  27
+      <source>${project.build.directory}/${project.build.finalName}.jar</source>
29 28
       <outputDirectory>/</outputDirectory>
30  
-      <fileMode>0777</fileMode>
  29
+      <destName>liquibase.jar</destName>
  30
+      <fileMode>0644</fileMode>
31 31
     </file>
  32
+    <!--<file>-->
  33
+      <!--<source>src/main/resources/liquibase</source>-->
  34
+      <!--<outputDirectory>/</outputDirectory>-->
  35
+      <!--<fileMode>0777</fileMode>-->
  36
+    <!--</file>-->
32 37
   </files>
33 38
 </assembly>
0  liquibase-dist/src/main/resources/lgpl.txt → liquibase-core/src/main/resources/dist/lgpl.txt
File renamed without changes
0  liquibase-dist/src/main/resources/liquibase → liquibase-core/src/main/resources/dist/liquibase
File renamed without changes
0  liquibase-dist/src/main/resources/liquibase.bat → liquibase-core/src/main/resources/dist/liquibase.bat
File renamed without changes
0  liquibase-dist/src/main/resources/liquibase.spec → ...ibase-core/src/main/resources/dist/liquibase.spec
File renamed without changes
9  liquibase-dist/.classpath
... ...
@@ -1,9 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<classpath>
3  
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
4  
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
5  
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6  
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
7  
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
8  
-	<classpathentry kind="output" path="target/classes"/>
9  
-</classpath>
23  liquibase-dist/.project
... ...
@@ -1,23 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<projectDescription>
3  
-	<name>liquibase-dist</name>
4  
-	<comment></comment>
5  
-	<projects>
6  
-	</projects>
7  
-	<buildSpec>
8  
-		<buildCommand>
9  
-			<name>org.eclipse.jdt.core.javabuilder</name>
10  
-			<arguments>
11  
-			</arguments>
12  
-		</buildCommand>
13  
-		<buildCommand>
14  
-			<name>org.maven.ide.eclipse.maven2Builder</name>
15  
-			<arguments>
16  
-			</arguments>
17  
-		</buildCommand>
18  
-	</buildSpec>
19  
-	<natures>
20  
-		<nature>org.eclipse.jdt.core.javanature</nature>
21  
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
22  
-	</natures>
23  
-</projectDescription>
5  liquibase-dist/.settings/org.eclipse.jdt.core.prefs
... ...
@@ -1,5 +0,0 @@
1  
-#Thu Aug 06 15:26:54 CDT 2009
2  
-eclipse.preferences.version=1
3  
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4  
-org.eclipse.jdt.core.compiler.compliance=1.5
5  
-org.eclipse.jdt.core.compiler.source=1.5
9  liquibase-dist/.settings/org.maven.ide.eclipse.prefs
... ...
@@ -1,9 +0,0 @@
1  
-#Thu Aug 06 15:26:40 CDT 2009
2  
-activeProfiles=
3  
-eclipse.preferences.version=1
4  
-fullBuildGoals=process-test-resources
5  
-includeModules=false
6  
-resolveWorkspaceProjects=true
7  
-resourceFilterGoals=process-resources resources\:testResources
8  
-skipCompilerPlugin=true
9  
-version=1
34  liquibase-dist/liquibase-dist.iml
... ...
@@ -1,34 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<module MavenProjectsManager.isMavenModule="true" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
3  
-  <component name="FacetManager">
4  
-    <facet type="Osmorc" name="OSGi">
5  
-      <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">
6  
-        <additionalProperties>
7  
-          <property key="_include" value="-osgi.bnd" />
8  
-        </additionalProperties>
9  
-        <additionalJARContents />
10  
-      </configuration>
11  
-    </facet>
12  
-  </component>
13  
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
14  
-    <output url="file://$MODULE_DIR$/target/classes" />
15  
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
16  
-    <content url="file://$MODULE_DIR$">
17  
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
18  
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
19  
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
20  
-      <excludeFolder url="file://$MODULE_DIR$/target" />
21  
-    </content>
22  
-    <orderEntry type="inheritedJdk" />
23  
-    <orderEntry type="sourceFolder" forTests="false" />
24  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: ant:ant:1.6.5" level="project" />
25  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
26  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring:2.0.6" level="project" />
27  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1" level="project" />
28  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.12" level="project" />
29  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: logkit:logkit:1.0.1" level="project" />
30  
-    <orderEntry type="library" scope="PROVIDED" name="Maven: avalon-framework:avalon-framework:4.1.3" level="project" />
31  
-    <orderEntry type="module" module-name="liquibase-core" exported="" />
32  
-  </component>
33  
-</module>
34  
-
158  liquibase-dist/pom.xml
... ...
@@ -1,158 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3  
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4  
-
5  
-    <parent>
6  
-        <artifactId>liquibase-all</artifactId>
7  
-        <groupId>org.liquibase</groupId>
8  
-        <version>2.0-rc2-SNAPSHOT</version>
9  
-    </parent>
10  
-
11  
-    <modelVersion>4.0.0</modelVersion>
12  
-    <artifactId>liquibase-dist</artifactId>
13  
-    <packaging>pom</packaging>
14  
-    <name>Liquibase Distribution</name>
15  
-
16  
-    <properties>
17  
-        <bundle.namespace>liquibase.*</bundle.namespace>
18  
-    </properties>
19  
-
20  
-    <dependencies>
21  
-        <dependency>
22  
-            <groupId>ant</groupId>
23  
-            <artifactId>ant</artifactId>
24  
-            <scope>provided</scope>
25  
-            <optional>true</optional>
26  
-        </dependency>
27  
-        <dependency>
28  
-            <groupId>javax.servlet</groupId>
29  
-            <artifactId>servlet-api</artifactId>
30  
-            <scope>provided</scope>
31  
-            <optional>true</optional>
32  
-        </dependency>
33  
-        <dependency>
34  
-            <groupId>org.springframework</groupId>
35  
-            <artifactId>spring</artifactId>
36  
-            <scope>provided</scope>
37  
-            <optional>true</optional>
38  
-        </dependency>
39  
-
40  
-        <dependency>
41  
-          <groupId>org.liquibase</groupId>
42  
-          <artifactId>liquibase</artifactId>
43  
-          <version>${project.version}</version>
44  
-          <scope>compile</scope>
45  
-        </dependency>
46  
-
47  
-
48  
-    </dependencies>
49  
-
50  
-    <build>
51  
-        <finalName>liquibase-${version}</finalName>        
52  
-        <plugins>
53  
-
54  
-            <plugin>
55  
-                <groupId>org.codehaus.mojo</groupId>
56  
-                <artifactId>build-helper-maven-plugin</artifactId>
57  
-                <version>1.4</version>
58  
-                <executions>
59  
-                    <execution>
60  
-                        <id>add-source</id>
61  
-                        <phase>generate-sources</phase>
62  
-                        <goals>
63  
-                            <goal>add-source</goal>
64  
-                        </goals>
65  
-                        <configuration>
66  
-                            <sources>
67  
-                                <source>../liquibase-core/src/main/java</source>
68  
-                            </sources>
69  
-                        </configuration>
70  
-                    </execution>
71  
-                </executions>
72  
-            </plugin>
73  
-
74  
-            <plugin>
75  
-                <groupId>org.apache.maven.plugins</groupId>
76  
-                <artifactId>maven-javadoc-plugin</artifactId>
77  
-                <executions>
78  
-                    <execution>
79  
-                        <id>api</id>
80  
-                        <phase>prepare-package</phase>
81  
-                        <goals>
82  
-                            <goal>javadoc</goal>
83  
-                        </goals>
84  
-                        <configuration>
85  
-                            <sourcepath>../liquibase-core/src/main/java;../liquibase-core-jvm/src/main/java</sourcepath>
86  
-                            <encoding>UTF-8</encoding>
87  
-                        </configuration>
88  
-                    </execution>
89  
-                </executions>
90  
-            </plugin>
91  
-
92  
-            <plugin>
93  
-                <groupId>org.apache.felix</groupId>
94  
-                <artifactId>maven-bundle-plugin</artifactId>
95  
-                <extensions>true</extensions>
96  
-                <configuration>
97  
-                    <instructions>
98  
-                        <_include>-osgi.bnd</_include>
99  
-                    </instructions>
100  
-                    <manifestLocation>${project.build.directory}/jar-with-deps/META-INF</manifestLocation>
101  
-                </configuration>
102  
-                <executions>
103  
-                    <execution>
104  
-                        <id>bundle-manifest</id>
105  
-                        <phase>process-classes</phase>
106  
-                        <goals>
107  
-                            <goal>manifest</goal>
108  
-                        </goals>
109  
-                    </execution>
110  
-                </executions>
111  
-            </plugin>
112  
-
113  
-            <!--<plugin>-->
114  
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
115  
-                <!--<artifactId>maven-jar-plugin</artifactId>-->
116  
-                <!--<executions>-->
117  
-                    <!--<execution>-->
118  
-                        <!--<id>create-jar-with-deps</id>-->
119  
-                        <!--<phase>package</phase>-->
120  
-                        <!--<goals>-->
121  
-                            <!--<goal>jar</goal>-->
122  
-                        <!--</goals>-->
123  
-                    <!--</execution>-->
124  
-                <!--</executions>-->
125  
-                <!--<configuration>-->
126  
-                    <!--<classesDirectory>${project.build.directory}/jar-with-deps</classesDirectory>-->
127  
-                    <!--<archive>-->
128  
-                        <!--<manifestFile>${project.build.directory}/jar-with-deps/META-INF/MANIFEST.MF</manifestFile>-->
129  
-                    <!--</archive>-->
130  
-                    <!--<finalName>${project.build.finalName}-jar-with-deps</finalName>-->
131  
-                <!--</configuration>-->
132  
-            <!--</plugin>-->
133  
-
134  
-            <plugin>
135  
-                <artifactId>maven-assembly-plugin</artifactId>
136  
-                <executions>
137  
-                    <execution>
138  
-                        <id>distro</id>
139  
-                        <phase>package</phase>
140  
-                        <goals>
141  
-                            <goal>single</goal>
142  
-                        </goals>
143  
-                        <configuration>
144  
-                            <descriptors>
145  
-                                <!-- create the distribution archives -->
146  
-                                <descriptor>src/main/resources/assembly/bin.xml</descriptor>
147  
-                            </descriptors>
148  
-                            <!--<archive>
149  
-                              <manifestFile>../liquibase-core/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
150  
-                            </archive>-->
151  
-                        </configuration>
152  
-                    </execution>
153  
-                </executions>
154  
-            </plugin>
155  
-        </plugins>
156  
-    </build>
157  
-
158  
-</project>
1  liquibase-dist/src/main/resources/lib/README
... ...
@@ -1 +0,0 @@
1  
-Store any database driver files in this directory and they'll be automatically included when you run liquibase.
1  liquibase-integration-tests/liquibase-integration-tests.iml
@@ -9,6 +9,7 @@
9 9
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10 10
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
11 11
       <sourceFolder url="file://$MODULE_DIR$/src/test/filtered-resources" isTestSource="true" />
  12
+      <excludeFolder url="file://$MODULE_DIR$/.settings" />
12 13
       <excludeFolder url="file://$MODULE_DIR$/src/test/resources/hibernate" />
13 14
       <excludeFolder url="file://$MODULE_DIR$/target" />
14 15
     </content>
1  liquibase-maven-plugin/liquibase-maven-plugin.iml
@@ -8,6 +8,7 @@
8 8
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
9 9
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10 10
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
  11
+      <excludeFolder url="file://$MODULE_DIR$/.settings" />
11 12
       <excludeFolder url="file://$MODULE_DIR$/target" />
12 13
     </content>
13 14
     <orderEntry type="inheritedJdk" />
3  liquibase.iml
@@ -4,6 +4,9 @@
4 4
     <output url="file://$MODULE_DIR$/target/classes" />
5 5
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 6
     <content url="file://$MODULE_DIR$">
  7
+      <excludeFolder url="file://$MODULE_DIR$/.settings" />
  8
+      <excludeFolder url="file://$MODULE_DIR$/core-clr" />
  9
+      <excludeFolder url="file://$MODULE_DIR$/liquibase" />
7 10
       <excludeFolder url="file://$MODULE_DIR$/target" />
8 11
     </content>
9 12
     <orderEntry type="inheritedJdk" />
2  liquibase.ipr
@@ -51,6 +51,7 @@
51 51
       <facet-type id="Osmorc">
52 52
         <modules>
53 53
           <module name="liquibase-dist" />
  54
+          <module name="liquibase-core" />
54 55
         </modules>
55 56
       </facet-type>
56 57
     </autodetection-disabled>
@@ -273,7 +274,6 @@
273 274
     <modules>
274 275
       <module fileurl="file://$PROJECT_DIR$/liquibase.iml" filepath="$PROJECT_DIR$/liquibase.iml" />
275 276
       <module fileurl="file://$PROJECT_DIR$/liquibase-core/liquibase-core.iml" filepath="$PROJECT_DIR$/liquibase-core/liquibase-core.iml" />
276  
-      <module fileurl="file://$PROJECT_DIR$/liquibase-dist/liquibase-dist.iml" filepath="$PROJECT_DIR$/liquibase-dist/liquibase-dist.iml" />
277 277
       <module fileurl="file://$PROJECT_DIR$/samples/liquibase-ext-change/liquibase-ext-change.iml" filepath="$PROJECT_DIR$/samples/liquibase-ext-change/liquibase-ext-change.iml" />
278 278
       <module fileurl="file://$PROJECT_DIR$/samples/liquibase-ext-changewithnestedtags/liquibase-ext-changewithnestedtags.iml" filepath="$PROJECT_DIR$/samples/liquibase-ext-changewithnestedtags/liquibase-ext-changewithnestedtags.iml" />
279 279
       <module fileurl="file://$PROJECT_DIR$/samples/liquibase-ext-sqlgenerator/liquibase-ext-sqlgenerator.iml" filepath="$PROJECT_DIR$/samples/liquibase-ext-sqlgenerator/liquibase-ext-sqlgenerator.iml" />
3  pom.xml
@@ -7,7 +7,7 @@
7 7
   <artifactId>liquibase-all</artifactId>
8 8
   <version>2.0-rc2-SNAPSHOT</version>
9 9
   <packaging>pom</packaging>
10  
-  <name>Liquibase</name>
  10
+  <name>Liquibase Parent Project</name>
11 11
   <description>LiquiBase is a tool for managing and executing database changes.</description>
12 12
   <url>http://www.liquibase.org</url>
13 13
 
@@ -48,7 +48,6 @@
48 48
     <module>liquibase-maven-plugin</module>
49 49
     <module>samples</module>
50 50
     <module>liquibase-integration-tests</module>
51  
-    <module>liquibase-dist</module>
52 51
   </modules>
53 52
 
54 53
   <dependencyManagement>

0 notes on commit 7da41b7

Please sign in to comment.
Something went wrong with that request. Please try again.