Skip to content

Commit c59db3f

Browse files
committed
Improve dependency version management
1 parent cb3096d commit c59db3f

16 files changed

Lines changed: 135 additions & 117 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ module, it relays the access further to the target module using `Module.addOpens
384384
configuration will open `java.time` from `java.base` to Gson:
385385

386386
```xml
387-
<Module groupId="com.google.code.gson" artifactId="gson" version="${gson.version}">
387+
<Module groupId="com.google.code.gson" artifactId="gson" version="${bom.gson.version}">
388388
<Directives>
389389
<Directive type="requestsOpen" layer="alpha-framework:${project.version}" module="java.base" package="java.time"/>
390390
</Directives>

alpha-assembly/alpha-assembly-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-plugin-plugin</artifactId>
67-
<version>3.15.2</version>
67+
<version>${maven.plugin.version}</version>
6868
</plugin>
6969
</plugins>
7070
</build>

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/cli-config.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
<Modules>
99
<!--### TOOLS ###-->
10-
<Module groupId="org.jline" artifactId="jline" version="${jline.version}" nativeAccessEnabled="true"/>
11-
<Module groupId="de.vandermeer" artifactId="asciitable" version="${asciitable.version}"/>
12-
<Module groupId="de.vandermeer" artifactId="skb-interfaces" version="${skb-interfaces.version}"/>
10+
<Module groupId="org.jline" artifactId="jline" version="${bom.jline.version}" nativeAccessEnabled="true"/>
11+
<Module groupId="de.vandermeer" artifactId="asciitable" version="${bom.asciitable.version}"/>
12+
<Module groupId="de.vandermeer" artifactId="skb-interfaces" version="${bom.skb-interfaces.version}"/>
1313
<Module groupId="de.vandermeer" artifactId="ascii-utf-themes" version="${ascii.themes.version}"/>
14-
<Module groupId="org.antlr" artifactId="ST4" version="${st4.version}"/>
14+
<Module groupId="org.antlr" artifactId="ST4" version="${bom.st4.version}"/>
1515
<Module groupId="org.apache.commons" artifactId="commons-lang3" version="${commons.lang.version}"/>
16-
<Module groupId="com.techsenger.toolkit" artifactId="toolkit-ascii" version="${toolkit.version}"/>
17-
<Module groupId="com.techsenger.toolkit" artifactId="toolkit-http" version="${toolkit.version}"/>
18-
<Module groupId="com.beust" artifactId="jcommander" version="${jcommander.version}"/>
19-
<Module groupId="com.google.code.gson" artifactId="gson" version="${gson.version}">
16+
<Module groupId="com.techsenger.toolkit" artifactId="toolkit-ascii" version="${bom.toolkit.version}"/>
17+
<Module groupId="com.techsenger.toolkit" artifactId="toolkit-http" version="${bom.toolkit.version}"/>
18+
<Module groupId="com.beust" artifactId="jcommander" version="${bom.jcommander.version}"/>
19+
<Module groupId="com.google.code.gson" artifactId="gson" version="${bom.gson.version}">
2020
<!--
2121
Gson requires reflective access to java.time classes for serialization/deserialization.
2222
Since java.base is in the boot layer and JPMS does not provide access to the boot layer
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
org.slf4j:slf4j-api:${slf4j.version}
1+
org.slf4j:slf4j-api:${bom.slf4j.version}
22
commons-logging:commons-logging:${commons.logging.version}
3-
org.apache.logging.log4j:log4j-core:${log4j.version}
4-
org.apache.logging.log4j:log4j-jul:${log4j.version}
5-
org.apache.logging.log4j:log4j-api:${log4j.version}
6-
org.apache.logging.log4j:log4j-jcl:${log4j.version}
7-
org.apache.logging.log4j:log4j-slf4j2-impl:${log4j.version}
8-
org.fusesource.jansi:jansi:${jansi.version}
9-
jakarta.el:jakarta.el-api:${el.version}
10-
org.glassfish.expressly:expressly:${el.version}
11-
com.techsenger.toolkit:toolkit-core:${toolkit.version}
3+
org.apache.logging.log4j:log4j-core:${bom.log4j.version}
4+
org.apache.logging.log4j:log4j-jul:${bom.log4j.version}
5+
org.apache.logging.log4j:log4j-api:${bom.log4j.version}
6+
org.apache.logging.log4j:log4j-jcl:${bom.log4j.version}
7+
org.apache.logging.log4j:log4j-slf4j2-impl:${bom.log4j.version}
8+
org.fusesource.jansi:jansi:${bom.jansi.version}
9+
jakarta.el:jakarta.el-api:${bom.el.version}
10+
org.glassfish.expressly:expressly:${bom.el.version}
11+
com.techsenger.toolkit:toolkit-core:${bom.toolkit.version}
1212
com.techsenger.alpha:alpha-core:${project.version}
1313

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/framework.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ java -agentlib:jdwp=transport=dt_socket,address=7700,server=y,suspend=n ^
2424
-Dcom.techsenger.alpha.core.root.path=%ROOT_PATH% ^
2525
-Djava.net.preferIPv4Stack=true ^
2626
-Djava.io.tmpdir=%ROOT_PATH%\temp ^
27-
-Djna.tmpdir=%ROOT_PATH%\temp ^
2827
-Dfile.encoding=UTF-8 ^
2928
--add-modules ALL-DEFAULT ^
3029
--add-modules org.apache.logging.log4j,org.apache.logging.log4j.jul ^
3130
--add-opens java.base/java.time=com.techsenger.alpha.core ^
3231
--add-opens java.base/java.lang=com.techsenger.alpha.core ^
32+
--enable-native-access=com.techsenger.alpha.core ^
3333
--module-path !MODULE_PATH! ^
3434
-m ${mainClass}

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/framework.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ java -agentlib:jdwp=transport=dt_socket,address=7700,server=y,suspend=n \
2525
-Dcom.techsenger.alpha.core.root.path="$ROOT_PATH" \
2626
-Djava.net.preferIPv4Stack=true \
2727
-Djava.io.tmpdir="$ROOT_PATH/temp" \
28-
-Djna.tmpdir="$ROOT_PATH/temp" \
2928
-Dfile.encoding=UTF-8 \
3029
--add-modules ALL-DEFAULT \
3130
--add-modules org.apache.logging.log4j,org.apache.logging.log4j.jul \
3231
--add-opens java.base/java.time=com.techsenger.alpha.core \
3332
--add-opens java.base/java.lang=com.techsenger.alpha.core \
33+
--enable-native-access=com.techsenger.alpha.core \
3434
--module-path "$MODULE_PATH" \
3535
-m ${mainClass}

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/repo-config.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
<Module groupId="com.techsenger.alpha.repo" artifactId="alpha-repo-external" version="${project.version}"/>
2020

