Skip to content

Commit 8a69669

Browse files
umjammerumjammer
authored
Merge pull request #4 from umjammer/0.4.1
0.4.1
2 parents 2af2f75 + 033c153 commit 8a69669

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1788
-706
lines changed

‎.github/workflows/codeql.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ master ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ master ]
20+
schedule:
21+
- cron: '20 7 * * 0'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'java' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v2
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v1
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
52+
53+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54+
# If this step fails, then you should remove it and run the build manually (see below)
55+
- name: Autobuild
56+
uses: github/codeql-action/autobuild@v1
57+
58+
# ℹ️ Command-line programs to run using the OS shell.
59+
# 📚 https://git.io/JvXDl
60+
61+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62+
# and modify them (or add more) to build your code if your project
63+
# uses a compiled language
64+
65+
#- run: |
66+
# make bootstrap
67+
# make release
68+
69+
- name: Perform CodeQL Analysis
70+
uses: github/codeql-action/analyze@v1

‎.github/workflows/maven.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
4+
name: Java CI with Maven
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Set up JDK 8
20+
uses: actions/setup-java@v2
21+
with:
22+
java-version: '8'
23+
distribution: 'adopt'
24+
cache: maven
25+
- name: Build with Maven
26+
run: mvn -B package --file pom.xml

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
lib/
22
tmp/
3+
local.properties

‎README.md

+13-10
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
Many Utilities
66

7-
## 💖 Contents
7+
## 🧰 Contents
88

9-
### 💜 Mime Utility
9+
### 🔧 Mime Utility
1010

1111
to be deprecated
1212

13-
### 💜 Ant Tasks
13+
### 🔧 Ant Tasks
1414

1515
to be deprecated
1616

@@ -19,27 +19,30 @@ to be deprecated
1919
* InOut
2020
* iAppli pak
2121

22-
### 💜 Java Parser
22+
### 🔧 Java Parser
2323

2424
to be deprecated
2525

26-
### 💜 Utility
26+
### 🔧 Utility
2727

2828
* Japanese Holiday
29+
* iCal version
30+
* google calendar cloud api version
31+
* calculated version
2932
* Password Field
3033
* Singleton
3134

32-
### 💜 GNU Diff
35+
### 🔧 GNU Diff
3336

34-
### 💜 XML
37+
### 🔧 XML
3538

36-
### 💜 Ansi Color
39+
### 🔧 Ansi Color
3740

38-
### 💜 Grep
41+
### 🔧 Grep
3942

4043
to be deprecated
4144

42-
### 💜 Dynamic Morphism
45+
### 🔧 Dynamic Morphism
4346

4447
### TODO
4548

‎local.properties.sample

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
google.account=you@gmail.com

‎pom.xml

+90-44
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,14 @@
88

99
<groupId>vavi</groupId>
1010
<artifactId>vavi-commons-sandbox</artifactId>
11-
<version>0.4.0</version>
11+
<version>0.4.1</version>
1212

1313
<name>Vavi Commons Sandbox API</name>
1414
<organization>
1515
<name></name>
1616
</organization>
1717
<url>https://github.com/umjammer/vavi-commons-sandbox</url>
18-
<description>0.4.0
19-
20-
promote instrumentation, engineering io into main stream
21-
22-
0.3.5
23-
24-
maintenance version
25-
26-
0.3.4
27-
28-
change diff package name
29-
update instrumentation
30-
31-
0.3.3
32-
33-
out source swing related
34-
35-
0.3.2
36-
37-
move LevenshteinDistance to vavi-commons
38-
add swing xml pretty printer
39-
18+
<description>
4019
TODO
4120

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

