Skip to content

Commit d8695d9

Browse files
author
Darryl L. Pierce
committed
Added a build action [#38]
1 parent 67a921b commit d8695d9

File tree

5 files changed

+84
-163
lines changed

5 files changed

+84
-163
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# GOAL: Verify that the code builds without error.
2+
3+
name: "Build the code"
4+
5+
on:
6+
push:
7+
branches:
8+
- main
9+
pull_request:
10+
types: [opened, synchronize, reopened]
11+
12+
jobs:
13+
build:
14+
name: Build
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
fetch-depth: 0
20+
- name: Set up JDK 21
21+
uses: actions/setup-java@v1
22+
with:
23+
java-version: 21
24+
- name: Cache Maven packages
25+
uses: actions/cache@v3
26+
with:
27+
path: ~/.m2
28+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
29+
restore-keys: ${{ runner.os }}-m2
30+
- name: Build and analyze
31+
run: mvn clean verify
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/publish-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
java-version: 21
2828
- name: Create the release artifact
29-
run: mvn package -DskipTests -Pci -Dassembly.name=GA
29+
run: mvn package -DskipTests -Dassembly.name=GA
3030
- name: Create pre-release
3131
uses: "marvinpinto/action-automatic-releases@latest"
3232
with:

pom.xml

Lines changed: 48 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -34,128 +34,6 @@
3434
<log4j.version>2.20.0</log4j.version>
3535
</properties>
3636

37-
<profiles>
38-
<profile>
39-
<id>dev</id>
40-
<activation>
41-
<activeByDefault>true</activeByDefault>
42-
<property>
43-
<name>env</name>
44-
<value>dev</value>
45-
</property>
46-
</activation>
47-
<repositories>
48-
<repository>
49-
<name>Central Portal Snapshots</name>
50-
<id>central-portal-snapshots</id>
51-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
52-
<releases>
53-
<enabled>false</enabled>
54-
</releases>
55-
<snapshots>
56-
<enabled>true</enabled>
57-
</snapshots>
58-
</repository>
59-
</repositories>
60-
<build>
61-
<plugins>
62-
<plugin>
63-
<groupId>com.cosium.code</groupId>
64-
<artifactId>git-code-format-maven-plugin</artifactId>
65-
<version>${maven-git-code-format.version}</version>
66-
<executions>
67-
<execution>
68-
<id>install-formatter-hook</id>
69-
<goals>
70-
<goal>install-hooks</goal>
71-
</goals>
72-
</execution>
73-
<execution>
74-
<id>validate-code-format</id>
75-
<goals>
76-
<goal>validate-code-format</goal>
77-
</goals>
78-
</execution>
79-
</executions>
80-
<dependencies>
81-
<dependency>
82-
<groupId>com.cosium.code</groupId>
83-
<artifactId>google-java-format</artifactId>
84-
<version>${git-code-format-maven-plugin.version}</version>
85-
</dependency>
86-
</dependencies>
87-
</plugin>
88-
</plugins>
89-
</build>
90-
</profile>
91-
<profile>
92-
<id>ci</id>
93-
<activation>
94-
<property>
95-
<name>env</name>
96-
<value>ci</value>
97-
</property>
98-
</activation>
99-
<build>
100-
<plugins>
101-
<plugin>
102-
<groupId>com.cosium.code</groupId>
103-
<artifactId>git-code-format-maven-plugin</artifactId>
104-
<version>${maven-git-code-format.version}</version>
105-
<executions>
106-
<execution>
107-
<id>install-formatter-hook</id>
108-
<goals>
109-
<goal>install-hooks</goal>
110-
</goals>
111-
</execution>
112-
<execution>
113-
<id>validate-code-format</id>
114-
<goals>
115-
<goal>validate-code-format</goal>
116-
</goals>
117-
</execution>
118-
</executions>
119-
<dependencies>
120-
<dependency>
121-
<groupId>com.cosium.code</groupId>
122-
<artifactId>google-java-format</artifactId>
123-
<version>${git-code-format-maven-plugin.version}</version>
124-
</dependency>
125-
</dependencies>
126-
</plugin>
127-
</plugins>
128-
</build>
129-
</profile>
130-
<profile>
131-
<id>release</id>
132-
<build>
133-
<plugins>
134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-gpg-plugin</artifactId>
137-
<version>3.1.0</version>
138-
<executions>
139-
<execution>
140-
<id>sign-artifacts</id>
141-
<phase>verify</phase>
142-
<goals>
143-
<goal>sign</goal>
144-
</goals>
145-
<configuration>
146-
<gpgArguments>
147-
<argument>--pinentry-mode</argument>
148-
<argument>loopback</argument>
149-
</gpgArguments>
150-
</configuration>
151-
</execution>
152-
</executions>
153-
</plugin>
154-
</plugins>
155-
</build>
156-
</profile>
157-
</profiles>
158-
15937
<dependencies>
16038
<dependency>
16139
<groupId>org.comixedproject</groupId>
@@ -223,19 +101,41 @@
223101
</annotationProcessorPaths>
224102
</configuration>
225103
</plugin>
104+
<plugin>
105+
<groupId>com.cosium.code</groupId>
106+
<artifactId>git-code-format-maven-plugin</artifactId>
107+
<version>${maven-git-code-format.version}</version>
108+
<executions>
109+
<execution>
110+
<id>install-formatter-hook</id>
111+
<goals>
112+
<goal>install-hooks</goal>
113+
</goals>
114+
</execution>
115+
<execution>
116+
<id>validate-code-format</id>
117+
<goals>
118+
<goal>validate-code-format</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
<dependencies>
123+
<dependency>
124+
<groupId>com.cosium.code</groupId>
125+
<artifactId>google-java-format</artifactId>
126+
<version>${git-code-format-maven-plugin.version}</version>
127+
</dependency>
128+
</dependencies>
129+
</plugin>
226130
<plugin>
227131
<groupId>org.jacoco</groupId>
228132
<artifactId>jacoco-maven-plugin</artifactId>
229-
<version>0.8.10</version>
133+
<version>0.8.12</version>
230134
<configuration>
231135
<excludes>
232136
<exclude>**/model/**</exclude>
233-
<exclude>**/comixedproject/http/**</exclude>
234137
<exclude>**/*Exception*</exclude>
235-
<exclude>**/state/comicbooks/Comic*</exclude>
236-
<exclude>**/state/lists/ReadingList**</exclude>
237-
<exclude>**/batch/comicbooks/*Configuration</exclude>
238-
<exclude>**/ComiXed*App</exclude>
138+
<exclude>**/Abstract*</exclude>
239139
</excludes>
240140
</configuration>
241141
<executions>
@@ -252,6 +152,14 @@
252152
</goals>
253153
</execution>
254154
<execution>
155+
<id>report</id>
156+
<phase>test</phase>
157+
<goals>
158+
<goal>report</goal>
159+
</goals>
160+
</execution>
161+
<!-- jacoco isn't seeing the test output -->
162+
<!-- execution>
255163
<id>check</id>
256164
<goals>
257165
<goal>check</goal>
@@ -270,9 +178,19 @@
270178
</rule>
271179
</rules>
272180
</configuration>
273-
</execution>
181+
</execution -->
274182
</executions>
275183
</plugin>
184+
<plugin>
185+
<groupId>org.apache.maven.plugins</groupId>
186+
<artifactId>maven-surefire-plugin</artifactId>
187+
<version>3.5.3</version>
188+
</plugin>
189+
<plugin>
190+
<groupId>org.apache.maven.plugins</groupId>
191+
<artifactId>maven-failsafe-plugin</artifactId>
192+
<version>2.22.0</version>
193+
</plugin>
276194
<plugin>
277195
<groupId>org.apache.maven.plugins</groupId>
278196
<artifactId>maven-help-plugin</artifactId>
@@ -370,7 +288,7 @@
370288
<artifactId>gitlog-maven-plugin</artifactId>
371289
<version>1.14.0</version>
372290
<configuration>
373-
<reportTitle>Changelog for the ComiXed ComicVine Metadata Scraper v2.2-SNAPSHOT</reportTitle>
291+
<reportTitle>Changelog for the ComiXed ComicVine Metadata Scraper v3.1-SNAPSHOT</reportTitle>
374292
<verbose>false</verbose>
375293
<outputDirectory>${project.basedir}</outputDirectory>
376294
<generateMarkdownChangeLog>true</generateMarkdownChangeLog>

src/main/java/org/comixedproject/metadata/comicvine/ComicVineAdaptorException.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/java/org/comixedproject/metadata/comicvine/adaptors/ComicVineMetadataAdaptorProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ComicVineMetadataAdaptorProvider extends AbstractMetadataAdaptorPro
3737
/** The API key property name. */
3838
static final String PROPERTY_API_KEY = "comic-vine.api-key";
3939

40-
private static final String VERSION = "2.2-SNAPSHOT";
40+
private static final String VERSION = "3.1-SNAPSHOT";
4141
private static final String HOMEPAGE = "http://www.github.com/comixed/comixed-metadata-comicvine";
4242
static final String PROPERTY_DELAY = "comic-vine.delay";
4343

0 commit comments

Comments
 (0)