2121
<!--### MAVEN-RESOLVER ###-->
22-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-api" version="${maven.resolver.version}"/>
23-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-connector-basic" version="${maven.resolver.version}"/>
24-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-impl" version="${maven.resolver.version}"/>
25-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-spi" version="${maven.resolver.version}"/>
26-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-transport-file" version="${maven.resolver.version}"/>
27-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-transport-http" version="${maven.resolver.version}"/>
28-
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-util" version="${maven.resolver.version}"/>
22+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-api" version="${bom.maven.resolver.version}"/>
23+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-connector-basic" version="${bom.maven.resolver.version}"/>
24+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-impl" version="${bom.maven.resolver.version}"/>
25+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-spi" version="${bom.maven.resolver.version}"/>
26+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-transport-file" version="${bom.maven.resolver.version}"/>
27+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-transport-http" version="${bom.maven.resolver.version}"/>
28+
<Module groupId="org.apache.maven.resolver" artifactId="maven-resolver-util" version="${bom.maven.resolver.version}"/>
2929

3030
<!--### REPOSIUM ###-->
31-
<Module groupId="com.techsenger.reposium" artifactId="reposium-core" version="${reposium.version}"/>
31+
<Module groupId="com.techsenger.reposium" artifactId="reposium-core" version="${bom.reposium.version}"/>
3232

