Skip to content

Commit 0553f21

Browse files
jpfleischerjpfleischer
committed
refactor src/main/java/resources to src/main/resources
1 parent e235fe5 commit 0553f21

File tree

124 files changed

+902
-785
lines changed

Some content is hidden

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

124 files changed

+902
-785
lines changed

‎.classpath

+57-49
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,57 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java">
4-
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10-
<attributes>
11-
<attribute name="optional" value="true"/>
12-
<attribute name="maven.pomderived" value="true"/>
13-
<attribute name="test" value="true"/>
14-
</attributes>
15-
</classpathentry>
16-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
17-
<attributes>
18-
<attribute name="maven.pomderived" value="true"/>
19-
</attributes>
20-
</classpathentry>
21-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
22-
<attributes>
23-
<attribute name="maven.pomderived" value="true"/>
24-
</attributes>
25-
</classpathentry>
26-
<classpathentry kind="src" path="target/generated-sources/annotations">
27-
<attributes>
28-
<attribute name="optional" value="true"/>
29-
<attribute name="maven.pomderived" value="true"/>
30-
<attribute name="ignore_optional_problems" value="true"/>
31-
<attribute name="m2e-apt" value="true"/>
32-
</attributes>
33-
</classpathentry>
34-
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
35-
<attributes>
36-
<attribute name="maven.pomderived" value="true"/>
37-
</attributes>
38-
</classpathentry>
39-
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
40-
<attributes>
41-
<attribute name="optional" value="true"/>
42-
<attribute name="maven.pomderived" value="true"/>
43-
<attribute name="ignore_optional_problems" value="true"/>
44-
<attribute name="m2e-apt" value="true"/>
45-
<attribute name="test" value="true"/>
46-
</attributes>
47-
</classpathentry>
48-
<classpathentry kind="output" path="target/classes"/>
49-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
17+
<attributes>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
22+
<attributes>
23+
<attribute name="maven.pomderived" value="true"/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry kind="src" path="target/generated-sources/annotations">
27+
<attributes>
28+
<attribute name="optional" value="true"/>
29+
<attribute name="maven.pomderived" value="true"/>
30+
<attribute name="ignore_optional_problems" value="true"/>
31+
<attribute name="m2e-apt" value="true"/>
32+
</attributes>
33+
</classpathentry>
34+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
35+
<attributes>
36+
<attribute name="maven.pomderived" value="true"/>
37+
<attribute name="optional" value="true"/>
38+
</attributes>
39+
</classpathentry>
40+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
41+
<attributes>
42+
<attribute name="maven.pomderived" value="true"/>
43+
<attribute name="test" value="true"/>
44+
<attribute name="optional" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
48+
<attributes>
49+
<attribute name="optional" value="true"/>
50+
<attribute name="maven.pomderived" value="true"/>
51+
<attribute name="ignore_optional_problems" value="true"/>
52+
<attribute name="m2e-apt" value="true"/>
53+
<attribute name="test" value="true"/>
54+
</attributes>
55+
</classpathentry>
56+
<classpathentry kind="output" path="target/classes"/>
57+
</classpath>

‎.github/workflows/build.yml

+61-61
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
name: Build Workflow
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
8-
jobs:
9-
build:
10-
runs-on: windows-latest
11-
12-
steps:
13-
- name: Checkout repository
14-
uses: actions/checkout@v2
15-
16-
- name: Set up JDK 17
17-
uses: actions/setup-java@v2
18-
with:
19-
distribution: 'adopt'
20-
java-version: '17'
21-
22-
- name: Build with Maven
23-
run: mvn package
24-
25-
- name: Install Launch4j using Chocolatey
26-
run: |
27-
choco install launch4j -y
28-
29-
- name: Run Launch4j
30-
run: |
31-
"C:\Program Files (x86)\Launch4j\launch4j.exe" D:\a\MDCstudentSIMULATOR\MDCstudentSIMULATOR\launch4j.xml
32-
shell: bash
33-
34-
- name: Upload EXE artifact
35-
uses: actions/upload-artifact@v2
36-
with:
37-
name: MDCstudentSIMULATOR_executable
38-
path: target/MDCstudentSIMULATOR.exe
39-
40-
- name: Create Release
41-
id: create_release
42-
uses: actions/create-release@v1
43-
env:
44-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45-
with:
46-
tag_name: ${{ github.ref_name }}
47-
release_name: "Release ${{ github.ref_name }}"
48-
body: "Release created by GitHub Actions"
49-
draft: false
50-
prerelease: false
51-
52-
- name: Upload Release Asset
53-
id: upload-release-asset
54-
uses: actions/upload-release-asset@v1
55-
env:
56-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57-
with:
58-
upload_url: ${{ steps.create_release.outputs.upload_url }}
59-
asset_path: target/MDCstudentSIMULATOR.exe
60-
asset_name: MDCstudentSIMULATOR.exe
61-
asset_content_type: application/octet-stream
1+
# name: Build Workflow
2+
3+
# on:
4+
# push:
5+
# branches:
6+
# - main
7+
8+
# jobs:
9+
# build:
10+
# runs-on: windows-latest
11+
12+
# steps:
13+
# - name: Checkout repository
14+
# uses: actions/checkout@v2
15+
16+
# - name: Set up JDK 17
17+
# uses: actions/setup-java@v2
18+
# with:
19+
# distribution: 'adopt'
20+
# java-version: '17'
21+
22+
# - name: Build with Maven
23+
# run: mvn package
24+
25+
# - name: Install Launch4j using Chocolatey
26+
# run: |
27+
# choco install launch4j -y
28+
29+
# - name: Run Launch4j
30+
# run: |
31+
# "C:\Program Files (x86)\Launch4j\launch4j.exe" D:\a\MDCstudentSIMULATOR\MDCstudentSIMULATOR\launch4j.xml
32+
# shell: bash
33+
34+
# - name: Upload EXE artifact
35+
# uses: actions/upload-artifact@v2
36+
# with:
37+
# name: MDCstudentSIMULATOR_executable
38+
# path: target/MDCstudentSIMULATOR.exe
39+
40+
# - name: Create Release
41+
# id: create_release
42+
# uses: actions/create-release@v1
43+
# env:
44+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
# with:
46+
# tag_name: ${{ github.ref_name }}
47+
# release_name: "Release ${{ github.ref_name }}"
48+
# body: "Release created by GitHub Actions"
49+
# draft: false
50+
# prerelease: false
51+
52+
# - name: Upload Release Asset
53+
# id: upload-release-asset
54+
# uses: actions/upload-release-asset@v1
55+
# env:
56+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57+
# with:
58+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
59+
# asset_path: target/MDCstudentSIMULATOR.exe
60+
# asset_name: MDCstudentSIMULATOR.exe
61+
# asset_content_type: application/octet-stream

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.jar
1+
*.jar
2+
*.exe

