Skip to content

Commit bb9cb4b

Browse files
aegershmanaegershman
authored
Fixup miscellaneous items (#2)
* add .github folder for dependabot, ci, publishing, etc. * rm circleci references * rm checkstyle config references * rm gradle properties references * fixup readme * enable java-version for jenv * fixup gitignore in general * gradle wrapper 7.0.1 * fixup gradle wrapper to latest * build kts fixups * resources file * move content to tmp folder * placeholder * move to kotlin folder * do not yet publish snapshots or even allow cutting releases * comment out category file for the moment * build gradle dependency fixups * build file fixup * give license header correct year * description cleanup * sdkmanrc, just for fun * Add lombok config matching testing frameworks for consistency * description cleanup
1 parent 6b72778 commit bb9cb4b

32 files changed

+331
-380
lines changed

‎.circleci/config.yml

-115
This file was deleted.

‎.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
version: 2
3+
updates:
4+
- package-ecosystem: github-actions
5+
directory: /
6+
schedule:
7+
interval: weekly
8+
commit-message:
9+
prefix: "chore(ci)"

‎.github/workflows/ci.yml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
---
2+
name: ci
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
tags-ignore:
9+
- "*"
10+
pull_request:
11+
branches:
12+
- main
13+
14+
env:
15+
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
16+
GRADLE_SWITCHES: "--console=plain --info --stacktrace --no-daemon"
17+
18+
jobs:
19+
build:
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
java: ["11"]
24+
os: ["ubuntu-latest"]
25+
runs-on: ${{ matrix.os }}
26+
if: github.repository_owner == 'openrewrite'
27+
steps:
28+
- uses: actions/checkout@v2
29+
with:
30+
fetch-depth: 0
31+
- name: set-up-jdk
32+
uses: actions/setup-java@v2
33+
with:
34+
distribution: "adopt"
35+
java-version: ${{ matrix.java }}
36+
- name: setup-cache
37+
uses: actions/[email protected]
38+
with:
39+
path: |
40+
~/.gradle/caches
41+
~/.gradle/wrapper
42+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
43+
restore-keys: |
44+
${{ runner.os }}-gradle-
45+
- name: build
46+
run: ./gradlew ${GRADLE_SWITCHES} build test
47+
#
48+
# publish-snapshots:
49+
# needs: [build]
50+
# runs-on: ubuntu-latest
51+
# if: github.event_name == 'push' && github.repository_owner == 'openrewrite'
52+
# steps:
53+
# - uses: actions/checkout@v2
54+
# with:
55+
# fetch-depth: 0
56+
# - name: set-up-jdk
57+
# uses: actions/setup-java@v2
58+
# with:
59+
# distribution: "adopt"
60+
# java-version: "11"
61+
# - name: setup-cache
62+
# uses: actions/[email protected]
63+
# with:
64+
# path: |
65+
# ~/.gradle/caches
66+
# ~/.gradle/wrapper
67+
# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
68+
# restore-keys: |
69+
# ${{ runner.os }}-gradle-
70+
# - name: publish-snapshots
71+
# if: github.event_name == 'push'
72+
# timeout-minutes: 30
73+
# run: ./gradlew ${GRADLE_SWITCHES} snapshot publish -PforceSigning -x test
74+
# env:
75+
# ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
76+
# ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
77+
# ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_SIGNING_KEY }}
78+
# ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_SIGNING_PASSWORD }}

‎.github/workflows/gradle-wrapper-validation.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: "Validate Gradle Wrapper"
3+
on: [push, pull_request]
4+
5+
jobs:
6+
validation:
7+
name: "Validation"
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- uses: gradle/wrapper-validation-action@v1

‎.github/workflows/publish.yml.disabled

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: publish
3+
4+
on:
5+
push:
6+
tags:
7+
- v[0-9]+.[0-9]+.[0-9]+
8+
- v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+
9+
10+
env:
11+
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
12+
GRADLE_SWITCHES: "--console=plain --info --stacktrace --no-daemon"
13+
14+
jobs:
15+
release:
16+
runs-on: ubuntu-latest
17+
if: github.repository_owner == 'openrewrite'
18+
steps:
19+
- uses: actions/checkout@v2
20+
with:
21+
fetch-depth: 0
22+
- name: set-up-jdk
23+
uses: actions/setup-java@v2
24+
with:
25+
distribution: "adopt"
26+
java-version: "11"
27+
- name: setup-cache
28+
uses: actions/[email protected]
29+
with:
30+
path: |
31+
~/.gradle/caches
32+
~/.gradle/wrapper
33+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
34+
restore-keys: |
35+
${{ runner.os }}-gradle-
36+
37+
- name: publish-candidate
38+
if: contains(github.ref, '-rc.')
39+
timeout-minutes: 30
40+
run: ./gradlew ${GRADLE_SWITCHES} -Preleasing -Prelease.disableGitChecks=true -Prelease.useLastTag=true candidate publish closeAndReleaseSonatypeStagingRepository
41+
env:
42+
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
43+
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
44+
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_SIGNING_KEY }}
45+
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_SIGNING_PASSWORD }}
46+
47+
- name: publish-release
48+
if: (!contains(github.ref, '-rc.'))
49+
timeout-minutes: 30
50+
run: ./gradlew ${GRADLE_SWITCHES} -Preleasing -Prelease.disableGitChecks=true -Prelease.useLastTag=true final publish closeAndReleaseSonatypeStagingRepository
51+
env:
52+
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
53+
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
54+
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_SIGNING_KEY }}
55+
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_SIGNING_PASSWORD }}

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build/
22
.gradle/
3-
gradle.properties
4-
.java-version
3+
out/
4+
.idea/

