diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml new file mode 100644 index 00000000000..5fd6e3ba324 --- /dev/null +++ b/.github/workflows/cibuild.yml @@ -0,0 +1,41 @@ +name: OTP CI Build +# On [push, pull_request] causes double-builds when creating PRs. +# But triggering on push only will miss pull requests from outside authors. +# The push event's ref is the name of the pushed branch; +# The pull_request event's branch name is the merge target branch. +on: + push: + branches: + - master + - dev-1.x + - dev-2.x + pull_request: + branches: + - master + - dev-1.x + - dev-2.x +jobs: + build: + runs-on: ubuntu-latest + steps: + # Starting in v2.2 checkout action fetches all tags when fetch-depth=0, for auto-versioning. + - uses: actions/checkout@v2.3.2 + with: + fetch-depth: 0 + # Java setup step completes very fast, no need to run in a preconfigured docker container + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: actions/cache@v2 + id: cache + with: + path: ~/.m2 + key: maven-local-repo + - name: Build and Test + run: mvn --batch-mode --update-snapshots verify + - name: Deploy to Github Package Registry + # if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mvn --batch-mode deploy --settings maven-settings.xml -DskipTests \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d0fddb3687b..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,61 +0,0 @@ -language: java -# OpenTripPlanner requires Java 11 -jdk: - - openjdk11 - -# Replace Travis's default Maven installation step with a no-op. -# This avoids redundantly pre-running 'mvn install -DskipTests' every time. -install: true - -# Replace Travis's default build step. -# Run all Maven phases at once up through verify, install, and deploy. -script: | - # only (attempt to) deploy non-pull request commits to the master branch or to tags - if [[ "$TRAVIS_PULL_REQUEST" = false ]] && [[ "$TRAVIS_BRANCH" = master || ! -z "$TRAVIS_TAG" ]]; then - mvn clean deploy --settings maven-settings.xml - else - # otherwise, just run test suite - mvn clean verify --settings maven-settings.xml -B -V -Dgpg.skip - fi - -# Secure envs are OSSRH_JIRA_USERNAME, OSSRH_JIRA_PASSWORD, GPG_KEY_NAME, GPG_PASSPHRASE -env: - global: - - JAVA_OPTS=-Xmx2g - - secure: SR50xh5n9H9ML20NM9QK3Y7rS1xzmMgLtp8Hke7fPL4QsCvdd1CTXTIjGPtCNzvEx0zUKIx1vO0s5mwnB0KyhTzwI8t5xvw7RErp7v7WiskKVKVkCu6EPDsTH1d3iQpF4QAFy/07HehCvGtObh3XnOYZKRfoxpY3/n9y/DxuKp8= - - secure: R8kd55l4UXde9pa6POKFFFmkp4N7KD03vCAiT5dEOvDDKBRIGo1n7Yn+txIhpe8VJVYDqAxOUdW9yZO29GWvjNTiFmDqbvC4GuzWqU+Am1Dfmi5Udmmswcy4CTeoNqKchhNn69EhphdFsKE+JzCZIJSo4+Gl0jAqxMBE13ghlBw= - - secure: LV+MX/r5l/ycNS1fQNxdzBLyGLnAsG8G3APWsvqb0Sou/fPncwjfGV178jxPUULhb8VAex+MIJsBObrQGD4vdvqBI9ASPHReplANLYrsAAzTm0bPkkyQCs37cDq9ORsETnR9j8m8G/0+8bxH81WOOEv56h4fiQog5z3cBbSGdh0= - - secure: cAXIX+Op0EXl3GHX5qCOGHrFQpPlvVSq8mh5zqABSICsMQHUgTyOgSNUykOdrOarjM2y2H1+Yu2MfLtu2v1hAS/zSzAswx+7T7xwptsX1bd+QX2s9+3q4OgG/97Il3Dqhbf9mGqxJyfWP4iD1Ry9IIlsIGk/coe877mkZCbKb2s= - -# If sudo is disabled, CI runs on container based infrastructure (allows caching &c.) -sudo: false - -# Retain the local Maven repository to speed up builds. -cache: - directories: - - $HOME/.m2/repository - -# Decrypt and import the artifact signing certificate before running the build -before_install: - - if [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then openssl aes-256-cbc -K $encrypted_9918733fe303_key -iv $encrypted_9918733fe303_iv -in maven-artifact-signing-key.asc.enc -out maven-artifact-signing-key.asc -d && gpg --import --batch maven-artifact-signing-key.asc; fi -before_deploy: -# Get branch name of current branch for use in jar name: https://graysonkoonce.com/getting-the-current-branch-name-during-a-pull-request-in-travis-ci/ -- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) -# Copy shaded jar over to deploy dir as git-described jar (either version or version+commit) and branch-specific jar. -- mkdir deploy -- cp target/*-shaded.jar deploy/otp-$(git describe --always).jar -- cp target/*-shaded.jar deploy/otp-latest-$BRANCH.jar -deploy: - provider: s3 - skip_cleanup: true - # AWS CI user: opentripplanner-ci - access_key_id: AKIAJEQQINNZK2IDHMJQ - secret_access_key: - secure: CCRXXGZ0RXSUQaVKHFlZjleEygesT3ec/rHUf28l7lw1XxOZBZulONqydL45OIQUM26JYge2SK+rMJfcN38qPVHXVbYQgGdcKnCQN76Kxj3MoNbMXrrvaKPZZq6jP0TOTHUTIh4TGO5Bu5nM6fV7zcySCFchC6yMF9EC90jDDns= - # Upload jars found in local directory to s3 bucket - local-dir: deploy - bucket: opentripplanner-builds - acl: public_read - on: - repo: opentripplanner/OpenTripPlanner - all_branches: true \ No newline at end of file diff --git a/docs/javadoc/README.md b/docs/javadoc/README.md deleted file mode 100644 index 78bf5df8c0a..00000000000 --- a/docs/javadoc/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# OTP JavaDoc - - -With OTP2, we are not targeting use of OTP as a library, so HTML Javadoc is -not as relevant. Use the source artifact, github or an IDE to explore the -code instead. - -Maven Central Repository require javadoc to be present, but it is ok to -provide a fake one: - -> If, for some reason (for example, license issue or it's a Scala project), you can not provide -> -sources.jar or -javadoc.jar , please make fake -sources.jar or -javadoc.jar with simple README -> inside to pass the checking. We do not want to disable the rules because some people tend to skip -> it if they have an option and we want to keep the quality of the user experience as high as -> possible. - -See: [Maven Central Repository - Requirements](https://central.sonatype.org/pages/requirements.html) - -There is no JavaDoc provided for OTP, use the source artifact, github or an ide to explore the code. diff --git a/maven-artifact-signing-key.asc.enc b/maven-artifact-signing-key.asc.enc deleted file mode 100644 index f4b89dc0e41..00000000000 Binary files a/maven-artifact-signing-key.asc.enc and /dev/null differ diff --git a/maven-settings.xml b/maven-settings.xml index eac060f03a1..b6daf210a50 100644 --- a/maven-settings.xml +++ b/maven-settings.xml @@ -1,26 +1,13 @@ - + - ossrh - ${env.OSSRH_JIRA_USERNAME} - ${env.OSSRH_JIRA_PASSWORD} + github + NONE + ${env.GITHUB_TOKEN} - - - ossrh - - true - - - gpg - ${env.GPG_KEY_NAME} - ${env.GPG_PASSPHRASE} - - - diff --git a/pom.xml b/pom.xml index d1aac9a82c0..bbafa78414e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,50 +17,7 @@ - - - - Andrew Byrd - andrew@fastmail.net - Conveyal - http://conveyal.com/ - - - Matt Conway - matt@indicatrix.org - Conveyal - http://conveyal.com/ - - - Thomas Gran - tgr@capraconsulting.no - Ruter and Entur - http://entur.org/ - - - Laurent Grégoire - laurent.gregoire@protonmail.ch - Mecatran - http://www.mecatran.com/ - - - Gard Mellemstrand - gard.mellemstrand@entur.org - Entur - http://entur.org/ - - - David Novalis Turner - novalis@novalis.org - Ex-OpenPlans - http://openplans.org/ - - - - scm:git:http://github.com/opentripplanner/OpenTripPlanner.git - scm:git:ssh://git@github.com/opentripplanner/OpenTripPlanner.git http://github.com/opentripplanner/OpenTripPlanner @@ -75,12 +32,11 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - + + github + OpenTripPlanner Maven Repository on Github Packages + https://maven.pkg.github.com/opentripplanner/OpenTripPlanner/ + @@ -203,18 +159,6 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - com.webcohesion.enunciate enunciate-maven-plugin @@ -232,13 +176,6 @@ ${project.build.directory}/site/enunciate - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - true - org.apache.maven.plugins maven-source-plugin @@ -285,21 +222,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - - verify - - sign - - - - org.apache.maven.plugins maven-surefire-plugin