Skip to content

Commit

Permalink
Merge branch 'embulk:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
giwa authored Dec 14, 2022
2 parents 3d47240 + 6a70969 commit 90ee6aa
Show file tree
Hide file tree
Showing 14 changed files with 497 additions and 200 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check
on: [ pull_request, push ]
jobs:
check:
runs-on: ubuntu-latest
# push: always run.
# pull_request: run only when the PR is submitted from a forked repository, not within this repository.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Set up OpenJDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: "temurin"
cache: "gradle"
- name: Check
run: ./gradlew --stacktrace check
32 changes: 32 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Publish
on:
push:
tags:
- "v1.*"
jobs:
publish:
environment:
name: maven-central-and-ruby-gems
runs-on: ubuntu-latest
strategy:
fail-fast: true
steps:
- uses: actions/checkout@v2
- name: Set up OpenJDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: "temurin"
- name: Publish
run: |
mkdir -p $HOME/.gem
touch $HOME/.gem/credentials
chmod 0600 $HOME/.gem/credentials
printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials
./gradlew --stacktrace publishMavenPublicationToMavenCentralRepository gemPush
env:
ORG_GRADLE_PROJECT_ossrhUsername: embulk
ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY_ARMOR }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}
RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
14 changes: 11 additions & 3 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
embulk-output-s3
Copyright 2015 Manabu Takayama, and the Embulk project