30+
<profiles>
31+
<profile>
32+
<id>local (not on CI)</id>
33+
<activation>
34+
<file>
35+
<exists>${basedir}/local.properties</exists>
36+
</file>
37+
<property>
38+
<name>env.JITPACK</name>
39+
<value>!true</value>
40+
</property>
41+
</activation>
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>properties-maven-plugin</artifactId>
47+
<version>1.0.0</version>
48+
<executions>
49+
<execution>
50+
<phase>initialize</phase>
51+
<goals>
52+
<goal>read-project-properties</goal>
53+
</goals>
54+
<configuration>
55+
<files>
56+
<file>${basedir}/local.properties</file>
57+
</files>
58+
</configuration>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-surefire-plugin</artifactId>
65+
<configuration>
66+
<environmentVariables>
67+
<GOOGLE_ACCOUNT>${google.account}</GOOGLE_ACCOUNT>
68+
</environmentVariables>
69+
<argLine>
70+
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
71+
-Duser.language=ja
72+
</argLine>
73+
<trimStackTrace>false</trimStackTrace>
74+
</configuration>
75+
</plugin>
76+
</plugins>
77+
</build>
78+
</profile>
79+
</profiles>
80+
5181
<build>
5282
<plugins>
5383
<plugin>
@@ -90,7 +120,7 @@ TODO
90120
<!-- options for JJTree and JavaCC go here -->
91121
</configuration>
92122
</execution>
93-
<execution>
123+
<execution>
94124
<id>javacc</id>
95125
<goals>
96126
<goal>javacc</goal>
@@ -102,26 +132,15 @@ TODO
102132
</execution>
103133
</executions>
104134
</plugin>
105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-jar-plugin</artifactId>
108-
<version>2.3.1</version>
109-
<configuration>
110-
<archive>
111-
<manifestEntries>
112-
<Premain-Class>vavix.util.VaviInstrumentation</Premain-Class>
113-
<Can-Redefine-Classes>true</Can-Redefine-Classes>
114-
<Boot-Class-Path>javassist-3.8.0.GA.jar</Boot-Class-Path>
115-
</manifestEntries>
116-
</archive>
117-
</configuration>
118-
</plugin>
119135
<plugin>
120136
<groupId>org.apache.maven.plugins</groupId>
121137
<artifactId>maven-surefire-plugin</artifactId>
122-
<version>2.22.2</version>
138+
<version>3.0.0-M5</version>
123139
<configuration>
124-
<argLine>-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties</argLine>
140+
<argLine>
141+
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
142+
-Duser.language=ja
143+
</argLine>
125144
<trimStackTrace>false</trimStackTrace>
126145
</configuration>
127146
</plugin>
@@ -135,11 +154,23 @@ TODO
135154
</repository>
136155
</repositories>
137156

157+
<dependencyManagement>
158+
<dependencies>
159+
<dependency>
160+
<groupId>org.junit</groupId>
161+
<artifactId>junit-bom</artifactId>
162+
<version>5.8.1</version>
163+
<type>pom</type>
164+
<scope>import</scope>
165+
</dependency>
166+
</dependencies>
167+
</dependencyManagement>
168+
138169
<dependencies>
139170
<dependency>
140171
<groupId>com.github.umjammer</groupId>
141172
<artifactId>vavi-commons</artifactId>
142-
<version>1.1.0</version>
173+
<version>1.1.6</version>
143174
</dependency>
144175
<dependency>
145176
<groupId>commons-beanutils</groupId>
@@ -151,6 +182,11 @@ TODO
151182
<artifactId>ant</artifactId>
152183
<version>1.10.11</version>
153184
</dependency>
185+
<dependency>
186+
<groupId>com.github.umjammer</groupId>
187+
<artifactId>vavi-util-serdes</artifactId>
188+
<version>1.0.0</version>
189+
</dependency>
154190

155191
<dependency>
156192
<groupId>net.sf.jacob-project</groupId>
@@ -161,19 +197,29 @@ TODO
161197
<dependency>
162198
<groupId>org.junit.jupiter</groupId>
163199
<artifactId>junit-jupiter-api</artifactId>
164-
<version>5.3.0</version>
165200
<scope>test</scope>
166201
</dependency>
167202
<dependency>
168203
<groupId>org.junit.jupiter</groupId>
169204
<artifactId>junit-jupiter-engine</artifactId>
170-
<version>5.3.0</version>
171205
<scope>test</scope>
172206
</dependency>
173207
<dependency>
174208
<groupId>org.junit.platform</groupId>
175209
<artifactId>junit-platform-commons</artifactId>
176-
<version>1.5.2</version>
210+
<scope>test</scope>
211+
</dependency>
212+
213+
<dependency>
214+
<groupId>com.github.umjammer.vavi-net-auth</groupId>
215+
<artifactId>vavi-net-auth-google</artifactId>
216+
<version>0.1.4</version>
217+
<scope>test</scope>
218+
</dependency>
219+
<dependency>
220+
<groupId>com.google.apis</groupId>
221+
<artifactId>google-api-services-calendar</artifactId>
222+
<version>v3-rev409-1.25.0</version>
177223
<scope>test</scope>
178224
</dependency>
179225
</dependencies>

0 commit comments

Comments
 (0)