3333
<!--### ALPHA ###-->
3434
<Module groupId="com.techsenger.alpha.repo" artifactId="alpha-repo-core" version="${project.version}" active="true"/>

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/repo-modules.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ org.apache.commons:commons-lang3:${commons.lang.version}
77
commons-logging:commons-logging:${commons.logging.version}
88
org.apache.maven:maven-resolver-provider:${mvn.version}
99
com.techsenger.alpha.repo:alpha-repo-external:${project.version}
10-
org.apache.maven.resolver:maven-resolver-api:${maven.resolver.version}
11-
org.apache.maven.resolver:maven-resolver-connector-basic:${maven.resolver.version}
12-
org.apache.maven.resolver:maven-resolver-impl:${maven.resolver.version}
13-
org.apache.maven.resolver:maven-resolver-spi:${maven.resolver.version}
14-
org.apache.maven.resolver:maven-resolver-transport-file:${maven.resolver.version}
15-
org.apache.maven.resolver:maven-resolver-transport-http:${maven.resolver.version}
16-
org.apache.maven.resolver:maven-resolver-util:${maven.resolver.version}
17-
com.techsenger.reposium:reposium-core:${reposium.version}
10+
org.apache.maven.resolver:maven-resolver-api:${bom.maven.resolver.version}
11+
org.apache.maven.resolver:maven-resolver-connector-basic:${bom.maven.resolver.version}
12+
org.apache.maven.resolver:maven-resolver-impl:${bom.maven.resolver.version}
13+
org.apache.maven.resolver:maven-resolver-spi:${bom.maven.resolver.version}
14+
org.apache.maven.resolver:maven-resolver-transport-file:${bom.maven.resolver.version}
15+
org.apache.maven.resolver:maven-resolver-transport-http:${bom.maven.resolver.version}
16+
org.apache.maven.resolver:maven-resolver-util:${bom.maven.resolver.version}
17+
com.techsenger.reposium:reposium-core:${bom.reposium.version}
1818
com.techsenger.alpha.repo:alpha-repo-core:${project.version}

alpha-assembly/alpha-assembly-maven-plugin/src/main/resources/com/techsenger/alpha/assembly/maven/plugin/server-config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<Modules>
99
<!--### TOOLS ###-->
10-
<Module groupId="com.google.code.gson" artifactId="gson" version="${gson.version}">
10+
<Module groupId="com.google.code.gson" artifactId="gson" version="${bom.gson.version}">
1111
<!--
1212
Gson requires reflective access to java.time classes for serialization/deserialization.
1313
Since java.base is in the boot layer and JPMS does not provide access to the boot layer
@@ -23,7 +23,7 @@
2323
<!--### ALPHA ###-->
2424
<Module groupId="com.techsenger.alpha.net" artifactId="alpha-net-shared" version="${project.version}"/>
2525
<Module groupId="com.techsenger.alpha.net" artifactId="alpha-net-server" version="${project.version}" active="true"/>
26-
<Module groupId="com.techsenger.toolkit" artifactId="toolkit-http" version="${toolkit.version}"/>
26+
<Module groupId="com.techsenger.toolkit" artifactId="toolkit-http" version="${bom.toolkit.version}"/>
2727

2828
<!-- SECURITY CONTEXT FACTORY STUB! DON'T USE IN PRODUCTION! TESTS AND DEMO PURPOSES ONLY! -->
2929
<Module groupId="com.techsenger.alpha.assembly" artifactId="alpha-assembly-security" version="${project.version}"/>

alpha-demo/alpha-demo-cli/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,6 @@
9494
</execution>
9595
</executions>
9696
</plugin>
97-
<plugin>
98-
<groupId>org.codehaus.mojo</groupId>
99-
<artifactId>exec-maven-plugin</artifactId>
100-
<configuration>
101-
<executable>java</executable>
102-
<arguments>
103-
<argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:7700</argument>
104-
<argument>-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager</argument>
105-
<argument>-Dorg.jboss.logging.provider=log4j</argument>
106-
<argument>--module-path</argument>
107-
<modulepath/> <!-- placeholder that automatically resolves and injects the module path -->
108-
<argument>--module</argument>
109-
<argument>com.techsenger.alpha.demo.cli/com.techsenger.alpha.demo.cli.Demo</argument>
110-
</arguments>
111-
</configuration>
112-
</plugin>
11397
</plugins>
11498
</build>
11599
</project>

0 commit comments

Comments
 (0)