Skip to content

Commit

Permalink
Merge pull request #4 from umjammer/0.4.1
Browse files Browse the repository at this point in the history
0.4.1
  • Loading branch information
umjammer authored Mar 9, 2022
2 parents 2af2f75 + 033c153 commit 8a69669
Show file tree
Hide file tree
Showing 41 changed files with 1,788 additions and 706 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '20 7 * * 0'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
26 changes: 26 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
lib/
tmp/
local.properties
23 changes: 13 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

Many Utilities

## 💖 Contents
## 🧰 Contents

### 💜 Mime Utility
### 🔧 Mime Utility

to be deprecated

### 💜 Ant Tasks
### 🔧 Ant Tasks

to be deprecated

Expand All @@ -19,27 +19,30 @@ to be deprecated
* InOut
* iAppli pak

### 💜 Java Parser
### 🔧 Java Parser

to be deprecated

### 💜 Utility
### 🔧 Utility

* Japanese Holiday
* iCal version
* google calendar cloud api version
* calculated version
* Password Field
* Singleton

### 💜 GNU Diff
### 🔧 GNU Diff

### 💜 XML
### 🔧 XML

### 💜 Ansi Color
### 🔧 Ansi Color

### 💜 Grep
### 🔧 Grep

to be deprecated

### 💜 Dynamic Morphism
### 🔧 Dynamic Morphism

### TODO

Expand Down
1 change: 1 addition & 0 deletions local.properties.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
google.account=you@gmail.com
134 changes: 90 additions & 44 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,14 @@

<groupId>vavi</groupId>
<artifactId>vavi-commons-sandbox</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>

<name>Vavi Commons Sandbox API</name>
<organization>
<name></name>
</organization>
<url>https://github.com/umjammer/vavi-commons-sandbox</url>
<description>0.4.0

promote instrumentation, engineering io into main stream

0.3.5

maintenance version

0.3.4

change diff package name
update instrumentation

0.3.3

out source swing related

0.3.2

move LevenshteinDistance to vavi-commons
add swing xml pretty printer

<description>
TODO

mac finder alias
Expand All @@ -48,6 +27,57 @@ TODO
<url>https://github.com/umjammer/vavi-commons-sandbox/issues</url>
</issueManagement>

<profiles>
<profile>
<id>local (not on CI)</id>
<activation>
<file>
<exists>${basedir}/local.properties</exists>
</file>
<property>
<name>env.JITPACK</name>
<value>!true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${basedir}/local.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<environmentVariables>
<GOOGLE_ACCOUNT>${google.account}</GOOGLE_ACCOUNT>
</environmentVariables>
<argLine>
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
-Duser.language=ja
</argLine>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -90,7 +120,7 @@ TODO
<!-- options for JJTree and JavaCC go here -->
</configuration>
</execution>
<execution>
<execution>
<id>javacc</id>
<goals>
<goal>javacc</goal>
Expand All @@ -102,26 +132,15 @@ TODO
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<archive>
<manifestEntries>
<Premain-Class>vavix.util.VaviInstrumentation</Premain-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Boot-Class-Path>javassist-3.8.0.GA.jar</Boot-Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.0.0-M5</version>
<configuration>
<argLine>-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties</argLine>
<argLine>
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
-Duser.language=ja
</argLine>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
Expand All @@ -135,11 +154,23 @@ TODO
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-commons</artifactId>
<version>1.1.0</version>
<version>1.1.6</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Expand All @@ -151,6 +182,11 @@ TODO
<artifactId>ant</artifactId>
<version>1.10.11</version>
</dependency>
<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-util-serdes</artifactId>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>net.sf.jacob-project</groupId>
Expand All @@ -161,19 +197,29 @@ TODO
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.5.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.github.umjammer.vavi-net-auth</groupId>
<artifactId>vavi-net-auth-google</artifactId>
<version>0.1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-calendar</artifactId>
<version>v3-rev409-1.25.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 8a69669

Please sign in to comment.