Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1732 Spline 0.6 integration #1739

Merged
merged 118 commits into from
Jun 2, 2021

Commits on Mar 19, 2020

  1. Update versions for release v2.0.0

    GeorgiChochov authored and benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    870384a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    228eb4f View commit details
    Browse the repository at this point in the history
  3. #1126: Spline 0.4.x in Oozie (#1127)

    * #1126: Spline 0.4.x in Oozie
    * new setting for Spline used by Oozie
    * changed Oozie template
    * optional spline.mode setting support
    * applied some code hints
    benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    f925ba3 View commit details
    Browse the repository at this point in the history
  4. #1110: Make Standardization and Conformance use Spline 0.4.x (#1119)

    #1110: Make Standardization and Conformance use Spline 0.4.x
    * Change Spline version
    * Make **Standardization** and **Confluence** depend and init the new Spline module instead of the old ones
    * Replacing Spline properties in templates
    * Using a different JSON library (instead of the one transitionally ingested from old Spline)
    * Application properties templates adjutsted
    * Helper scripts updated
    * README.md updated (addressing also changes in Menas and Oozie from other PR)
    * Missing copyright headers
    Co-authored-by: Georgi Chochov <g.chochov@gmail.com>
    benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    8132eba View commit details
    Browse the repository at this point in the history
  5. #1111: Integrate Spline 0.4.x to Menas (#1125)

    * Server-side api endpoints to provide new configuration
    * Server-side controller to serve the Spline WebJar
    * Client-side changes to gather the lineage id and display the lineage new UI
    * Added dependency to include the webjar
    * Header to allow iframe display `<frame-options policy="SAMEORIGIN"/>`
    * fixed `style.css`
    benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    7eb50b6 View commit details
    Browse the repository at this point in the history
  6. #735: Integrate Spline 0.4.x

    * Rebasing to current `Develop`
    benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    824d9cc View commit details
    Browse the repository at this point in the history
  7. #735: Integrate Spline 0.4.x

    * Unused import removed
    benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    6c0b1b2 View commit details
    Browse the repository at this point in the history
  8. Spline 0.4.2

    benedeki committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    2d10c5f View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Configuration menu
    Copy the full SHA
    35806d6 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Upgrade to Spline 0.5.x

    benedeki committed May 11, 2020
    Configuration menu
    Copy the full SHA
    106154d View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Configuration menu
    Copy the full SHA
    9f15b2f View commit details
    Browse the repository at this point in the history
  2. * Added named versions to main pom.xml for Spline and other depende…

    …ncies
    
    * Version names sorted alphabetically
    benedeki committed May 12, 2020
    Configuration menu
    Copy the full SHA
    cee0c49 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Merge branch 'develop' into feature/735-integrate-spline-0-4-x

    # Conflicts (resolved):
    #	pom.xml
    #	scripts/bash/run_enceladus.sh
    #	spark-jobs/pom.xml
    benedeki committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    100c99f View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Update to Spline libs 0.5.3

    benedeki committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    7277669 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Configuration menu
    Copy the full SHA
    18cb47f View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Configuration menu
    Copy the full SHA
    dcde55e View commit details
    Browse the repository at this point in the history
  2. #1424 Add Menas Dockerfile

    Zejnilovic authored Jul 13, 2020
    Configuration menu
    Copy the full SHA
    a817cfe View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge branch 'develop' into aws-poc

    % Conflicts:
    %	dao/pom.xml
    %	data-model/pom.xml
    %	examples/pom.xml
    %	menas/pom.xml
    %	menas/src/main/resources/application.properties.template
    %	migrations-cli/pom.xml
    %	migrations/pom.xml
    %	plugins-api/pom.xml
    %	plugins-builtin/pom.xml
    %	pom.xml
    %	spark-jobs/pom.xml
    %	utils/pom.xml
    dk1844 committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    e4432d1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1484 from AbsaOSS/aws-poc-update-from-develop-2.1…

    …2-snapshot
    
    Aws poc update from develop 2.12 snapshot
    dk1844 authored Aug 13, 2020
    Configuration menu
    Copy the full SHA
    ff10529 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    60d2948 View commit details
    Browse the repository at this point in the history
  4. #1416 - enceladus on S3:

     - all directly-hdfs touching stuff disabled (atum, performance measurements, info files, output path checking)
    
    # Add menasfargate into hosts
    sudo nano /etc/hosts
    # paste
    20.0.63.69 menasfargate
    # save & exit (ctrl+O, ctrl+X)
    
    # Running standardization works via:
    spark-submit --class za.co.absa.enceladus.standardization.StandardizationJob --conf "spark.driver.extraJavaOptions=-Dmenas.rest.uri=http://menasfargate:8080 -Dstandardized.hdfs.path=s3://euw1-ctodatadev-dev-bigdatarnd-s3-poc/enceladusPoc/ao-hdfs-data/stdOutput/standardized-{0}-{1}-{2}-{3}" ~/enceladusPoc/spark-jobs-2.11.0-SNAPSHOT.jar --menas-credentials-file ~/enceladusPoc/menas-credentials.properties --dataset-name dk_test1_emr285 --raw-format json --dataset-version 1 --report-date 2019-11-27 --report-version 1 2> ~/enceladusPoc/stderr.txt
    dk1844 committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    d41cc7e View commit details
    Browse the repository at this point in the history
  5. #1416 - enceladus on S3 - (crude) conformance works on s3 (s3 std inp…

    …ut, s3 conf output)
    
     0- all directly-hdfs touching stuff disabled (atum, performance measurements, info files, output path checking)
    
    # Add menasfargate into hosts
    sudo nano /etc/hosts
    # paste
    20.0.63.69 menasfargate
    # save & exit (ctrl+O, ctrl+X)
    
    # Running conformance works via:
    spark-submit --class za.co.absa.enceladus.conformance.DynamicConformanceJob --conf "spark.driver.extraJavaOptions=-Dmenas.rest.uri=http://menasfargate:8080 -Dstandardized.hdfs.path=s3://euw1-ctodatadev-dev-bigdatarnd-s3-poc/enceladusPoc/ao-hdfs-data/stdOutput/standardized-{0}-{1}-{2}-{3}" ~/enceladusPoc/spark-jobs-2.11.0-SNAPSHOT.jar --menas-credentials-file ~/enceladusPoc/menas-credentials.properties --dataset-name dk_test1_emr285 --dataset-version 1 --report-date 2019-11-27 --report-version 1 2> ~/enceladusPoc/conf-log.txt
    dk1844 committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    67e4012 View commit details
    Browse the repository at this point in the history
  6. ref issue = 1416

    dk1844 committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    ac0785d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a8d53f9 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2020

  1. PR updates

    dk1844 committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    85570d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. Configuration menu
    Copy the full SHA
    7be3afb View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2020

  1. Configuration menu
    Copy the full SHA
    aa69593 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'aws-poc' into feature/1416-aws-emr-poc

    % Conflicts:
    %	pom.xml
    dk1844 committed Aug 24, 2020
    Configuration menu
    Copy the full SHA
    0bd704c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1483 from AbsaOSS/feature/1416-aws-emr-poc

    Feature/1416 S3 input/output for Enceladus on EMR (S2.4, H2.8.5)
    dk1844 authored Aug 24, 2020
    Configuration menu
    Copy the full SHA
    0b60b1a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. #1503 Remove HDFS url Validation

    This is a temporary solution. We currently experiment with
    many forms of URLs, and having a regex there now slows us down.
    Zejnilovic committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    0450459 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2b3c39c View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2020

  1. s3 persistence (atum, sdk fs usage, ...) (#1526)

    #1526 
    * FsUtils divided into LocalFsUtils & HdfsUtils
    * PathConfigSuite update
    * S3FsUtils with tail-recursive pagination accumulation - now generic with optional short-circuit breakOut
    TestRunnerJob updated to manually cover the cases - should serve as a basis for tests
    * HdfsUtils replace by trait DistributedFsUtils (except for MenasCredentials loading & nonSplittable splitting)
    * using final version of s3-powered Atum (3.0.0)
    * mockito-update version update, scalatest version update
    * S3FsUtilsSuite: exists, read, sizeDir(hidden, non-hidden, reucursive), non-splittable (simple, recursive with breakOut), delete (recursive), version find (simple - empty, recursive)
    * explicit stubbing fix for hyperdrive
    dk1844 authored Oct 16, 2020
    Configuration menu
    Copy the full SHA
    5dfc40f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. Feature/1556 file access PoC using Hadoop FS API (#1586)

    * s3 using hadoop fs api
    * s3 sdk usage removed (pom, classes, tests)
    * atum final version 3.1.0 used
    * readStandardizationInputData(... path: String)(implicit ... fs: FileSystem) -> readStandardizationInputData(input: PathWithFs)
    dk1844 authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    5b5628e View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. 1554 Tomcat with TLS in Docker container (#1585)

    * #1554 Tomcat with TLS container
    
    * #1554 Added envoy config + enabling running unencrypted container
    AdrianOlosutean authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    4598946 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. Configuration menu
    Copy the full SHA
    a9efecd View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. Merge pull request #1606 from AbsaOSS/feature/1499-spline-in-menas-aws

    1499 Make Spline in Menas work for AWS
    lokm01 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    5da8e36 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. #1618 - fixes failing spline 0.5.5 integration by providing compatibl…

    …e commons library version. Test-ran on EMR. (#1619)
    dk1844 authored Dec 14, 2020
    Configuration menu
    Copy the full SHA
    34aefbb View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. #1612 Separation start

    Adrian-Olosutean committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    94586ad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dbd368f View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. Configuration menu
    Copy the full SHA
    3f7e513 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. Configuration menu
    Copy the full SHA
    17b19e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8cb6521 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f90ff2d View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2020

  1. Configuration menu
    Copy the full SHA
    b4debed View commit details
    Browse the repository at this point in the history
  2. WIP fixing merge issues

    Zejnilovic committed Dec 22, 2020
    Configuration menu
    Copy the full SHA
    c6094e1 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. * Merge compiles

    * Tests pass
    * Depends on ATUM 3.1.1-SNAPSHOT (the bugfix for AbsaOSS/atum#48)
    benedeki committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    9d39ca0 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2021

  1. #1612 Removed Spring from menas-web, enabled building war and static …

    …resources. Removed version subpath in menas-web + added theme dependencies in repo
    Adrian-Olosutean committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    d233991 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. Configuration menu
    Copy the full SHA
    5b9ebcd View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. * put back HDFS browser

    * put back Oozie
    * downgraded Spline
    benedeki committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    9e277b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. Merge branch 'aws-merge-to-develop' into feature/1612-separate-menas-…

    …into-2-tomcat-apps
    
    # Conflicts:
    #	menas/pom.xml
    #	menas/src/main/scala/za/co/absa/enceladus/menas/WebSecurityConfig.scala
    Adrian-Olosutean committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    785a60d View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/aws-merge-to-develop' into featu…

    …re/1612-separate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	menas-web/ui/service/RunRestDAO.js
    #	menas-web/ui/service/RunService.js
    #	menas/pom.xml
    #	menas/src/main/resources/application.properties.template
    #	menas/src/main/scala/za/co/absa/enceladus/menas/MvcConfig.scala
    #	menas/ui/index.html
    Adrian-Olosutean committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    b562100 View commit details
    Browse the repository at this point in the history
  3. * AWS SDK Exclusion

    benedeki committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    4689308 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a6458ba View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. * New ATUM version

    benedeki committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    0d95c42 View commit details
    Browse the repository at this point in the history
  2. * Adding missing files

    benedeki committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    267a457 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'develop' into aws-merge-to-develop

    Conflicts addressed:
    #	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/datasource/DatasourceSuite.scala
    #	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/interpreter/rules/RuleOptimizationSuite.scala
    #	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/interpreter/rules/RulesSuite.scala
    #	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/interpreter/rules/mapping/JoinMappingRuleInterpreterSuite.scala
    benedeki committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    105904b View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/aws-merge-to-develop' into featu…

    …re/1612-separate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	pom.xml
    Adrian-Olosutean committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    cc333a8 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2021

  1. Configuration menu
    Copy the full SHA
    86c3e00 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. Configuration menu
    Copy the full SHA
    6dec360 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2021

  1. 1622: Merge of aws-poc to develop brach

    * Addressed issues identified by reviewers
    benedeki committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    8702f88 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into aws-merge-to-develop

    Conflicts addressed:
    #	pom.xml
    #	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/interpreter/InterpreterSuite.scala
    #	utils/src/test/scala/za/co/absa/enceladus/utils/config/ConfigReaderSuite.scala
    benedeki committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    7999644 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. * comments improvement

    benedeki committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    2391788 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Configuration menu
    Copy the full SHA
    3050cbc View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Configuration menu
    Copy the full SHA
    34807fe View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/aws-merge-to-develop' into featu…

    …re/1612-separate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	menas/src/main/resources/start_menas.sh
    Adrian-Olosutean committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    c600ec7 View commit details
    Browse the repository at this point in the history
  3. #1612 Project version

    Adrian-Olosutean committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    3226a7f View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. #713 Add favicon

    Zejnilovic authored Jan 27, 2021
    Configuration menu
    Copy the full SHA
    3698268 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/1612-separ…

    …ate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	menas/Dockerfile
    #	pom.xml
    Adrian-Olosutean committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    edc540f View commit details
    Browse the repository at this point in the history
  2. #1612 Merges

    Adrian-Olosutean committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    42b0e4f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5781874 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/1612-separ…

    …ate-menas-into-2-tomcat-apps
    Adrian-Olosutean committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    c43aadc View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. Configuration menu
    Copy the full SHA
    ae777e6 View commit details
    Browse the repository at this point in the history
  2. #1612 other fixes

    Adrian-Olosutean committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    2140ce5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5aa0f13 View commit details
    Browse the repository at this point in the history
  4. #1612 newline

    Adrian-Olosutean committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    a52af47 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    06711aa View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. Configuration menu
    Copy the full SHA
    e1280b9 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/feature/1612-separate-menas-into…

    …-2-tomcat-apps' into feature/1612-separate-menas-into-2-tomcat-apps
    Adrian-Olosutean committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    5050dd1 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/1612-separ…

    …ate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	menas/ui/index.html
    Adrian-Olosutean committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    6e8f8bf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7ecbaed View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/1612-separ…

    …ate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	menas/ui/index.html
    Adrian-Olosutean committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    1da3133 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    da7d2ea View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. 1648 merge fix

    Adrian-Olosutean committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    2e63fc1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0164bfc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2ac4721 View commit details
    Browse the repository at this point in the history
  4. 1648 pom version

    Adrian-Olosutean committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    5b0c9f2 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/1612-separ…

    …ate-menas-into-2-tomcat-apps
    
    # Conflicts:
    #	menas/src/main/scala/za/co/absa/enceladus/menas/auth/AuthConstants.scala
    Adrian-Olosutean committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    4652194 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Configuration menu
    Copy the full SHA
    3e258c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. #601 Swagger 2 PoC

    Zejnilovic committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    0638069 View commit details
    Browse the repository at this point in the history
  2. #601 Swagger 2 PoC

    Zejnilovic committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    184c3d9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1e9f775 View commit details
    Browse the repository at this point in the history
  4. #601 Swagger 2 PoC

    Zejnilovic committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    17e3ad7 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Configuration menu
    Copy the full SHA
    cd4affb View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Configuration menu
    Copy the full SHA
    e56766d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3590d9f View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Configuration menu
    Copy the full SHA
    0132730 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Configuration menu
    Copy the full SHA
    7f86526 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. Merge remote-tracking branch 'origin/feature/601-swagger-poc' into fe…

    …ature/1612-separate-menas-into-2-tomcat-apps
    Adrian-Olosutean committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    988256f View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. Configuration menu
    Copy the full SHA
    f1741e3 View commit details
    Browse the repository at this point in the history
  2. #1732 fixed typo

    Adrian-Olosutean committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    25f6bb1 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. Merge branch 'develop' into feature/735-integrate-spline-0-4-x

    % Conflicts:
    %	menas/src/main/scala/za/co/absa/enceladus/menas/MvcConfig.scala
    %	menas/src/main/scala/za/co/absa/enceladus/menas/services/RunService.scala
    %	menas/src/test/resources/application.properties
    %	menas/ui/css/style.css
    %	pom.xml
    %	spark-jobs/pom.xml
    %	spark-jobs/src/main/scala/za/co/absa/enceladus/conformance/DynamicConformanceJob.scala
    %	spark-jobs/src/main/scala/za/co/absa/enceladus/standardization/StandardizationJob.scala
    %	spark-jobs/src/test/scala/za/co/absa/enceladus/conformance/interpreter/InterpreterSuite.scala
    %	utils/src/test/scala/za/co/absa/enceladus/utils/validation/field/ScalarFieldValidatorSuite.scala
    dk1844 committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    270ee7d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1584076 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c38394a View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Merge remote-tracking branch 'origin/feature/735-integrate-spline-0-4…

    …-x' into feature/1732-spline-06-integration
    
    # Conflicts:
    #	README.md
    #	menas-web/ui/service/RunService.js
    #	menas/pom.xml
    #	menas/src/main/resources/application.properties.template
    #	menas/src/main/scala/za/co/absa/enceladus/menas/MvcConfig.scala
    #	menas/src/test/resources/application.properties
    #	menas/ui/service/RunRestDAO.js
    #	pom.xml
    #	spark-jobs/pom.xml
    #	spark-jobs/src/main/resources/spline.properties.template
    Adrian-Olosutean committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    cd3b3b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Merge remote-tracking branch 'origin/develop-ver-3.0' into feature/17…

    …32-spline-06-integration
    
    # Conflicts:
    #	menas-web/Dockerfile
    #	menas-web/nginx.conf
    #	menas-web/start_menas_web.sh
    #	menas-web/ui/index.html
    #	menas-web/ui/package.json
    #	menas-web/ui/service/RestDAO.js
    #	menas-web/ui/service/RunRestDAO.js
    #	menas-web/ui/ui5.yaml
    #	menas/src/main/resources/start_menas.sh
    #	menas/src/main/scala/za/co/absa/enceladus/menas/WebSecurityConfig.scala
    AdrianOlosutean committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    7c3182c View commit details
    Browse the repository at this point in the history
  2. #1732 merge fixes

    AdrianOlosutean committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    6a030b8 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2021

  1. Configuration menu
    Copy the full SHA
    8587196 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Configuration menu
    Copy the full SHA
    c13555b View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/feature/1732-spline-06-integrati…

    …on' into feature/1732-spline-06-integration
    AdrianOlosutean committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    f3a8979 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. #1732 fix build issues

    AdrianOlosutean committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    d7e8dac View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. Configuration menu
    Copy the full SHA
    9d0d5a9 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Configuration menu
    Copy the full SHA
    6f5066f View commit details
    Browse the repository at this point in the history

Commits on May 18, 2021

  1. Merge branch 'feature/1770-rename-menas-web-to-menas' into feature/17…

    …32-spline-06-integration
    
    # Conflicts:
    #	README.md
    #	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/WebSecurityConfig.scala
    AdrianOlosutean committed May 18, 2021
    Configuration menu
    Copy the full SHA
    0199415 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Merge remote-tracking branch 'origin/develop-ver-3.0' into feature/17…

    …32-spline-06-integration
    
    # Conflicts:
    #	pom.xml
    #	spark-jobs/pom.xml
    #	spark-jobs/src/main/resources/spline.properties.template
    AdrianOlosutean committed May 25, 2021
    Configuration menu
    Copy the full SHA
    faa7a1f View commit details
    Browse the repository at this point in the history

Commits on May 27, 2021

  1. Configuration menu
    Copy the full SHA
    1923529 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/feature/1732-spline-06-integrati…

    …on' into feature/1732-spline-06-integration
    
    # Conflicts:
    #	rest-api/src/main/scala/za/co/absa/enceladus/rest_api/WebSecurityConfig.scala
    AdrianOlosutean committed May 27, 2021
    Configuration menu
    Copy the full SHA
    2c99bdb View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. Configuration menu
    Copy the full SHA
    b8e09cd View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Configuration menu
    Copy the full SHA
    dedb0ae View commit details
    Browse the repository at this point in the history