Repository: falcon Updated Branches: refs/heads/0.9 1d7a4a015 -> 601929630
FALCON-1778 Check licenses and copyright information (By Pallavi Rao) Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/60192963 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/60192963 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/60192963 Branch: refs/heads/0.9 Commit: 6019296304594bd6a334c7b947d67c05fcaf5a39 Parents: 1d7a4a0 Author: Pallavi Rao <[email protected]> Authored: Fri Jan 29 15:01:52 2016 +0530 Committer: Pallavi Rao <[email protected]> Committed: Fri Jan 29 15:01:52 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 6 ++++-- docs/src/site/twiki/FalconNativeScheduler.twiki | 4 ++-- scheduler/pom.xml | 5 +---- src/conf/statestore.properties | 4 +++- 4 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/60192963/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f4d029f..fb0d251 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,7 @@ Apache Falcon Change log Release Version: 0.9 + FALCON-1778 Check licenses and copyright information (Pallavi Rao) + FALCON-1718 Change version in pom.xml(Pallavi Rao via Ajay Yadava) FALCON-1594 Update changes.txt to reflect 0.8 as released version(Sowmya Ramesh via Ajay Yadava) @@ -208,8 +210,6 @@ Release Version: 0.9 FALCON-1578 post-processing action fails with javax.servlet.jsp.el.ELException(Venkat Ramachandran via Ajay Yadava) - FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (Sowmya Ramesh via Pallavi Rao) - FALCON-1553 Flaky test in SchedulerUtilTest (Balu Vellanki via Pallavi Rao) FALCON-1554 Fix Changes.txt after 0.8 branch cut(Sowmya Ramesh) @@ -294,6 +294,8 @@ Release version: 0.8 FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao) BUG FIXES + FALCON-1579 post-processing action fails with javax.servlet.jsp.el.ELException (Sowmya Ramesh via Pallavi Rao) + FALCON-1563 Old feed instances get deleted from SLA monitoring on feed update (Ajay Yadava). FALCON-1560 Lifecycle does not allow feed with frequency greater than days(1) (Ajay Yadava). http://git-wip-us.apache.org/repos/asf/falcon/blob/60192963/docs/src/site/twiki/FalconNativeScheduler.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/FalconNativeScheduler.twiki b/docs/src/site/twiki/FalconNativeScheduler.twiki index 6f0679e..255f216 100644 --- a/docs/src/site/twiki/FalconNativeScheduler.twiki +++ b/docs/src/site/twiki/FalconNativeScheduler.twiki @@ -113,7 +113,7 @@ usage: schema </verbatim> -Currently, MySQL and Derby are supported as state stores. We may extend support to other DBs in the future. Falcon has been tested against MySQL v5.5. +Currently, MySQL and Derby are supported as state stores. We may extend support to other DBs in the future. Falcon has been tested against MySQL v5.5. If you are using MySQL ensure you also copy mysql-connector-java-<version>.jar under __$FALCON_HOME/server/webapp/falcon/WEB-INF/lib__ and __$FALCON_HOME/client/lib__ ---++++ Using Derby as the State Store Using Derby is ideal for QA and staging setup. Falcon comes bundled with a Derby connector and no explicit setup is required (although you can set it up) in terms creating the DB or tables. @@ -210,4 +210,4 @@ Response: ua1/RERUN ua2/RERUN Request Id: ua1/871377866@qtp-630572412-35 - 8d118d4d-c0ef-4335-a9af-10364498ec4f ua2/1554129706@qtp-536122141-13 - c2a3fc50-8b05-47ce-9c85-ca432b96d923 -</verbatim> \ No newline at end of file +</verbatim> http://git-wip-us.apache.org/repos/asf/falcon/blob/60192963/scheduler/pom.xml ---------------------------------------------------------------------- diff --git a/scheduler/pom.xml b/scheduler/pom.xml index e0be78e..360000d 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -142,6 +142,7 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>${mysql.version}</version> + <scope>provided</scope> </dependency> <dependency> @@ -203,10 +204,6 @@ <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> </artifactItem> - <artifactItem> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </artifactItem> </artifactItems> <outputDirectory>${project.build.directory}/dependency</outputDirectory> </configuration> http://git-wip-us.apache.org/repos/asf/falcon/blob/60192963/src/conf/statestore.properties ---------------------------------------------------------------------- diff --git a/src/conf/statestore.properties b/src/conf/statestore.properties index de5ad8f..4be5b96 100644 --- a/src/conf/statestore.properties +++ b/src/conf/statestore.properties @@ -22,6 +22,8 @@ #*.falcon.state.store.impl=org.apache.falcon.state.store.jdbc.JDBCStateStore #*.falcon.statestore.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver ## Falcon currently supports derby and mysql, change url based on DB. +## If you are using MySQL ensure you also copy mysql-connector-java-<version>.jar under +## $FALCON_HOME/server/webapp/falcon/WEB-INF/lib and $FALCON_HOME/client/lib #*.falcon.statestore.jdbc.url=jdbc:derby:data/falcon.db;create=true ## StateStore credentials file where username,password and other properties can be stored securely. @@ -43,4 +45,4 @@ ## If set to true, it creates the DB schema if it does not exist. If the DB schema exists is a NOP. ## If set to false, it does not create the DB schema. If the DB schema does not exist it fails start up. ## In production environments it is recommended not to change this property,create schema using tool provided by falcon. -#*.falcon.statestore.create.db.schema=false \ No newline at end of file +#*.falcon.statestore.create.db.schema=false
