diff --git a/onething/.gitattributes b/.gitattributes similarity index 100% rename from onething/.gitattributes rename to .gitattributes diff --git a/.github/workflows/CD-api.yml b/.github/workflows/CD-api.yml new file mode 100644 index 00000000..55af102e --- /dev/null +++ b/.github/workflows/CD-api.yml @@ -0,0 +1,41 @@ +name: Deploy api module + +on: + workflow_call: + secrets: + AWS_ACCESS_KEY_ID: + required: true + AWS_SECRET_ACCESS_KEY: + required: true + AWS_REGION: + required: true + push: + branches: + - develop + paths: + - 'boot/api/**' + +jobs: + build: + uses: ./.github/workflows/gradle_build.yml + with: + project-name: api + + push-image: + needs: build + uses: ./.github/workflows/ec2_push.yml + with: + project-name: api + docker-file-path: ./boot/api/Dockerfile + host-port: 8080 + ecr-repository: 442042528525.dkr.ecr.ap-northeast-2.amazonaws.com/clibi/api + ecr-repository-name: clibi/api + container-name: api-server + secret-manager: arn:aws:secretsmanager:ap-northeast-2:442042528525:secret:dev/clibi/rds-eCWfXL + secrets: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ap-northeast-2 + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_USER: ${{ secrets.EC2_USER }} + EC2_KEY: ${{ secrets.EC2_KEY }} \ No newline at end of file diff --git a/.github/workflows/CD-common.yml b/.github/workflows/CD-common.yml new file mode 100644 index 00000000..68bbb4be --- /dev/null +++ b/.github/workflows/CD-common.yml @@ -0,0 +1,23 @@ +name: Deploy Common + +on: + push: + branches: + - main + +jobs: + deploy-Admin: + uses: ./.github/workflows/CD-office.yml + secrets: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ap-northeast-2 + + deploy-Api: + uses: ./.github/workflows/CD-api.yml + secrets: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ap-northeast-2 + + diff --git a/.github/workflows/CD-office.yml b/.github/workflows/CD-office.yml new file mode 100644 index 00000000..bd5b1015 --- /dev/null +++ b/.github/workflows/CD-office.yml @@ -0,0 +1,41 @@ +name: Deploy office module + +on: + workflow_call: + secrets: + AWS_ACCESS_KEY_ID: + required: true + AWS_SECRET_ACCESS_KEY: + required: true + AWS_REGION: + required: true + push: + branches: + - develop + paths: + - 'boot/api/**' + +jobs: + build: + uses: ./.github/workflows/gradle_build.yml + with: + project-name: office + + push-image: + needs: build + uses: ./.github/workflows/ec2_push.yml + with: + project-name: office + docker-file-path: ./boot/office/Dockerfile + host-port: 8081 + ecr-repository: 442042528525.dkr.ecr.ap-northeast-2.amazonaws.com/clibi/office + ecr-repository-name: clibi/office + secret-manager: arn:aws:secretsmanager:ap-northeast-2:442042528525:secret:dev/clibi/rds-eCWfXL + container-name: office-server + secrets: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ap-northeast-2 + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_USER: ${{ secrets.EC2_USER }} + EC2_KEY: ${{ secrets.EC2_KEY }} \ No newline at end of file diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 00000000..b9dc2394 --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,14 @@ +name: CI + +on: + pull_request: + branches: + - main + - develop + + +jobs: + build: + uses: ./.github/workflows/gradle_build.yml + with: + project-name: ALL \ No newline at end of file diff --git a/.github/workflows/ec2_push.yml b/.github/workflows/ec2_push.yml new file mode 100644 index 00000000..3a210ae0 --- /dev/null +++ b/.github/workflows/ec2_push.yml @@ -0,0 +1,123 @@ +name: Push to EC2 + +on: + workflow_call: + inputs: + project-name: + required: true + type: string + docker-file-path: + required: true + type: string + host-port: + required: false + type: number + ecr-repository: + required: true + type: string + ecr-repository-name: + required: true + type: string + secret-manager: + required: true + type: string + container-name: + required: true + type: string + secrets: + AWS_ACCESS_KEY_ID: + required: true + AWS_SECRET_ACCESS_KEY: + required: true + AWS_REGION: + required: true + EC2_HOST: + required: true + EC2_USER: + required: true + EC2_KEY: + required: true + +jobs: + build-and-push: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Download the gradle Build File + uses: actions/download-artifact@v4 + with: + name: ${{inputs.project-name}}-build + path: ./boot/${{inputs.project-name}}/build/libs + + - name: Configure AWS credentials For ECR and Secrets Manager + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-region: ${{ secrets.AWS_REGION }} + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: Docker Build And Push + env: + ECR_REPOSITORY_URI: ${{ inputs.ecr-repository }} + run: | + docker build -t ${{ inputs.ecr-repository-name }} -f .deploy/Dockerfile-dev . + docker tag ${{ inputs.ecr-repository-name }}:latest ${{ inputs.ecr-repository }} + docker push ${{ inputs.ecr-repository }} + + - name: Verify image in ECR + id: verify-image + env: + ECR_REPOSITORY_URI: ${{ inputs.ecr-repository }} + run: | + REPOSITORY_NAME=${{ inputs.ecr-repository-name }} + REGION=${{ secrets.AWS_REGION }} + IMAGE_TAG="latest" + + if aws ecr describe-images \ + --repository-name ${REPOSITORY_NAME} \ + --image-ids imageTag=${IMAGE_TAG} \ + --region ${REGION}; then + echo "Image successfully verified in ECR" + echo "status=success" >> $GITHUB_OUTPUT + else + echo "Image verification failed" + exit 1 + fi + + - name: Deploy to EC2 + uses: appleboy/ssh-action@v0.1.8 + if: steps.verify-image.outputs.status == 'success' + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USER }} + key: ${{ secrets.EC2_KEY }} + script: | + export AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} + export AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws secretsmanager get-secret-value \ + --region ${{ secrets.AWS_REGION }} \ + --secret-id ${{ inputs.secret-manager }} \ + --query 'SecretString' \ + --output text | \ + jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' > secrets.env + + docker pull ${{ inputs.ecr-repository }} + + if [ "$(docker ps -q -f name=${{ inputs.container-name }})" ]; then + docker stop ${{ inputs.container-name }} && docker rm ${{ inputs.container-name }} + fi + + docker system prune -f + + docker run -d --name ${{ inputs.container-name }} \ + --env-file ./secrets.env \ + --restart always \ + -p ${{ inputs.host-port || '8080' }}:8080 \ + ${{ inputs.ecr-repository }} \ No newline at end of file diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml new file mode 100644 index 00000000..6f8dddab --- /dev/null +++ b/.github/workflows/gradle_build.yml @@ -0,0 +1,64 @@ +name: Build Gradle + +on: + workflow_call: + inputs: + project-name: + required: true + type: string + description: 'The name of the project to build' + outputs: + build-success: + description: "빌드 성공 여부" + value: ${{ jobs.build.outputs.success }} + +jobs: + build: + runs-on: ubuntu-latest + outputs: + success: ${{ steps.build-result.outputs.success }} + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup JDK 21 + uses: actions/setup-java@v3 + with: + java-version: '21' + distribution: 'corretto' + + - name: Gradle Caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: gradle setting + run: | + chmod +x gradlew + + - name: ${{ inputs.project-name }} build + id: gradle-build + continue-on-error: true + run: ./gradlew build + + - name: Determine build success + id: build-result + run: | + if [ "${{ steps.gradle-build.outcome }}" == "success" ]; then + echo "success=true" >> $GITHUB_OUTPUT + else + echo "success=false" >> $GITHUB_OUTPUT + fi + + - name: Upload build artifacts + if: ${{ inputs.project-name != 'ALL' }} + uses: actions/upload-artifact@v4 + with: + name: ${{ inputs.project-name }}-build + path: ./boot/${{ inputs.project-name }}/build/libs diff --git a/.gitignore b/.gitignore index 524f0963..bde14195 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,39 @@ -# Compiled class file -*.class +HELP.md +.gradle +**/.gradle +build/ +!../gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ -# Log file -*.log +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ -# BlueJ files -*.ctxt +### IntelliJ IDEA ### +.idea +**/.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ -# Mobile Tools for Java (J2ME) -.mtj.tmp/ +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -replay_pid* +### VS Code ### +.vscode/ diff --git a/boot/api/Dockerfile b/boot/api/Dockerfile new file mode 100644 index 00000000..88afeec6 --- /dev/null +++ b/boot/api/Dockerfile @@ -0,0 +1,7 @@ +FROM amazoncorretto:21-alpine-jdk +ARG JAR_FILE=boot/api/build/libs/api.jar +COPY ${JAR_FILE} app.jar + +EXPOSE 8080 + +ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "/app.jar"] \ No newline at end of file diff --git a/onething/boot/api/build.gradle b/boot/api/build.gradle similarity index 97% rename from onething/boot/api/build.gradle rename to boot/api/build.gradle index 0cb898fb..5524dc36 100644 --- a/onething/boot/api/build.gradle +++ b/boot/api/build.gradle @@ -7,6 +7,10 @@ plugins { group = 'com.clip' version = '0.0.1-SNAPSHOT' +bootJar { + archiveFileName = 'api.jar' +} + java { toolchain { languageVersion = JavaLanguageVersion.of(21) diff --git a/onething/boot/api/src/main/java/com/clip/ApiApplication.java b/boot/api/src/main/java/com/clip/ApiApplication.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/ApiApplication.java rename to boot/api/src/main/java/com/clip/ApiApplication.java diff --git a/onething/boot/api/src/main/java/com/clip/api/docs/user/UserAccountDocs.java b/boot/api/src/main/java/com/clip/api/docs/user/UserAccountDocs.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/docs/user/UserAccountDocs.java rename to boot/api/src/main/java/com/clip/api/docs/user/UserAccountDocs.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/UserAccountController.java b/boot/api/src/main/java/com/clip/api/user/controller/UserAccountController.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/UserAccountController.java rename to boot/api/src/main/java/com/clip/api/user/controller/UserAccountController.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/LoginDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/LoginDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/LoginDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/LoginDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/SignupDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/SignupDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/SignupDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/SignupDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNameDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNameDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNameDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNameDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNicknameDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNicknameDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNicknameDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateNicknameDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdatePhoneNumberDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdatePhoneNumberDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdatePhoneNumberDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/UpdatePhoneNumberDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateUserDetailInfoDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateUserDetailInfoDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateUserDetailInfoDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/UpdateUserDetailInfoDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UserInfoDto.java b/boot/api/src/main/java/com/clip/api/user/controller/dto/UserInfoDto.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/controller/dto/UserInfoDto.java rename to boot/api/src/main/java/com/clip/api/user/controller/dto/UserInfoDto.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/exception/NotFoundUserException.java b/boot/api/src/main/java/com/clip/api/user/exception/NotFoundUserException.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/exception/NotFoundUserException.java rename to boot/api/src/main/java/com/clip/api/user/exception/NotFoundUserException.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/mapper/TermsAcceptanceMapper.java b/boot/api/src/main/java/com/clip/api/user/mapper/TermsAcceptanceMapper.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/mapper/TermsAcceptanceMapper.java rename to boot/api/src/main/java/com/clip/api/user/mapper/TermsAcceptanceMapper.java diff --git a/onething/boot/api/src/main/java/com/clip/api/user/service/UserAccountService.java b/boot/api/src/main/java/com/clip/api/user/service/UserAccountService.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/api/user/service/UserAccountService.java rename to boot/api/src/main/java/com/clip/api/user/service/UserAccountService.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/CustomClaims.java b/boot/api/src/main/java/com/clip/global/config/jwt/CustomClaims.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/CustomClaims.java rename to boot/api/src/main/java/com/clip/global/config/jwt/CustomClaims.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/JWTProperties.java b/boot/api/src/main/java/com/clip/global/config/jwt/JWTProperties.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/JWTProperties.java rename to boot/api/src/main/java/com/clip/global/config/jwt/JWTProperties.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/JwtAuthenticationFilter.java b/boot/api/src/main/java/com/clip/global/config/jwt/JwtAuthenticationFilter.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/JwtAuthenticationFilter.java rename to boot/api/src/main/java/com/clip/global/config/jwt/JwtAuthenticationFilter.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/TokenProvider.java b/boot/api/src/main/java/com/clip/global/config/jwt/TokenProvider.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/TokenProvider.java rename to boot/api/src/main/java/com/clip/global/config/jwt/TokenProvider.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/TokenType.java b/boot/api/src/main/java/com/clip/global/config/jwt/TokenType.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/TokenType.java rename to boot/api/src/main/java/com/clip/global/config/jwt/TokenType.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/exception/InvalidTokenException.java b/boot/api/src/main/java/com/clip/global/config/jwt/exception/InvalidTokenException.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/exception/InvalidTokenException.java rename to boot/api/src/main/java/com/clip/global/config/jwt/exception/InvalidTokenException.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/jwt/exception/NotFoundTokenException.java b/boot/api/src/main/java/com/clip/global/config/jwt/exception/NotFoundTokenException.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/jwt/exception/NotFoundTokenException.java rename to boot/api/src/main/java/com/clip/global/config/jwt/exception/NotFoundTokenException.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/security/SecurityConfig.java b/boot/api/src/main/java/com/clip/global/config/security/SecurityConfig.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/security/SecurityConfig.java rename to boot/api/src/main/java/com/clip/global/config/security/SecurityConfig.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/security/exclude/ExcludeAuthPathProperties.java b/boot/api/src/main/java/com/clip/global/config/security/exclude/ExcludeAuthPathProperties.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/security/exclude/ExcludeAuthPathProperties.java rename to boot/api/src/main/java/com/clip/global/config/security/exclude/ExcludeAuthPathProperties.java diff --git a/onething/boot/api/src/main/java/com/clip/global/config/swagger/SwaggerConfig.java b/boot/api/src/main/java/com/clip/global/config/swagger/SwaggerConfig.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/config/swagger/SwaggerConfig.java rename to boot/api/src/main/java/com/clip/global/config/swagger/SwaggerConfig.java diff --git a/onething/boot/api/src/main/java/com/clip/global/exception/ValidExceptionHandler.java b/boot/api/src/main/java/com/clip/global/exception/ValidExceptionHandler.java similarity index 100% rename from onething/boot/api/src/main/java/com/clip/global/exception/ValidExceptionHandler.java rename to boot/api/src/main/java/com/clip/global/exception/ValidExceptionHandler.java diff --git a/onething/boot/api/src/main/resources/application.yml b/boot/api/src/main/resources/application.yml similarity index 100% rename from onething/boot/api/src/main/resources/application.yml rename to boot/api/src/main/resources/application.yml diff --git a/onething/boot/api/src/test/java/boot/api/com/clip/api/user/service/UserAccountServiceTest.java b/boot/api/src/test/java/boot/api/com/clip/api/user/service/UserAccountServiceTest.java similarity index 100% rename from onething/boot/api/src/test/java/boot/api/com/clip/api/user/service/UserAccountServiceTest.java rename to boot/api/src/test/java/boot/api/com/clip/api/user/service/UserAccountServiceTest.java diff --git a/onething/boot/api/src/test/java/boot/api/com/clip/global/config/jwt/TokenProviderTest.java b/boot/api/src/test/java/boot/api/com/clip/global/config/jwt/TokenProviderTest.java similarity index 100% rename from onething/boot/api/src/test/java/boot/api/com/clip/global/config/jwt/TokenProviderTest.java rename to boot/api/src/test/java/boot/api/com/clip/global/config/jwt/TokenProviderTest.java diff --git a/onething/boot/api/src/test/java/data/coredata/com/clip/auth/entity/repository/TokenRepositoryTest.java b/boot/api/src/test/java/data/coredata/com/clip/auth/entity/repository/TokenRepositoryTest.java similarity index 100% rename from onething/boot/api/src/test/java/data/coredata/com/clip/auth/entity/repository/TokenRepositoryTest.java rename to boot/api/src/test/java/data/coredata/com/clip/auth/entity/repository/TokenRepositoryTest.java diff --git a/onething/boot/api/src/test/java/data/coredata/com/clip/user/entity/repository/UserRepositoryTest.java b/boot/api/src/test/java/data/coredata/com/clip/user/entity/repository/UserRepositoryTest.java similarity index 100% rename from onething/boot/api/src/test/java/data/coredata/com/clip/user/entity/repository/UserRepositoryTest.java rename to boot/api/src/test/java/data/coredata/com/clip/user/entity/repository/UserRepositoryTest.java diff --git a/onething/boot/api/src/test/resources/application.yml b/boot/api/src/test/resources/application.yml similarity index 100% rename from onething/boot/api/src/test/resources/application.yml rename to boot/api/src/test/resources/application.yml diff --git a/onething/boot/batch/build.gradle b/boot/batch/build.gradle similarity index 100% rename from onething/boot/batch/build.gradle rename to boot/batch/build.gradle diff --git a/onething/boot/batch/src/main/java/com/clip/BatchApplication.java b/boot/batch/src/main/java/com/clip/BatchApplication.java similarity index 100% rename from onething/boot/batch/src/main/java/com/clip/BatchApplication.java rename to boot/batch/src/main/java/com/clip/BatchApplication.java diff --git a/onething/boot/batch/src/main/resources/application.yml b/boot/batch/src/main/resources/application.yml similarity index 100% rename from onething/boot/batch/src/main/resources/application.yml rename to boot/batch/src/main/resources/application.yml diff --git a/onething/boot/batch/src/test/java/com/clip/batch/BatchApplicationTests.java b/boot/batch/src/test/java/com/clip/batch/BatchApplicationTests.java similarity index 100% rename from onething/boot/batch/src/test/java/com/clip/batch/BatchApplicationTests.java rename to boot/batch/src/test/java/com/clip/batch/BatchApplicationTests.java diff --git a/boot/office/Dockerfile b/boot/office/Dockerfile new file mode 100644 index 00000000..1807046e --- /dev/null +++ b/boot/office/Dockerfile @@ -0,0 +1,7 @@ +FROM amazoncorretto:21-alpine-jdk +ARG JAR_FILE=boot/office/build/libs/office.jar +COPY ${JAR_FILE} app.jar + +EXPOSE 8080 + +ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "/app.jar"] \ No newline at end of file diff --git a/boot/office/build.gradle b/boot/office/build.gradle new file mode 100644 index 00000000..c5bf264d --- /dev/null +++ b/boot/office/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.3' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.clip' +version = '0.0.1-SNAPSHOT' + +bootJar { + archiveFileName = 'office.jar' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/boot/office/src/main/java/com/clip/office/OfficeApplication.java b/boot/office/src/main/java/com/clip/office/OfficeApplication.java new file mode 100644 index 00000000..9cad7ede --- /dev/null +++ b/boot/office/src/main/java/com/clip/office/OfficeApplication.java @@ -0,0 +1,13 @@ +package com.clip.office; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OfficeApplication { + + public static void main(String[] args) { + SpringApplication.run(OfficeApplication.class, args); + } + +} diff --git a/boot/office/src/main/resources/application.yml b/boot/office/src/main/resources/application.yml new file mode 100644 index 00000000..55de1c59 --- /dev/null +++ b/boot/office/src/main/resources/application.yml @@ -0,0 +1,3 @@ +spring: + profiles: + include: office-data \ No newline at end of file diff --git a/onething/build.gradle b/build.gradle similarity index 91% rename from onething/build.gradle rename to build.gradle index ba900d9f..ec84398d 100644 --- a/onething/build.gradle +++ b/build.gradle @@ -4,6 +4,9 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' } +bootJar { enabled = false } +jar { enabled = true } + group = 'com.clip' version = '0.0.1-SNAPSHOT' diff --git a/onething/data/core-data/build.gradle b/data/core-data/build.gradle similarity index 100% rename from onething/data/core-data/build.gradle rename to data/core-data/build.gradle diff --git a/onething/data/core-data/src/main/java/com/clip/auth/entity/Token.java b/data/core-data/src/main/java/com/clip/auth/entity/Token.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/auth/entity/Token.java rename to data/core-data/src/main/java/com/clip/auth/entity/Token.java diff --git a/onething/data/core-data/src/main/java/com/clip/auth/repository/TokenRepository.java b/data/core-data/src/main/java/com/clip/auth/repository/TokenRepository.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/auth/repository/TokenRepository.java rename to data/core-data/src/main/java/com/clip/auth/repository/TokenRepository.java diff --git a/onething/data/core-data/src/main/java/com/clip/auth/service/TokenService.java b/data/core-data/src/main/java/com/clip/auth/service/TokenService.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/auth/service/TokenService.java rename to data/core-data/src/main/java/com/clip/auth/service/TokenService.java diff --git a/onething/data/core-data/src/main/java/com/clip/common/entity/BaseEntity.java b/data/core-data/src/main/java/com/clip/common/entity/BaseEntity.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/common/entity/BaseEntity.java rename to data/core-data/src/main/java/com/clip/common/entity/BaseEntity.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/City.java b/data/core-data/src/main/java/com/clip/user/entity/City.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/City.java rename to data/core-data/src/main/java/com/clip/user/entity/City.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/County.java b/data/core-data/src/main/java/com/clip/user/entity/County.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/County.java rename to data/core-data/src/main/java/com/clip/user/entity/County.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/DeviceType.java b/data/core-data/src/main/java/com/clip/user/entity/DeviceType.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/DeviceType.java rename to data/core-data/src/main/java/com/clip/user/entity/DeviceType.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/Gender.java b/data/core-data/src/main/java/com/clip/user/entity/Gender.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/Gender.java rename to data/core-data/src/main/java/com/clip/user/entity/Gender.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/Platform.java b/data/core-data/src/main/java/com/clip/user/entity/Platform.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/Platform.java rename to data/core-data/src/main/java/com/clip/user/entity/Platform.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/TermsAcceptance.java b/data/core-data/src/main/java/com/clip/user/entity/TermsAcceptance.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/TermsAcceptance.java rename to data/core-data/src/main/java/com/clip/user/entity/TermsAcceptance.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/entity/User.java b/data/core-data/src/main/java/com/clip/user/entity/User.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/entity/User.java rename to data/core-data/src/main/java/com/clip/user/entity/User.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/exception/NicknameAlreadyExistsException.java b/data/core-data/src/main/java/com/clip/user/exception/NicknameAlreadyExistsException.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/exception/NicknameAlreadyExistsException.java rename to data/core-data/src/main/java/com/clip/user/exception/NicknameAlreadyExistsException.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/exception/PhoneNumberAlreadyExistsException.java b/data/core-data/src/main/java/com/clip/user/exception/PhoneNumberAlreadyExistsException.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/exception/PhoneNumberAlreadyExistsException.java rename to data/core-data/src/main/java/com/clip/user/exception/PhoneNumberAlreadyExistsException.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/exception/UserNotFoundException.java b/data/core-data/src/main/java/com/clip/user/exception/UserNotFoundException.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/exception/UserNotFoundException.java rename to data/core-data/src/main/java/com/clip/user/exception/UserNotFoundException.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/repository/TermsAcceptanceRepository.java b/data/core-data/src/main/java/com/clip/user/repository/TermsAcceptanceRepository.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/repository/TermsAcceptanceRepository.java rename to data/core-data/src/main/java/com/clip/user/repository/TermsAcceptanceRepository.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/repository/UserRepository.java b/data/core-data/src/main/java/com/clip/user/repository/UserRepository.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/repository/UserRepository.java rename to data/core-data/src/main/java/com/clip/user/repository/UserRepository.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/service/TermsAcceptanceService.java b/data/core-data/src/main/java/com/clip/user/service/TermsAcceptanceService.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/service/TermsAcceptanceService.java rename to data/core-data/src/main/java/com/clip/user/service/TermsAcceptanceService.java diff --git a/onething/data/core-data/src/main/java/com/clip/user/service/UserService.java b/data/core-data/src/main/java/com/clip/user/service/UserService.java similarity index 100% rename from onething/data/core-data/src/main/java/com/clip/user/service/UserService.java rename to data/core-data/src/main/java/com/clip/user/service/UserService.java diff --git a/onething/data/core-data/src/main/resources/application-core-data.yml b/data/core-data/src/main/resources/application-core-data.yml similarity index 100% rename from onething/data/core-data/src/main/resources/application-core-data.yml rename to data/core-data/src/main/resources/application-core-data.yml diff --git a/onething/data/core-data/src/test/java/com/clip/coredata/CoreDataApplicationTests.java b/data/core-data/src/test/java/com/clip/coredata/CoreDataApplicationTests.java similarity index 100% rename from onething/data/core-data/src/test/java/com/clip/coredata/CoreDataApplicationTests.java rename to data/core-data/src/test/java/com/clip/coredata/CoreDataApplicationTests.java diff --git a/onething/data/office-data/build.gradle b/data/office-data/build.gradle similarity index 100% rename from onething/data/office-data/build.gradle rename to data/office-data/build.gradle diff --git a/onething/data/office-data/src/main/java/com/clip/officedata/OfficeDataApplication.java b/data/office-data/src/main/java/com/clip/officedata/OfficeDataApplication.java similarity index 100% rename from onething/data/office-data/src/main/java/com/clip/officedata/OfficeDataApplication.java rename to data/office-data/src/main/java/com/clip/officedata/OfficeDataApplication.java diff --git a/data/office-data/src/main/resources/application-office-data.yml b/data/office-data/src/main/resources/application-office-data.yml new file mode 100644 index 00000000..3a8eb15f --- /dev/null +++ b/data/office-data/src/main/resources/application-office-data.yml @@ -0,0 +1,13 @@ +spring: + datasource: + username: ${USERNAME} + url: ${URL} + password: ${PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + + jpa: + hibernate: + ddl-auto: update + database: mysql + database-platform: org.hibernate.dialect.MySQL8Dialect + open-in-view: false diff --git a/onething/data/office-data/src/test/java/com/clip/officedata/OfficeDataApplicationTests.java b/data/office-data/src/test/java/com/clip/officedata/OfficeDataApplicationTests.java similarity index 100% rename from onething/data/office-data/src/test/java/com/clip/officedata/OfficeDataApplicationTests.java rename to data/office-data/src/test/java/com/clip/officedata/OfficeDataApplicationTests.java diff --git a/onething/boot/api/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from onething/boot/api/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/onething/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from onething/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/onething/boot/api/gradlew b/gradlew similarity index 100% rename from onething/boot/api/gradlew rename to gradlew diff --git a/onething/boot/api/gradlew.bat b/gradlew.bat similarity index 100% rename from onething/boot/api/gradlew.bat rename to gradlew.bat diff --git a/onething/.gitignore b/onething/.gitignore deleted file mode 100644 index 12e45b7f..00000000 --- a/onething/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -HELP.md -.gradle -**/.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -**/.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/onething/boot/api/.gitattributes b/onething/boot/api/.gitattributes deleted file mode 100644 index 8af972cd..00000000 --- a/onething/boot/api/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -/gradlew text eol=lf -*.bat text eol=crlf -*.jar binary diff --git a/onething/boot/api/.gitignore b/onething/boot/api/.gitignore deleted file mode 100644 index c2065bc2..00000000 --- a/onething/boot/api/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/onething/boot/api/gradle/wrapper/gradle-wrapper.properties b/onething/boot/api/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e18bc253..00000000 --- a/onething/boot/api/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/onething/boot/api/settings.gradle b/onething/boot/api/settings.gradle deleted file mode 100644 index 5cd7dd3b..00000000 --- a/onething/boot/api/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'api' diff --git a/onething/boot/batch/.gitattributes b/onething/boot/batch/.gitattributes deleted file mode 100644 index 8af972cd..00000000 --- a/onething/boot/batch/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -/gradlew text eol=lf -*.bat text eol=crlf -*.jar binary diff --git a/onething/boot/batch/.gitignore b/onething/boot/batch/.gitignore deleted file mode 100644 index c2065bc2..00000000 --- a/onething/boot/batch/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/onething/boot/batch/gradle/wrapper/gradle-wrapper.jar b/onething/boot/batch/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b95..00000000 Binary files a/onething/boot/batch/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/onething/boot/batch/gradle/wrapper/gradle-wrapper.properties b/onething/boot/batch/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e18bc253..00000000 --- a/onething/boot/batch/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/onething/boot/batch/gradlew b/onething/boot/batch/gradlew deleted file mode 100755 index f5feea6d..00000000 --- a/onething/boot/batch/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/onething/boot/batch/gradlew.bat b/onething/boot/batch/gradlew.bat deleted file mode 100644 index 9d21a218..00000000 --- a/onething/boot/batch/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/onething/boot/batch/settings.gradle b/onething/boot/batch/settings.gradle deleted file mode 100644 index dae2d580..00000000 --- a/onething/boot/batch/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'batch' diff --git a/onething/data/core-data/.gitattributes b/onething/data/core-data/.gitattributes deleted file mode 100644 index 8af972cd..00000000 --- a/onething/data/core-data/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -/gradlew text eol=lf -*.bat text eol=crlf -*.jar binary diff --git a/onething/data/core-data/.gitignore b/onething/data/core-data/.gitignore deleted file mode 100644 index c2065bc2..00000000 --- a/onething/data/core-data/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/onething/data/core-data/gradle/wrapper/gradle-wrapper.jar b/onething/data/core-data/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b95..00000000 Binary files a/onething/data/core-data/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/onething/data/core-data/gradle/wrapper/gradle-wrapper.properties b/onething/data/core-data/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e18bc253..00000000 --- a/onething/data/core-data/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/onething/data/core-data/gradlew b/onething/data/core-data/gradlew deleted file mode 100755 index f5feea6d..00000000 --- a/onething/data/core-data/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/onething/data/core-data/gradlew.bat b/onething/data/core-data/gradlew.bat deleted file mode 100644 index 9d21a218..00000000 --- a/onething/data/core-data/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/onething/data/core-data/settings.gradle b/onething/data/core-data/settings.gradle deleted file mode 100644 index d68cec96..00000000 --- a/onething/data/core-data/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'core-data' diff --git a/onething/data/office-data/.gitattributes b/onething/data/office-data/.gitattributes deleted file mode 100644 index 8af972cd..00000000 --- a/onething/data/office-data/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -/gradlew text eol=lf -*.bat text eol=crlf -*.jar binary diff --git a/onething/data/office-data/.gitignore b/onething/data/office-data/.gitignore deleted file mode 100644 index c2065bc2..00000000 --- a/onething/data/office-data/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -HELP.md -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/onething/data/office-data/gradle/wrapper/gradle-wrapper.jar b/onething/data/office-data/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b95..00000000 Binary files a/onething/data/office-data/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/onething/data/office-data/gradle/wrapper/gradle-wrapper.properties b/onething/data/office-data/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e18bc253..00000000 --- a/onething/data/office-data/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/onething/data/office-data/gradlew b/onething/data/office-data/gradlew deleted file mode 100755 index f5feea6d..00000000 --- a/onething/data/office-data/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/onething/data/office-data/gradlew.bat b/onething/data/office-data/gradlew.bat deleted file mode 100644 index 9d21a218..00000000 --- a/onething/data/office-data/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/onething/data/office-data/settings.gradle b/onething/data/office-data/settings.gradle deleted file mode 100644 index 40ed9d18..00000000 --- a/onething/data/office-data/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'office-data' diff --git a/onething/data/office-data/src/main/resources/application.yml b/onething/data/office-data/src/main/resources/application.yml deleted file mode 100644 index 7b354280..00000000 --- a/onething/data/office-data/src/main/resources/application.yml +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=office-data diff --git a/onething/gradle/wrapper/gradle-wrapper.jar b/onething/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b95..00000000 Binary files a/onething/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/onething/gradlew b/onething/gradlew deleted file mode 100755 index f5feea6d..00000000 --- a/onething/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/onething/gradlew.bat b/onething/gradlew.bat deleted file mode 100644 index 9d21a218..00000000 --- a/onething/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/onething/settings.gradle b/settings.gradle similarity index 70% rename from onething/settings.gradle rename to settings.gradle index 8d6a5e64..6d67dd64 100644 --- a/onething/settings.gradle +++ b/settings.gradle @@ -2,4 +2,5 @@ rootProject.name = 'onething' include 'data:core-data' include 'data:office-data' include 'boot:api' -include 'boot:batch' \ No newline at end of file +include 'boot:batch' +include 'boot:office' \ No newline at end of file