Remove remaining references to other sub-projects

riege · Sep 26, 2022 · 17755bf · 17755bf
1 parent 0743240
commit 17755bf
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 90 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,9 +26,6 @@ jobs:
           cache: 'gradle'
 
       - name: Run Checks
-        env:
-          GITHUB_PACKAGES_ACCESS_USER: ${{ secrets.GH_PACKAGES_ACCESS_USER }}
-          GITHUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GH_PACKAGES_ACCESS_TOKEN }}
         run: ./gradlew --continue check
 
       - name: Publish JUnit Report

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,67 +25,23 @@ jobs:
         uses: riege/action-version@v1
 
       - name: Create release artifacts
-        env:
-          GITHUB_PACKAGES_ACCESS_USER: ${{ secrets.GH_PACKAGES_ACCESS_USER }}
-          GITHUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GH_PACKAGES_ACCESS_TOKEN }}
         run: |
-          ./gradlew -Pversion=${{ steps.version.outputs.version-without-v }} :jasper-service-client:jar :jasper-service-functions:jar :jasper-service-server:distTar
+          ./gradlew -Pversion=${{ steps.version.outputs.version-without-v }} :jasper-service-functions:jar
 
       - name: Create release and upload artifacts
         uses: softprops/action-gh-release@v1
         with:
-          name: Jasper Service ${{ steps.version.outputs.version-without-v }}
+          name: Jasper Service Functions ${{ steps.version.outputs.version-without-v }}
           files: |
-            jasper-service-client/build/libs/*.jar
             jasper-service-functions/build/libs/*.jar
-            jasper-service-server/build/distributions/*.tgz
 
       - name: Publish artifacts to GitHub Packages
         run: |
           echo "New version: ${{ steps.version.outputs.version-without-v }}"
           echo "Github username: ${GITHUB_ACTOR}"
-          ./gradlew -Pversion=${{ steps.version.outputs.version-without-v }} :jasper-service-client:publish :jasper-service-functions:publish
+          ./gradlew -Pversion=${{ steps.version.outputs.version-without-v }} :jasper-service-functions:publish
         env:
           PROJECT_URL: ${{ github.event.repository.url }}
           MAVEN_PUBLISH_URL: https://maven.pkg.github.com/${{ github.repository }}
           MAVEN_PUBLISH_USERNAME: ${{ github.actor }}
           MAVEN_PUBLISH_PASSWORD: ${{ github.token }}
-
-      - name: Upload server TGZ for RPM job
-        uses: actions/upload-artifact@v3
-        with:
-          name: tgz
-          path: jasper-service-server/build/distributions/*.tgz
-
-    outputs:
-      rpm_version: ${{ steps.version.outputs.version-without-v }}
-
-  rpmbuild:
-    needs: release
-    uses: "riege/rpm-build/.github/workflows/rpm-build.yml@main"
-    with:
-      rpm_name: jasper-service
-      rpm_version: ${{ needs.release.outputs.rpm_version }}
-      rhel_version: 7
-      rpm_source_path: jasper-service-server/src/rpm
-      build_artifact: tgz
-    secrets:
-      sign_key: ${{ secrets.GPG_RPMBUILD_OPS_SIGN_KEY }}
-      sign_key_passphrase: ${{ secrets.GPG_RPMBUILD_OPS_SIGN_KEY_PWD }}
-
-  yumupload:
-    needs: rpmbuild
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download RPM from Workflow
-        uses: actions/download-artifact@v3
-        with:
-          name: rpms
-
-      - name: Upload RPM to YUM repo
-        env:
-          YUMREPO_PATH: RHEL-riege-more-java
-        run: |
-          STORAGE_URL="https://${{ secrets.YUMREPO_STORAGE_ACCOUNT_NAME }}.blob.core.windows.net/${{ secrets.YUMREPO_CONTAINER }}/$YUMREPO_PATH/Packages/${{ secrets.YUMREPO_SAS_TOKEN }}"
-          # upload all RPMs
-          find . -name "*.rpm" -exec azcopy copy --check-length=false --blob-type BlockBlob --put-md5 {} "$STORAGE_URL" \;
diff --git a/buildSrc/src/main/kotlin/jasper-service.common-configuration.gradle.kts b/buildSrc/src/main/kotlin/jasper-service.common-configuration.gradle.kts
@@ -55,12 +55,4 @@ repositories {
         url = uri("https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/")
     }
     mavenCentral()
-    maven {
-        name = "GitHubPackages"
-        url = uri("https://maven.pkg.github.com/riege/packages")
-        credentials {
-            username = (project.findProperty("github.packages.access.user") ?: System.getenv("GITHUB_PACKAGES_ACCESS_USER")).toString()
-            password = (project.findProperty("github.packages.access.token") ?: System.getenv("GITHUB_PACKAGES_ACCESS_TOKEN")).toString()
-        }
-    }
 }
diff --git a/buildSrc/src/main/kotlin/jasper-service.scala-configuration.gradle.kts b/buildSrc/src/main/kotlin/jasper-service.scala-configuration.gradle.kts
diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,5 @@
 groupId=com.riege
 
-title=Jasper Service
+title=Jasper Service Functions
 
 vendor=Riege Software International GmbH
-
-scalaCompilerVersion=2.12.17
-
-scalaDependencyVersion=2.12
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,4 @@
 rootProject.name = "jasper-service"
 include(
-    "jasper-service-client",
     "jasper-service-functions",
-    "jasper-service-gatling",
-    "jasper-service-server"
 )