Skip to content

Commit b2ccb67

Browse files
anthonysenaanthonysena
committed
Revert "V2.0.0 Release"
1 parent a6011b3 commit b2ccb67

File tree

236 files changed

+862
-10458
lines changed

Some content is hidden

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

236 files changed

+862
-10458
lines changed

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
*application.properties
2-
.idea/
3-
*.iml
42
sandbox/
53
/target/
64
.settings

‎.idea/compiler.xml

-32
This file was deleted.

‎pom.xml

+72-79
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
<version>1.0.0-SNAPSHOT</version>
1010
<name>WebAPI</name>
1111
<properties>
12-
<webapi.version>2.0.0</webapi.version>
1312
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1413
<jersey.version>2.14</jersey.version>
1514
<!-- Spring Boot manages spring.version as well -->
1615
<spring.boot.version>1.2.1.RELEASE</spring.boot.version>
1716
<spring.batch.version>3.0.3.RELEASE</spring.batch.version>
1817
<flyway.version>3.1</flyway.version>
19-
<waffle.version>1.7.3</waffle.version>
2018
<start-class>org.ohdsi.webapi.WebApi</start-class>
2119

2220
<!-- Primary DataSource -->
@@ -45,24 +43,8 @@
4543

4644
<spring.batch.repository.tableprefix>${datasource.ohdsi.schema}.BATCH_</spring.batch.repository.tableprefix>
4745
<spring.batch.repository.isolationLevelForCreate>ISOLATION_READ_COMMITTED</spring.batch.repository.isolationLevelForCreate>
46+
4847
<spring.profiles.active>default</spring.profiles.active>
49-
50-
<security.enabled>false</security.enabled>
51-
<security.token.expiration>43200</security.token.expiration>
52-
<security.origin>http://localhost</security.origin>
53-
<security.ssl.enabled>false</security.ssl.enabled>
54-
<security.oauth.callback.ui>http://localhost/Atlas/#/welcome</security.oauth.callback.ui>
55-
<security.oauth.callback.api>http://localhost:8080/WebAPI/user/oauth/callback</security.oauth.callback.api>
56-
<security.oauth.google.apiKey></security.oauth.google.apiKey>
57-
<security.oauth.google.apiSecret></security.oauth.google.apiSecret>
58-
<security.oauth.facebook.apiKey></security.oauth.facebook.apiKey>
59-
<security.oauth.facebook.apiSecret></security.oauth.facebook.apiSecret>
60-
61-
<!-- EMBEDDED SERVER CONFIGURATION (ServerProperties) -->
62-
<server.port>8080</server.port>
63-
<server.ssl.key-store></server.ssl.key-store>
64-
<server.ssl.key-store-password></server.ssl.key-store-password>
65-
<server.ssl.key-password></server.ssl.key-password>
6648
</properties>
6749
<build>
6850
<finalName>WebAPI</finalName>
@@ -139,8 +121,8 @@
139121
<version>2.5.1</version>
140122
<inherited>true</inherited>
141123
<configuration>
142-
<source>1.8</source>
143-
<target>1.8</target>
124+
<source>1.7</source>
125+
<target>1.7</target>
144126
</configuration>
145127
</plugin>
146128
<plugin>
@@ -340,15 +322,17 @@
340322
<version>${flyway.version}</version>
341323
</dependency>
342324
<dependency>
343-
<groupId>org.apache.httpcomponents</groupId>
344-
<artifactId>httpclient</artifactId>
345-
<version>4.3.6</version>
346-
</dependency>
347-
<dependency>
348-
<groupId>commons-httpclient</groupId>
349-
<artifactId>commons-httpclient</artifactId>
350-
<version>3.1</version>
351-
</dependency>
325+
<groupId>org.apache.httpcomponents</groupId>
326+
<artifactId>httpclient</artifactId>
327+
<version>4.3.6</version>
328+
</dependency>
329+
<dependency>
330+
<groupId>commons-httpclient</groupId>
331+
<artifactId>commons-httpclient</artifactId>
332+
<version>3.1</version>
333+
</dependency>
334+
335+
352336
<dependency>
353337
<groupId>org.springframework.batch</groupId>
354338
<artifactId>spring-batch-admin-manager</artifactId>
@@ -364,17 +348,13 @@
364348
</exclusion>
365349
</exclusions>
366350
</dependency>
351+
367352
<dependency>
368353
<groupId>org.postgresql</groupId>
369354
<artifactId>postgresql</artifactId>
370355
<version>9.4-1201-jdbc41</version>
371356
<type>jar</type>
372357
</dependency>
373-
<dependency>
374-
<groupId>com.microsoft.sqlserver</groupId>
375-
<artifactId>mssql-jdbc</artifactId>
376-
<version>6.1.0.jre8</version>
377-
</dependency>
378358
<dependency>
379359
<groupId>com.opencsv</groupId>
380360
<artifactId>opencsv</artifactId>
@@ -387,46 +367,6 @@
387367
<version>4.1</version>
388368
<type>jar</type>
389369
</dependency>
390-
<dependency>
391-
<groupId>org.apache.shiro</groupId>
392-
<artifactId>shiro-core</artifactId>
393-
<version>1.2.4</version>
394-
</dependency>
395-
<dependency>
396-
<groupId>org.apache.shiro</groupId>
397-
<artifactId>shiro-web</artifactId>
398-
<version>1.2.4</version>
399-
</dependency>
400-
<dependency>
401-
<groupId>org.apache.shiro</groupId>
402-
<artifactId>shiro-spring</artifactId>
403-
<version>1.2.4</version>
404-
</dependency>
405-
<dependency>
406-
<groupId>com.github.dblock.waffle</groupId>
407-
<artifactId>waffle-shiro</artifactId>
408-
<version>1.7.4</version>
409-
</dependency>
410-
<dependency>
411-
<groupId>com.github.dblock.waffle</groupId>
412-
<artifactId>waffle-jna</artifactId>
413-
<version>${waffle.version}</version>
414-
</dependency>
415-
<dependency>
416-
<groupId>io.jsonwebtoken</groupId>
417-
<artifactId>jjwt</artifactId>
418-
<version>0.6.0</version>
419-
</dependency>
420-
<dependency>
421-
<groupId>io.buji</groupId>
422-
<artifactId>buji-pac4j</artifactId>
423-
<version>2.0.2</version>
424-
</dependency>
425-
<dependency>
426-
<groupId>org.pac4j</groupId>
427-
<artifactId>pac4j-oauth</artifactId>
428-
<version>1.9.2</version>
429-
</dependency>
430370
</dependencies>
431371
<profiles>
432372
<profile>
@@ -444,7 +384,6 @@
444384
<flyway.datasource.username>user</flyway.datasource.username>
445385
<flyway.datasource.password>pass</flyway.datasource.password>
446386
<flyway.locations>classpath:db/migration/oracle</flyway.locations>
447-
<hibernate.dialect>org.hibernate.dialect.Oracle10gDialect</hibernate.dialect>
448387
</properties>
449388
<dependencies>
450389
<dependency>
@@ -469,7 +408,6 @@
469408
<flyway.datasource.username>userWithWritesToOhdsiSchema</flyway.datasource.username>
470409
<flyway.datasource.password>PASS</flyway.datasource.password>
471410
<flyway.locations>classpath:db/migration/postgresql</flyway.locations>
472-
<hibernate.dialect>org.hibernate.dialect.PostgreSQL9Dialect</hibernate.dialect>
473411
</properties>
474412
</profile>
475413
<profile>
@@ -486,8 +424,63 @@
486424
<flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
487425
<flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
488426
<flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
489-
<hibernate.dialect>org.hibernate.dialect.SQLServer2012Dialect</hibernate.dialect>
490427
</properties>
491-
</profile>
428+
<dependencies>
429+
<dependency>
430+
<groupId>com.microsoft.sqlserver</groupId>
431+
<artifactId>sqljdbc4</artifactId>
432+
<version>4.0</version>
433+
<type>jar</type>
434+
</dependency>
435+
</dependencies>
436+
</profile>
437+
<profile>
438+
<id>webapi-local</id>
439+
<properties>
440+
<datasource.driverClassName>com.microsoft.sqlserver.jdbc.SQLServerDriver</datasource.driverClassName>
441+
<datasource.url>jdbc:sqlserver://server</datasource.url>
442+
<datasource.username>USER</datasource.username>
443+
<datasource.password>PASS</datasource.password>
444+
<datasource.dialect>sql server</datasource.dialect>
445+
<datasource.ohdsi.schema>OHDSI_schema</datasource.ohdsi.schema>
446+
<flyway.datasource.driverClassName>${datasource.driverClassName}</flyway.datasource.driverClassName>
447+
<flyway.datasource.url>${datasource.url}</flyway.datasource.url>
448+
<flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
449+
<flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
450+
<flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
451+
</properties>
452+
<dependencies>
453+
<dependency>
454+
<groupId>com.microsoft.sqlserver</groupId>
455+
<artifactId>sqljdbc4</artifactId>
456+
<version>4.0</version>
457+
<type>jar</type>
458+
</dependency>
459+
</dependencies>
460+
</profile>
461+
<profile>
462+
<id>webapi-alpha</id>
463+
<properties>
464+
<datasource.driverClassName>com.microsoft.sqlserver.jdbc.SQLServerDriver</datasource.driverClassName>
465+
<datasource.url>jdbc:sqlserver://server</datasource.url>
466+
<datasource.username>USER</datasource.username>
467+
<datasource.password>PASS</datasource.password>
468+
<datasource.dialect>sql server</datasource.dialect>
469+
<datasource.ohdsi.schema>OHDSI_schema</datasource.ohdsi.schema>
470+
<flyway.datasource.driverClassName>${datasource.driverClassName}</flyway.datasource.driverClassName>
471+
<flyway.datasource.url>${datasource.url}</flyway.datasource.url>
472+
<flyway.datasource.username>FLYWAY_USER</flyway.datasource.username>
473+
<flyway.datasource.password>FLYWAY_PASS</flyway.datasource.password>
474+
<flyway.locations>classpath:db/migration/sqlserver</flyway.locations>
475+
</properties>
476+
<dependencies>
477+
<dependency>
478+
<groupId>com.microsoft.sqlserver</groupId>
479+
<artifactId>sqljdbc4</artifactId>
480+
<version>4.0</version>
481+
<type>jar</type>
482+
</dependency>
483+
</dependencies>
484+
</profile>
492485
</profiles>
493486
</project>

0 commit comments

Comments
 (0)