This product includes software developed by Manabu Takayama, and in a part of the Embulk project (https://www.embulk.org/).
It was originally developed by Manabu Takayama (https://github.com/llibra), and then transferred to the Embulk project.
It was originally licenced under the MIT License before the transfer, and it is now licensed under the Apache Software License, Version 2.0.
This product includes software developed by
Manabu Takayama (https://github.com/llibra), and at
the Embulk project (https://www.embulk.org/).

This product was originally developed by
Manabu Takayama, then transferred to
the Embulk project.

This product was originally licenced under
the MIT License before the transfer, then re-licensed under
the Apache Software License, Version 2.0.
129 changes: 112 additions & 17 deletions NOTICE_GEM
Original file line number Diff line number Diff line change
@@ -1,30 +1,125 @@
embulk-output-s3
Copyright 2015 Manabu Takayama, and the Embulk project

This product includes software developed by Manabu Takayama, and in a part of the Embulk project (https://www.embulk.org/).
It was originally developed by Manabu Takayama (https://github.com/llibra), and then transferred to the Embulk project.
It was originally licenced under the MIT License before the transfer, and it is now licensed under the Apache Software License, Version 2.0.
This product includes software developed by
Manabu Takayama (https://github.com/llibra), and at
the Embulk project (https://www.embulk.org/).

The gem distribution of this product includes JARs of the Jackson project (https://github.com/FasterXML/jackson), as-is.
This product was originally developed by
Manabu Takayama, then transferred to
the Embulk project.

This product was originally licenced under
the MIT License before the transfer, then re-licensed under
the Apache Software License, Version 2.0.


The gem distribution of this product includes products of
the Jackson project, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: https://github.com/FasterXML/jackson


The gem distribution of this product includes products of
the Jakarta Bean Validation API 1.1, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: https://beanvalidation.org/1.1/


The gem distribution of this product includes products of
AWS SDK For Java 1.x, and Amazon Ion Java, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/welcome.html
See: https://github.com/amzn/ion-java

---------------- NOTICE of AWS SDK For Java 1.x ----------------
AWS SDK for Java
Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.

This product includes software developed by
Amazon Technologies, Inc (http://www.amazon.com/).

**********************
THIRD PARTY COMPONENTS
**********************
This software includes third party software subject to the following copyrights:
- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.

The gem distribution of this product includes JARs of the Jakarta Bean Validation API 1.1 (https://beanvalidation.org/1.1/), as-is.
It is licensed under the Apache Software License, Version 2.0.
The licenses for these third party components are included in LICENSE.txt
---------------- NOTICE of AWS SDK For Java 1.x ----------------

The gem distribution of this product includes JARs of AWS SDK For Java 1.x (https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/welcome.html), and Amazon Ion Java (https://github.com/amzn/ion-java), as-is.

The gem distribution of this product includes products of
Joda-Time, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: https://www.joda.org/joda-time/

---------------------- NOTICE of Joda-Time ---------------------
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
This product includes software developed by
Joda.org (https://www.joda.org/).
---------------------- NOTICE of Joda-Time ---------------------

The gem distribution of this product includes a JAR of Joda-Time (https://www.joda.org/joda-time/), as-is.
It is licensed under the Apache Software License, Version 2.0.

The gem distribution of this product includes a JAR of the Apache Commons Codec (https://commons.apache.org/proper/commons-codec/), as-is.
It is licensed under the Apache Software License, Version 2.0.
The gem distribution of this product includes products of
the Apache Commons Codec, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: https://commons.apache.org/proper/commons-codec/

-------------- NOTICE of the Apache Commons Codec --------------
Apache Commons Codec
Copyright 2002-2020 The Apache Software Foundation

The gem distribution of this product includes a JAR of the Apache HttpClient 4.5 (http://hc.apache.org/httpcomponents-client-4.5.x/index.html), as-is.
It is licensed under the Apache Software License, Version 2.0.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

The gem distribution of this product includes a JAR of the Apache HttpCore 4.4 (http://hc.apache.org/httpcomponents-core-4.4.x/index.html), as-is.
It is licensed under the Apache Software License, Version 2.0.
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
contains test data from http://aspell.net/test/orig/batch0.tab.
Copyright (C) 2002 Kevin Atkinson ([email protected])

The gem distribution of this product includes a JAR of the JCL 1.2 implemented over SLF4J (http://www.slf4j.org/legacy.html) 1.7, as-is.
It is licensed under the Apache Software License, Version 2.0.
===============================================================================

The content of package org.apache.commons.codec.language.bm has been translated
from the original php source code available at http://stevemorse.org/phoneticinfo.htm
with permission from the original authors.
Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-------------- NOTICE of the Apache Commons Codec --------------


The gem distribution of this product includes products of
the Apache HttpClient 4.5, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: http://hc.apache.org/httpcomponents-client-4.5.x/index.html

-------------- NOTICE of the Apache HttpClient 4.5 -------------
Apache HttpComponents Client
Copyright 1999-2020 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

-------------- NOTICE of the Apache HttpClient 4.5 -------------


The gem distribution of this product includes products of
the Apache HttpCore 4.4, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: http://hc.apache.org/httpcomponents-core-4.4.x/index.html

--------------- NOTICE of the Apache HttpCore 4.4 --------------
Apache HttpComponents Core
Copyright 2005-2020 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
--------------- NOTICE of the Apache HttpCore 4.4 --------------


The gem distribution of this product includes products of
the JCL 1.2 implemented over SLF4J 1.7, as-is.
They are licensed under the Apache Software License, Version 2.0.
See: http://www.slf4j.org/legacy.html
54 changes: 48 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
- **canned_acl**: canned access control list for created objects ([enum](#cannedaccesscontrollist), default: null)
- [Deprecated] **proxy_host**: proxy host to use when accessing AWS S3 via proxy. (string, default: null )
- [Deprecated] **proxy_port**: proxy port to use when accessing AWS S3 via proxy. (string, default: null )
- **http_proxy** http proxy configuration to use when accessing AWS S3 via http proxy. (optional)
- **host** proxy host (string, required)
- **port** proxy port (int, optional)
- **https** use https or not (boolean, default true)
- **user** proxy user (string, optional)
- **password** proxy password (string, optional)
- **http_proxy**: http proxy configuration to use when accessing AWS S3 via http proxy. (optional)
- **host**: proxy host (string, required)
- **port**: proxy port (int, optional)
- **https**: use https or not (boolean, default true)
- **user**: proxy user (string, optional)
- **password**: proxy password (string, optional)

- **auth_method**: name of mechanism to authenticate requests (basic, env, instance, profile, properties, anonymous, or session. default: basic)

Expand Down Expand Up @@ -115,3 +115,45 @@ formatter:
```
$ ./gradlew gem
```

For Maintainers
----------------

### Release

Modify `version` in `build.gradle` at a detached commit, and then tag the commit with an annotation.

```
git checkout --detach master
(Edit: Remove "-SNAPSHOT" in "version" in build.gradle.)
git add build.gradle
git commit -m "Release vX.Y.Z"
git tag -a vX.Y.Z
(Edit: Write a tag annotation in the changelog format.)
```

See [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) for the changelog format. We adopt a part of it for Git's tag annotation like below.

```
## [X.Y.Z] - YYYY-MM-DD
### Added
- Added a feature.
### Changed
- Changed something.
### Fixed
- Fixed a bug.
```

Push the annotated tag, then. It triggers a release operation on GitHub Actions after approval.

```
git push -u origin vX.Y.Z
```
Loading

0 comments on commit 90ee6aa

Please sign in to comment.