Skip to content

Commit ddc567c

Browse files
asashourMalloD12
andauthored
Ensure a new-line at the end of text files. (liquibase#5767)
* Ensure a new-line at the end text files. * Remove new line because file content is use on a test assertion. * - Added new line back. - Update test assertion adding new line. * Test assertion updated by removing new line from file content before to compared against the expected string. --------- Co-authored-by: Daniel Mallorga <dmallorga@liquibase.com>
1 parent b3852e5 commit ddc567c

File tree

249 files changed

+249
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+249
-249
lines changed

.mvn/jvm.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-Dhttp.keepAlive=false
22
-Dmaven.wagon.http.pool=false
3-
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
3+
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120

liquibase-cdi-jakarta/src/main/resources/META-INF/beans.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
</exclude>
1818
</scan>
1919

20-
</beans>
20+
</beans>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
liquibase.integration.jakarta.cdi.CDIBootstrap
1+
liquibase.integration.jakarta.cdi.CDIBootstrap

liquibase-cdi-jakarta/src/main/resources/schema.template.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
%s
99

10-
</databaseChangeLog>
10+
</databaseChangeLog>
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# The reason this file exists is that SONAR expects either BOTH src/test/java AND src/test/groovy to exist, or NONE
2-
# of these two.
2+
# of these two.

liquibase-cdi-jakarta/src/test/java/liquibase/integration/jakarta/cdi/SchemesCDIConfigBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,4 @@ private Callable<CDILiquibaseConfig> getAction(final long timeout) {
192192
};
193193
}
194194

195-
}
195+
}

liquibase-cdi-jakarta/src/test/java/liquibase/integration/jakarta/cdi/SchemesTreeBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,4 @@ class Z {
282282

283283
@LiquibaseSchema(name = "ROOT", resource = "ROOT")
284284
class ROOT {
285-
}
285+
}

liquibase-cdi-jakarta/src/test/resources/META-INF/beans.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
55
version="3.0"
6-
bean-discovery-mode="all"/>
6+
bean-discovery-mode="all"/>

liquibase-cdi/src/main/resources/META-INF/beans.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
</weld:exclude>
2020
</weld:scan>
2121

22-
</beans>
22+
</beans>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
liquibase.integration.cdi.CDIBootstrap
1+
liquibase.integration.cdi.CDIBootstrap

liquibase-cdi/src/main/resources/schema.template.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
%s
99

10-
</databaseChangeLog>
10+
</databaseChangeLog>
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# The reason this file exists is that SONAR expects either BOTH src/test/java AND src/test/groovy to exist, or NONE
2-
# of these two.
2+
# of these two.

liquibase-cdi/src/test/java/liquibase/integration/cdi/SchemesTreeBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,4 @@ class Z {
277277

278278
@LiquibaseSchema(name = "ROOT", resource = "ROOT")
279279
class ROOT {
280-
}
280+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<beans/>
1+
<beans/>

liquibase-dist/src/main/archive/licenses/oss/cddl1.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ The Covered Software is a "commercial item," as that term is defined in 48 C.F.R
6868
This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
6969

7070
10. RESPONSIBILITY FOR CLAIMS.
71-
As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
71+
As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.

liquibase-dist/src/main/archive/licenses/oss/epl-1.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ All Recipient's rights under this Agreement shall terminate if it fails to compl
6767

6868
Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
6969

70-
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
70+
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.

liquibase-dist/src/main/archive/licenses/oss/lgpl-2.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,4 +499,4 @@ necessary. Here is a sample; alter the names:
499499
<signature of Ty Coon>, 1 April 1990
500500
Ty Coon, President of Vice
501501

502-
That's all there is to it!
502+
That's all there is to it!

liquibase-dist/src/main/assembly/assembly-bin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
<componentDescriptors>
99
<componentDescriptor>src/main/assembly/assembly-bin-common.xml</componentDescriptor>
1010
</componentDescriptors>
11-
</assembly>
11+
</assembly>

liquibase-dist/src/main/deb/liquibase-env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Needed when restarting the terminal
44
export LIQUIBASE_HOME=/opt/liquibase
55
export PATH=$PATH:$LIQUIBASE_HOME
6-
exec $SHELL
6+
exec $SHELL

liquibase-extension-testing/src/main/groovy/liquibase/extension/testing/setup/SetupModifyDbCredentials.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ class SetupModifyDbCredentials extends TestSetup {
2828
contents = contents.replaceAll(PASSWORD, testSetupEnvironment.password)
2929
FileUtil.write(contents, textFile)
3030
}
31-
}
31+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
liquibase.extension.testing.testsystem.spock.LiquibaseGlobalExtension
1+
liquibase.extension.testing.testsystem.spock.LiquibaseGlobalExtension

liquibase-integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@
8282
</profile>
8383
</profiles>
8484

85-
</project>
85+
</project>

liquibase-integration-tests/setup/firebird/create_dbs_for_integration_tests.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ grant create view to lbuser;
1818
grant create procedure to lbuser;
1919
grant create function to lbuser;
2020
grant create sequence to lbuser;
21-
grant create package to lbuser;
21+
grant create package to lbuser;

