diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c2cb761365..a723bb6580a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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- @@ -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 @@ -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 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 58786d3bf50..e13cb8b027c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -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- @@ -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 diff --git a/clients/client/src/main/java/com/dremio/nessie/client/rest/ObjectMapperContextResolver.java b/clients/client/src/main/java/com/dremio/nessie/client/rest/ObjectMapperContextResolver.java index d3de862be70..f583db7776a 100644 --- a/clients/client/src/main/java/com/dremio/nessie/client/rest/ObjectMapperContextResolver.java +++ b/clients/client/src/main/java/com/dremio/nessie/client/rest/ObjectMapperContextResolver.java @@ -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 { diff --git a/clients/deltalake/spark2/pom.xml b/clients/deltalake/spark2/pom.xml index b544a410e72..e5cea24acee 100644 --- a/clients/deltalake/spark2/pom.xml +++ b/clients/deltalake/spark2/pom.xml @@ -321,36 +321,4 @@ - - - - release - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - default-javadocJar - none - - - - - net.alchim31.maven - scala-maven-plugin - - - default-javadocJar - - doc-jar - - - - - - - - diff --git a/clients/deltalake/spark3/pom.xml b/clients/deltalake/spark3/pom.xml index 5e936a5098c..72cad9598cd 100644 --- a/clients/deltalake/spark3/pom.xml +++ b/clients/deltalake/spark3/pom.xml @@ -164,7 +164,7 @@ unpack-dependencies - nessie-deltalake-core + nessie-deltalake sources true ${project.build.directory}/sources @@ -177,7 +177,7 @@ unpack-dependencies - nessie-deltalake-core + nessie-deltalake test-sources true ${project.build.directory}/test-sources @@ -321,36 +321,4 @@ - - - - release - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - default-javadocJar - none - - - - - net.alchim31.maven - scala-maven-plugin - - - default-javadocJar - - doc-jar - - - - - - - - diff --git a/model/src/main/java/com/dremio/nessie/model/VersionedWrapper.java b/model/src/main/java/com/dremio/nessie/model/VersionedWrapper.java index 8835e164742..d590299b779 100644 --- a/model/src/main/java/com/dremio/nessie/model/VersionedWrapper.java +++ b/model/src/main/java/com/dremio/nessie/model/VersionedWrapper.java @@ -17,7 +17,7 @@ package com.dremio.nessie.model; /** - * wrap object with a version id. For eTag & Match-If + * wrap object with a version id. For eTag & Match-If */ public class VersionedWrapper { diff --git a/pom.xml b/pom.xml index fbd95ab43bb..83eab139685 100644 --- a/pom.xml +++ b/pom.xml @@ -24,54 +24,6 @@ 0.1-SNAPSHOT pom - Nessie - Data Ops for Data Lakes - https://projectnessie.org - - Project Nessie - https://projectnessie.org - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - jacques-n - Jacques Nadeau - https://github.com/jacques-n - - - rymurr - Ryan Murray - https://github.com/rymurr - - - laurentgo - Laurent Goujon - https://github.com/laurentgo - - - - - Ryan Tse - https://github.com/ryantse - - - - - - Project Nessie List - projectnessie-subscribe@googlegroups.com - projectnessie-unsubscribe@googlegroups.com - projectnessie@googlegroups.com - https://groups.google.com/g/projectnessie - - - model backends @@ -89,18 +41,11 @@ https://github.com/projectnessie/nessie/tree/${project.scm.tag} main - - Github - https://github.com/projectnessie/nessie/issues - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + github + GitHub Nessie Apache Maven Packages + https://maven.pkg.github.com/projectnessie/nessie @@ -563,11 +508,6 @@ maven-plugin-plugin 3.6.0 - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - @@ -1091,54 +1031,5 @@ limitations under the License. - - release - - - - org.apache.maven.plugins - maven-source-plugin - - - default-soucesJar - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - default-javadocJar - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - default-sign - - sign - - - - --pinentry-mode - loopback - - - - - - - - diff --git a/versioned/spi/src/main/java/com/dremio/nessie/versioned/Serializer.java b/versioned/spi/src/main/java/com/dremio/nessie/versioned/Serializer.java index f7a2b082660..29784f3a4be 100644 --- a/versioned/spi/src/main/java/com/dremio/nessie/versioned/Serializer.java +++ b/versioned/spi/src/main/java/com/dremio/nessie/versioned/Serializer.java @@ -18,7 +18,7 @@ import com.google.protobuf.ByteString; /** - * Used to serialize & 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 {