‎.java-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11

‎.sdkmanrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Enable auto-env through the sdkman_auto_env config
2+
# Add key=value pairs of SDKs to use below
3+
# sdk env install to download if not already installed locally
4+
java=11.0.10.hs-adpt

‎README.md

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
![Logo](https://github.com/openrewrite/rewrite/raw/master/doc/logo-oss.png)
2-
### Migrates off of old logging frameworks. Automatically.
1+
![Logo](https://github.com/openrewrite/rewrite/raw/main/doc/logo-oss.png)
2+
### Migrate logging frameworks. Automatically.
33

4-
[![Build Status](https://circleci.com/gh/openrewrite/rewrite-logging.svg?style=shield)](https://circleci.com/gh/openrewrite/rewrite-logging)
4+
[![ci](https://github.com/openrewrite/rewrite-logging/actions/workflows/ci.yml/badge.svg)](https://github.com/openrewrite/rewrite-logging/actions/workflows/ci.yml)
55
[![Apache 2.0](https://img.shields.io/github/license/openrewrite/rewrite-logging.svg)](https://www.apache.org/licenses/LICENSE-2.0)
6-
[![Maven Central](https://img.shields.io/maven-central/v/org.openrewrite.plan/rewrite-logging.svg)](https://mvnrepository.com/artifact/org.openrewrite.plan/rewrite-logging)
6+
[![Maven Central](https://img.shields.io/maven-central/v/org.openrewrite.recipe/rewrite-logging.svg)](https://mvnrepository.com/artifact/org.openrewrite.recipe/rewrite-logging)
77

88
### What is this?
99

10-
This project implements a [Rewrite module](https://github.com/openrewrite/rewrite) that migrates Java code off of Log4J, Apache Commons Logging, and JUL and on to SLF4J.
11-
12-
### How do I use it?
13-
14-
Download the release from Maven Central and in the root of a directory containing any number of projects with Java code to migrate run:
15-
16-
```java
17-
java -jar rewrite-logging.jar
18-
```
19-
20-
Alternatively, run `./gradlew fixSourceLint` with Rewrite Logging enabled in the [Gradle plugin](https://github.com/openrewrite/rewrite-gradle-plugin) or `./mvnw org.openrewrite.maven:maven-rewrite-plugin:fixSourceLint` in the [Maven plugin](https://github.com/openrewrite/rewrite-maven-plugin).
10+
This project implements a [Rewrite module](https://github.com/openrewrite/rewrite) that performs common Java logging framework tasks, like migrating from Log4J, Apache Commons Logging, and JUL, to SLF4J.

0 commit comments

Comments
 (0)