‎.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</natures>
2323
<filteredResources>
2424
<filter>
25-
<id>1649992439309</id>
25+
<id>1725434000704</id>
2626
<name></name>
2727
<type>30</type>
2828
<matcher>
2929
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30-
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
3131
</matcher>
3232
</filter>
3333
</filteredResources>

‎Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
hi:
22
mvn package
33
java -jar target/gs-maven-0.1.0.jar
4+
5+
exe:
6+
"/c/Program\ Files\ \(x86\)/Launch4j/launch4j.exe /c/Users/stapm/cm/MDCstudentSIMULATOR/launch4j.xml"
7+
8+
test:
9+
mvn clean package
10+
java -jar target/gs-maven-0.1.0.jar
11+

‎dependency-reduced-pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<build>
88
<resources>
99
<resource>
10-
<directory>src/main/java/resources</directory>
10+
<directory>src/main/resources</directory>
1111
<includes>
1212
<include>**/*</include>
1313
</includes>

‎launch4j.xml

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
<launch4jConfig>
2-
<!-- The jar file that you want to convert to an EXE -->
2+
<!-- The JAR file that you want to convert to an EXE -->
33
<jar>target/gs-maven-0.1.0.jar</jar>
4-
4+
55
<!-- The output EXE file that will be generated -->
66
<outfile>target/MDCstudentSIMULATOR.exe</outfile>
7-
8-
<!-- Main class that contains the 'public static void main(String[] args)' method -->
9-
<manifest>
10-
<mainClass>com.example.MainClass</mainClass> <!-- Replace with your actual main class -->
11-
</manifest>
127

13-
<!-- Settings related to the generated EXE file -->
14-
<headerType>gui</headerType> <!-- 'gui' if it's a graphical application, 'console' for command-line -->
8+
<!-- GUI application type -->
9+
<headerType>gui</headerType> <!-- Use 'console' for command-line applications -->
10+
11+
<!-- Error handling and process behavior -->
1512
<errTitle>Application Error</errTitle>
1613
<cmdLine></cmdLine>
1714
<chdir>.</chdir>
1815
<priority>normal</priority>
19-
<downloadUrl></downloadUrl>
20-
<supportUrl></supportUrl>
21-
<stayAlive>false</stayAlive>
22-
<restartOnCrash>false</restartOnCrash>
2316

2417
<!-- Optionally, you can specify an icon for the EXE -->
2518
<icon></icon> <!-- Path to a .ico file if you want a custom icon for your EXE -->
19+
20+
<!-- JRE Configuration -->
21+
<jre>
22+
<minVersion>1.8.0</minVersion> <!-- Specify the minimum Java version required -->
23+
<maxVersion></maxVersion> <!-- No maximum Java version -->
24+
<bundledJreAsFallback>false</bundledJreAsFallback> <!-- Disable fallback if no bundled JRE -->
25+
<runtimeBits>64/32</runtimeBits> <!-- Supports both 32-bit and 64-bit JREs -->
26+
</jre>
2627
</launch4jConfig>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<build>
2929
<resources>
3030
<resource>
31-
<directory>src/main/java/resources</directory>
31+
<directory>src/main/resources</directory>
3232
<includes>
3333
<include>**/*</include>
3434
</includes>

0 commit comments

Comments
 (0)