Skip to content

Commit 0a80334

Browse files
unknowIfGuestInDreamunknowIfGuestInDream
authored
fix(common): 修复common打包后spi配置被覆盖问题 (#612)
1 parent 32cab92 commit 0a80334

24 files changed

+24
-563
lines changed

‎common/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@
4848

4949
provides com.tlcsdm.frame.service.FXSamplerProject with com.tlcsdm.jfxcommon.provider.CommonSamplerProjectProvider;
5050

51-
}
51+
}

‎common/src/main/resources/META-INF/services/com.tlcsdm.frame.service.FXSamplerProject

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

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5959
<junit.version>5.9.3</junit.version>
60-
<javafx.version>17.0.7</javafx.version>
60+
<javafx.version>17.0.8</javafx.version>
6161
<controlsfx.version>11.1.2</controlsfx.version>
6262
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
6363
<tlcsdm-common.version>1.4.3</tlcsdm-common.version>

‎qe/src/main/resources/META-INF/services/com.tlcsdm.core.freemarker.TemplateLoaderService

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1 @@
1-
#
2-
# Copyright (c) 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
281
com.tlcsdm.qe.config.QeTemplateLoaderProvider

‎qe/src/main/resources/META-INF/services/com.tlcsdm.frame.service.CenterPanelService

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1 @@
1-
#
2-
# Copyright (c) 2019, 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
28-
com.tlcsdm.qe.provider.QeCenterPanelProvider
1+
com.tlcsdm.qe.provider.QeCenterPanelProvider

‎qe/src/main/resources/META-INF/services/com.tlcsdm.frame.service.FXSamplerConfiguration

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,2 @@
1-
#
2-
# Copyright (c) 2019, 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
281
com.tlcsdm.qe.provider.QeConfigurationProvider
29-
com.tlcsdm.qe.skin.NordLightSkin
2+
com.tlcsdm.qe.skin.NordLightSkin

‎qe/src/main/resources/META-INF/services/com.tlcsdm.frame.service.FXSamplerProject

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,2 @@
1-
#
2-
# Copyright (c) 2019, 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
28-
com.tlcsdm.qe.provider.QeSamplerProjectProvider
1+
com.tlcsdm.qe.provider.QeSamplerProjectProvider
2+
com.tlcsdm.jfxcommon.provider.CommonSamplerProjectProvider

‎qe/src/main/resources/META-INF/services/com.tlcsdm.frame.service.MenubarConfigration

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1 @@
1-
#
2-
# Copyright (c) 2019, 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
28-
com.tlcsdm.qe.provider.QeMenubarConfigrationProvider
1+
com.tlcsdm.qe.provider.QeMenubarConfigrationProvider

‎qe/src/main/resources/META-INF/services/com.tlcsdm.frame.service.SamplePostProcessorService

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1 @@
1-
#
2-
# Copyright (c) 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
281
com.tlcsdm.qe.provider.QeSamplePostProcessorProvider

‎qe/src/main/resources/META-INF/services/com.tlcsdm.frame.service.SamplesTreeViewConfiguration

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1 @@
1-
#
2-
# Copyright (c) 2019, 2023 unknowIfGuestInDream
3-
# All rights reserved.
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
# * Redistributions of source code must retain the above copyright
8-
# notice, this list of conditions and the following disclaimer.
9-
# * Redistributions in binary form must reproduce the above copyright
10-
# notice, this list of conditions and the following disclaimer in the
11-
# documentation and/or other materials provided with the distribution.
12-
# * Neither the name of unknowIfGuestInDream, any associated website, nor the
13-
# names of its contributors may be used to endorse or promote products
14-
# derived from this software without specific prior written permission.
15-
#
16-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
# DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY
20-
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21-
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22-
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
#
27-
28-
com.tlcsdm.qe.provider.QeSampleTreeViewConfiguration
1+
com.tlcsdm.qe.provider.QeSampleTreeViewConfiguration

0 commit comments

Comments
 (0)