Skip to content

Commit

Permalink
Revert ossrh publish (#263)
Browse files Browse the repository at this point in the history
* Revert "Fix gpg ioctl issue (#262)"

This reverts commit ea73d2d.

* Revert "Automate deployment to OSSRH/Docker Hub (#258)"

This reverts commit 5c8d430.
  • Loading branch information
laurentgo authored Oct 3, 2020
1 parent ea73d2d commit 46a63b3
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 197 deletions.
20 changes: 6 additions & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,12 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_OSSRH_TOKEN
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: |
~/.m2/repository
!~/.m2/repository/org/projectnessie
!~/.m2/repository/com/nessie
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
Expand All @@ -40,16 +34,14 @@ jobs:
- name: Build with Maven
run: mvn -B deploy --file pom.xml -Pcode-coverage,native,release -DdeployAtEnd=true
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_ACCESS_ID }}
MAVEN_OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
GITHUB_TOKEN: ${{ github.token }}
- name: Push Docker images
run: |
echo '${{ secrets.DOCKER_TOKEN }}' | docker login https://docker.pkg.github.com -u 'nessiebuilder' --password-stdin
echo '${{ secrets.GITHUB_TOKEN }}' | docker login https://docker.pkg.github.com -u '${{ github.actor }}' --password-stdin
docker images --filter 'reference=projectnessie/nessie' --format '{{.ID}}\t{{.Tag}}' |
while read IMAGE_ID IMAGE_TAG; do
docker tag "$IMAGE_ID" "projectnessie/nessie-unstable:${IMAGE_TAG%-snapshot}"
docker push "projectnessie/nessie-unstable:${IMAGE_TAG%-snapshot}"
docker tag "$IMAGE_ID" "docker.pkg.github.com/${{ github.repository }}/nessie:${IMAGE_TAG}"
docker push "docker.pkg.github.com/${{ github.repository }}/nessie:${IMAGE_TAG}"
done
- name: Capture test results
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -127,5 +119,5 @@ jobs:
external_repository: projectnessie/projectnessie.github.io
publish_branch: main
deploy_key: ${{ secrets.NESSIE_SITE_DEPLOY_KEY }}
publish_dir: ./site/site
publish_dir: ./site/site
cname: projectnessie.org
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
path: |
~/.m2/repository
!~/.m2/repository/org/projectnessie
!~/.m2/repository/com/nessie
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
Expand All @@ -36,7 +36,7 @@ jobs:
restore-keys: |
${{ runner.os }}-node-
- name: Build with Maven
run: mvn -B install javadoc:javadoc-no-fork --file pom.xml -Pcode-coverage
run: mvn -B install --file pom.xml -Pcode-coverage
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Run Hive tests with JDK8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.fasterxml.jackson.databind.SerializationFeature;

/**
* custom resolver for ObjectMapper to enable optional settings on json <-> object conversion.
* custom resolver for ObjectMapper to enable optional settings on json <-> object conversion.
*/
@Provider
public class ObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
Expand Down
32 changes: 0 additions & 32 deletions clients/deltalake/spark2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -321,36 +321,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>default-javadocJar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<executions>
<execution>
<id>default-javadocJar</id>
<goals>
<goal>doc-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
36 changes: 2 additions & 34 deletions clients/deltalake/spark3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>nessie-deltalake-core</includeArtifactIds>
<includeArtifactIds>nessie-deltalake</includeArtifactIds>
<classifier>sources</classifier>
<failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
<outputDirectory>${project.build.directory}/sources</outputDirectory>
Expand All @@ -177,7 +177,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>nessie-deltalake-core</includeArtifactIds>
<includeArtifactIds>nessie-deltalake</includeArtifactIds>
<classifier>test-sources</classifier>
<failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
<outputDirectory>${project.build.directory}/test-sources</outputDirectory>
Expand Down Expand Up @@ -321,36 +321,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>default-javadocJar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<executions>
<execution>
<id>default-javadocJar</id>
<goals>
<goal>doc-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.dremio.nessie.model;

/**
* wrap object with a version id. For eTag &amp; Match-If
* wrap object with a version id. For eTag & Match-If
*/
public class VersionedWrapper<T> {

Expand Down
115 changes: 3 additions & 112 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,54 +24,6 @@
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Nessie</name>
<description>Data Ops for Data Lakes</description>
<url>https://projectnessie.org</url>
<organization>
<name>Project Nessie</name>
<url>https://projectnessie.org</url>
</organization>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<id>jacques-n</id>
<name>Jacques Nadeau</name>
<url>https://github.com/jacques-n</url>
</developer>
<developer>
<id>rymurr</id>
<name>Ryan Murray</name>
<url>https://github.com/rymurr</url>
</developer>
<developer>
<id>laurentgo</id>
<name>Laurent Goujon</name>
<url>https://github.com/laurentgo</url>
</developer>
</developers>
<contributors>
<contributor>
<name>Ryan Tse</name>
<url>https://github.com/ryantse</url>
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>Project Nessie List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>https://groups.google.com/g/projectnessie</archive>
</mailingList>
</mailingLists>

<modules>
<module>model</module>
<module>backends</module>
Expand All @@ -89,18 +41,11 @@
<url>https://github.com/projectnessie/nessie/tree/${project.scm.tag}</url>
<tag>main</tag>
</scm>
<issueManagement>
<system>Github</system>
<url>https://github.com/projectnessie/nessie/issues</url>
</issueManagement>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>github</id>
<name>GitHub Nessie Apache Maven Packages</name>
<url>https://maven.pkg.github.com/projectnessie/nessie</url>
</repository>
</distributionManagement>

Expand Down Expand Up @@ -563,11 +508,6 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
</plugin>

<!-- 3rd party plugins -->
<plugin>
Expand Down Expand Up @@ -1091,54 +1031,5 @@ limitations under the License.
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>default-soucesJar</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>default-javadocJar</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>default-sign</id>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.google.protobuf.ByteString;

/**
* Used to serialize &amp; deserialize the values in the store. Provided to an implementation of VersionStore on construction.
* Used to serialize & deserialize the values in the store. Provided to an implementation of VersionStore on construction.
*/
public interface Serializer<V> {

Expand Down

0 comments on commit 46a63b3

Please sign in to comment.