liquibase-integration-tests/setup/informix/create_dbs_for_integration_tests.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ GRANT DBA to liquibase;
1717

1818
-- (login as superuser (informix) into the dbadmin database!)
1919

20-
EXECUTE FUNCTION task ("create dbspace", "liquibase2", "d:\informix\storage\liquibase2", "20 M", "0");
20+
EXECUTE FUNCTION task ("create dbspace", "liquibase2", "d:\informix\storage\liquibase2", "20 M", "0");
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# The reason this file exists is that SONAR expects either BOTH src/test/java AND src/test/groovy to exist, or NONE
2-
# of these two.
2+
# of these two.

liquibase-integration-tests/src/test/groovy/liquibase/command/UpdateCommandStepIntegrationTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ class UpdateCommandStepIntegrationTest extends Specification {
7373
outputStream.toString().contains("Filtered out: 1")
7474
((UpdateReportParameters) commandResults.getResult("updateReport")).getSuccess()
7575
}
76-
}
76+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
liquibase.helper.AlternateConnectionExecutor
1+
liquibase.helper.AlternateConnectionExecutor

liquibase-integration-tests/src/test/resources/changelogs/common/batchInsert.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -998,4 +998,4 @@ id,name,price
998998
997,sagittis sapien cum sociis natoque penatibus et magnis dis parturient montes nascetur ridiculus mus,37.1
999999
998,nisi eu orci mauris lacinia sapien quis libero nullam sit amet turpis elementum,74.58
10001000
999,curae mauris viverra diam vitae quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus vitae,76.03
1001-
1000,tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi non quam nec,68.09
1001+
1000,tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi non quam nec,68.09

liquibase-integration-tests/src/test/resources/changelogs/common/index.with.associatedwith.changelog.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
<column name="lastname"/>
2020
</createIndex>
2121
</changeSet>
22-
</databaseChangeLog>
22+
</databaseChangeLog>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name
22
AUD
33
CAD
4-
CHF
4+
CHF

liquibase-integration-tests/src/test/resources/changelogs/common/pathChangeLog.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
</sql>
1111
<sqlFile path="changelogs/common/commentTest.sql" stripComments="true"/>
1212
</changeSet>
13-
</databaseChangeLog>
13+
</databaseChangeLog>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
create table pathinclude2a (id int)
1+
create table pathinclude2a (id int)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
create table pathinclude4 (id int)
1+
create table pathinclude4 (id int)

liquibase-integration-tests/src/test/resources/changelogs/common/rollbackinclude/createTables.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ create table sqlfilerollback (id int);
66
/**
77
Some morecomments go here
88
**/
9-
create table sqlfilerollback2 (id int);
9+
create table sqlfilerollback2 (id int);
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
drop table sqlfilerollback;
2-
drop table sqlfilerollback2;
2+
drop table sqlfilerollback2;

liquibase-integration-tests/src/test/resources/changelogs/diffChangeLog-test-21938109283.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
<changeSet author="Steve (generated)" id="1660067418349-1">
2020
<modifyDataType columnName="SHARED" newDataType="varchar(3)" tableName="SHAREDTABLE" />
2121
</changeSet>
22-
</databaseChangeLog>
22+
</databaseChangeLog>

liquibase-integration-tests/src/test/resources/changelogs/external-entity.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
<constraints primaryKey="true" nullable="false"/>
77
</column>
88
</createTable>
9-
</changeSet>
9+
</changeSet>

liquibase-integration-tests/src/test/resources/changelogs/h2/complete/summary-changelog.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbch
4444
</createTable>
4545
</changeSet>
4646

47-
</databaseChangeLog>
47+
</databaseChangeLog>

liquibase-integration-tests/src/test/resources/changelogs/json/rollback.tests.changelog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ databaseChangeLog:
116116
rollback:
117117
- sqlFile:
118118
stripComments: true
119-
path: changelogs/common/rollbackinclude/rollbackTables.sql
119+
path: changelogs/common/rollbackinclude/rollbackTables.sql

liquibase-integration-tests/src/test/resources/changelogs/json/rollbackinclude/createTables.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ create table sqlfilerollback (id int);
66
/**
77
Some morecomments go here
88
**/
9-
create table sqlfilerollback2 (id int);
9+
create table sqlfilerollback2 (id int);
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
drop table sqlfilerollback;
2-
drop table sqlfilerollback2;
2+
drop table sqlfilerollback2;
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
select * from person;
22
/*A comment*/
3-
select * from person
3+
select * from person

liquibase-integration-tests/src/test/resources/changelogs/mssql/issues/data.types.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ CREATE TABLE [dbo].[dataTypeTestVARBINARY](
6565
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
6666
) ON [PRIMARY]
6767

68-
GO
68+
GO

