Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'remotes/origin/2_0_x'

Conflicts:
	liquibase-core/src/main/java/liquibase/database/core/DB2Database.java
  • Loading branch information...
commit 871aea1629ccbef87d74a320e6ee8045aebd5b7c 2 parents b15da36 + 7b42e73
@nvoxland nvoxland authored
View
3  liquibase-core/liquibase-core.iml
@@ -38,8 +38,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:1.0.0.Beta1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.jboss.weld.se:weld-se:1.1.5.Final" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.jboss.weld:weld-build-config:1.1.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: hsqldb:hsqldb:1.8.0.7" level="project" />
</component>
</module>
View
1  liquibase-integration-tests/liquibase-integration-tests.iml
@@ -26,6 +26,7 @@
<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" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="module" module-name="liquibase-core" scope="TEST" />
<orderEntry type="module" module-name="liquibase-ext-change" scope="TEST" />
<orderEntry type="module" module-name="liquibase-ext-changewithnestedtags" scope="TEST" />
View
1  liquibase-maven-plugin/liquibase-maven-plugin.iml
@@ -28,6 +28,7 @@
<orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:2.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-alpha-5" level="project" />
<orderEntry type="module" module-name="liquibase-core" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.shared:maven-plugin-testing-harness:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-core:2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-settings:2.0" level="project" />
View
1  liquibase-osgi/liquibase-osgi.iml
@@ -33,6 +33,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="liquibase-core" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.osgi:org.osgi.core:4.1.0" level="project" />
</component>
</module>
View
30 liquibase.ipr
@@ -53,7 +53,16 @@
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
</component>
- <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+ <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/liquibase-core" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/liquibase-integration-tests" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/liquibase-maven-plugin" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/liquibase-osgi" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/samples/liquibase-ext-change" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/samples/liquibase-ext-changewithnestedtags" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/samples/liquibase-ext-sqlgenerator" charset="UTF-8" />
+ </component>
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
@@ -887,26 +896,15 @@
<root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/interceptor/jboss-interceptors-api_1.1_spec/1.0.0.Beta1/jboss-interceptors-api_1.1_spec-1.0.0.Beta1-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: org.jboss.weld.se:weld-se:1.1.5.Final">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/se/weld-se/1.1.5.Final/weld-se-1.1.5.Final.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/se/weld-se/1.1.5.Final/weld-se-1.1.5.Final-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/se/weld-se/1.1.5.Final/weld-se-1.1.5.Final-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: org.jboss.weld:weld-build-config:1.1.5.Final">
+ <library name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/weld-build-config/1.1.5.Final/weld-build-config-1.1.5.Final.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/se/weld-se/1.1.8.Final/weld-se-1.1.8.Final.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/weld-build-config/1.1.5.Final/weld-build-config-1.1.5.Final-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/se/weld-se/1.1.8.Final/weld-se-1.1.8.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/weld-build-config/1.1.5.Final/weld-build-config-1.1.5.Final-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/weld/se/weld-se/1.1.8.Final/weld-se-1.1.8.Final-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.liquibase:liquibase-core:test-jar:tests:2.0-SNAPSHOT">
View
1  samples/liquibase-ext-change/liquibase-ext-change.iml
@@ -11,6 +11,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="liquibase-core" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:2.2" level="project" />
View
1  samples/liquibase-ext-changewithnestedtags/liquibase-ext-changewithnestedtags.iml
@@ -11,6 +11,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="liquibase-core" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:2.2" level="project" />
View
1  samples/liquibase-ext-sqlgenerator/liquibase-ext-sqlgenerator.iml
@@ -11,6 +11,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="liquibase-core" />
+ <orderEntry type="library" name="Maven: org.jboss.weld.se:weld-se:1.1.8.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymockclassextension:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:2.2" level="project" />
Please sign in to comment.
Something went wrong with that request. Please try again.