Skip to content

Commit 0f46940

Browse files
jackyq2015jackyq2015
authored
Merge pull request #1735 from OpenRefine/revert-1725-maven
Revert "Migrate to Maven"
2 parents bd11f21 + c20918b commit 0f46940

File tree

217 files changed

+1438
-1870
lines changed

Some content is hidden

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

217 files changed

+1438
-1870
lines changed

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,3 @@ test-out/
2727
/bin
2828
open-refine.log
2929
.vscode
30-
31-
main/target/
32-
main/webapp/WEB-INF/lib/
33-
server/target/
34-
extensions/*/target/
35-
extensions/*/module/MOD-INF/classes/
36-
extensions/*/module/MOD-INF/lib/

‎.travis.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,15 @@ before_install:
1818
- wget -O ~/codacy-coverage-reporter-assembly-latest.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/2.0.0/codacy-coverage-reporter-2.0.0-assembly.jar
1919
# create test database for mysql, mariadb and postgresql
2020
- mysql -u root -e 'CREATE DATABASE test_db;'
21-
- mysql -u root test_db < extensions/database/tests/conf/travis-mysql.sql
21+
- mysql -u root test_db < extensions/database/test/conf/travis-mysql.sql
2222
- psql -c 'CREATE DATABASE test_db;' -U postgres
23-
- psql -U postgres test_db < extensions/database/tests/conf/travis-pgsql.sql
24-
- cp extensions/database/tests/conf/travis_tests.xml extensions/database/tests/conf/tests.xml
25-
- mvn process-resources
23+
- psql -U postgres test_db < extensions/database/test/conf/travis-pgsql.sql
24+
- cp extensions/database/test/conf/travis_tests.xml extensions/database/test/conf/tests.xml
2625

2726
script:
28-
- ./refine test
27+
- ./refine server_test
28+
- ./refine extensions_test
2929

3030
after_success:
3131
- java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r build/report/jacoco.xml
3232

33-
cache:
34-
directories:
35-
- $HOME/.m2
36-

‎appveyor.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ clone_depth: 5
1111
skip_branch_with_pr: true
1212

1313
environment:
14+
ANT_HOME: C:\apache-ant-1.10.5
1415
JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
15-
MAVEN_HOME: C:\Program Files (x86)\Apache\Maven
1616

1717
matrix:
1818
fast_finish: true
1919

20+
install:
21+
- cmd: if not exist %ANT_HOME% pushd . && cd \ && appveyor DownloadFile http://www.mirrorservice.org/sites/ftp.apache.org//ant/binaries/apache-ant-1.10.5-bin.zip && 7z x apache-ant-1.10.5-bin.zip && popd
22+
23+
cache:
24+
- C:\apache-ant-1.10.5
25+
- apache-ant-1.10.5-bin.zip
2026
build: off
2127

2228
# scripts to run before test
@@ -26,20 +32,17 @@ before_test:
2632
PATH=C:\Program Files\PostgreSQL\9.6\bin\;C:\Program Files\MySQL\MySQL Server 5.7\bin\;%PATH%
2733
SET MYSQL_PWD=Password12!
2834
mysql -u root --password=Password12! -e "create database test_db;"
29-
mysql -u root test_db --password=Password12! < extensions\database\tests\conf\travis-mysql.sql
35+
mysql -u root test_db --password=Password12! < extensions\database\test\conf\travis-mysql.sql
3036
echo "localhost:*:test_db:postgres:Password12!" > C:\Program Files\PostgreSQL\9.6\pgpass.conf
3137
echo "localhost:*:test_db:postgres:Password12!" > pgpass.conf
3238
echo "localhost:*:test_db:postgres:Password12!" > %userprofile%\pgpass.conf
3339
SET PGPASSFILE=C:\Program Files\PostgreSQL\9.6\pgpass.conf
3440
SET PGPASSWORD=Password12!
3541
SET PGUSER=postgres
3642
createdb test_db
37-
psql -U postgres test_db < extensions\database\tests\conf\travis-pgsql.sql
43+
psql -U postgres test_db < extensions\database\test\conf\travis-pgsql.sql
3844
39-
copy extensions\database\tests\conf\appveyor_tests.xml extensions\database\tests\conf\tests.xml
40-
- cmd: |-
41-
mvn process-resources
42-
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
45+
copy extensions\database\test\conf\appveyor_tests.xml extensions\database\test\conf\tests.xml
4346
4447
test_script:
4548
- cmd: echo Running test_script...
@@ -48,8 +51,6 @@ test_script:
4851
4952
path
5053
51-
refine test
52-
53-
cache:
54-
- C:\Users\appveyor\.m2
55-
54+
refine server_test
55+
56+
refine extensions_test

0 commit comments

Comments
 (0)