liquibase-integration-tests/src/test/resources/changelogs/mssql/issues/default.values.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -448,4 +448,4 @@ GO
448448
ALTER TABLE [dbo].[dataTypeTestVARBINARY] ADD DEFAULT ((1)) FOR [VARBINARY_DEFAULT]
449449
GO
450450
ALTER TABLE [dbo].[dataTypeTestVARCHAR] ADD DEFAULT ((1)) FOR [VARCHAR_DEFAULT]
451-
GO
451+
GO

liquibase-integration-tests/src/test/resources/changelogs/mssql/issues/generate.changelog.table.view.comments.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ EXEC sp_addextendedproperty
4545
@name = N'MS_Description', @value = 'COMMENT 6. THIS IS A COMMENT ON SOME_VIEW.LASTNAME VIEW COLUMN. THIS VIEW COLUMN COMMENT SHOULD BE CAPTURED.',
4646
@level0type = N'Schema', @level0name = 'dbo',
4747
@level1type = N'View', @level1name = 'SOME_VIEW',
48-
@level2type = N'Column', @level2name = 'LASTNAME';
48+
@level2type = N'Column', @level2name = 'LASTNAME';

liquibase-integration-tests/src/test/resources/changelogs/mssql/issues/merge.statement.changelog.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ MERGE INTO Gender AS t
1919
WHEN MATCHED THEN
2020
UPDATE SET t.Gender = s.Gender
2121
WHEN NOT MATCHED THEN
22-
INSERT (id, Gender) VALUES (s.id, s.Gender);
22+
INSERT (id, Gender) VALUES (s.id, s.Gender);

liquibase-integration-tests/src/test/resources/changelogs/mssql/issues/transaction.test.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ COMMIT
1414

1515
INSERT INTO test.dbo.person(id, name)
1616
VALUES(2, 'Name2');
17-
GO
17+
GO

liquibase-integration-tests/src/test/resources/changelogs/mysql/complete/createtable.and.view.changelog.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
select * from test_table
1818
</createView>
1919
</changeSet>
20-
</databaseChangeLog>
20+
</databaseChangeLog>

liquibase-integration-tests/src/test/resources/changelogs/mysql/complete/enum.changelog.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
</createTable>
2020
</changeSet>
2121

22-
</databaseChangeLog>
22+
</databaseChangeLog>
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
select * from person;
22
/*A comment*/
3-
select * from person
3+
select * from person

liquibase-integration-tests/src/test/resources/changelogs/oracle/complete/createAllOracleSchemaObjectTypes.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ END;
6161

6262
CREATE CONTEXT ctx_test USING pkg_test;
6363
DROP CONTEXT ctx_test;
64-
64+

liquibase-integration-tests/src/test/resources/changelogs/oracle/complete/sampleproc.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ begin
55
DBMS_OUTPUT.PUT_LINE('Hello From The Database Again!');
66
DBMS_OUTPUT.PUT_LINE('Hello Test!');
77

8-
end;
8+
end;

liquibase-integration-tests/src/test/resources/changelogs/pgsql/complete/basic.formatted.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ create table person
88
address1 varchar(50),
99
address2 varchar(50),
1010
city varchar(30)
11-
)
11+
)

liquibase-integration-tests/src/test/resources/changelogs/pgsql/complete/testBlob.changelog.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
</insert>
2020
</changeSet>
2121

22-
</databaseChangeLog>
22+
</databaseChangeLog>

liquibase-integration-tests/src/test/resources/changelogs/pgsql/update/showSummaryWithLabels.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbch
4444
</createTable>
4545
</changeSet>
4646

47-
</databaseChangeLog>
47+
</databaseChangeLog>
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
select * from person;
22
/*A comment*/
3-
select * from person
3+
select * from person

liquibase-integration-tests/src/test/resources/changelogs/yaml/create.procedure.back.compatibility.changelog.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ databaseChangeLog:
1212
BEGIN
1313
raise notice 'this is test';
1414
END $$
15-
procedureName: MyProc
15+
procedureName: MyProc

liquibase-integration-tests/src/test/resources/changelogs/yaml/rollback.tests.changelog.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ databaseChangeLog:
116116
rollback:
117117
- sqlFile:
118118
stripComments: true
119-
path: changelogs/common/rollbackinclude/rollbackTables.sql
119+
path: changelogs/common/rollbackinclude/rollbackTables.sql

liquibase-integration-tests/src/test/resources/changelogs/yaml/rollbackinclude/createTables.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ create table sqlfilerollback (id int);
66
/**
77
Some morecomments go here
88
**/
9-
create table sqlfilerollback2 (id int);
9+
create table sqlfilerollback2 (id int);
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
drop table sqlfilerollback;
2-
drop table sqlfilerollback2;
2+
drop table sqlfilerollback2;

liquibase-integration-tests/src/test/resources/hibernate/Hibernate.cfg.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828

2929
</session-factory>
3030

31-
</hibernate-configuration>
31+
</hibernate-configuration>

liquibase-integration-tests/src/test/resources/hibernate/org/hibernate/auction/AuctionItem.hbm.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939

4040
</class>
4141

42-
</hibernate-mapping>
42+
</hibernate-mapping>

0 commit comments

Comments
 (0)