Skip to content

Commit

Permalink
Update some maven plugin versions. Update github build.
Browse files Browse the repository at this point in the history
Fix build-all script.
  • Loading branch information
bengtmartensson committed Mar 12, 2024
1 parent 1313006 commit 9d45825
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
with:
java-version: '8'
distribution: 'adopt'
- name: Build IrpTransmogrifier
run: ./common/scripts/build-harctoolbox-project.sh IrpTransmogrifier
- name: Build Girr
run: ./common/scripts/build-harctoolbox-project.sh Girr
- name: Build Jirc
run: ./common/scripts/build-harctoolbox-project.sh Jirc
# - name: Build IrpTransmogrifier
# run: ./common/scripts/build-harctoolbox-project.sh IrpTransmogrifier
# - name: Build Girr
# run: ./common/scripts/build-harctoolbox-project.sh Girr
# - name: Build Jirc
# run: ./common/scripts/build-harctoolbox-project.sh Jirc
- name: Build RemoteLocator
run: ./common/scripts/build-harctoolbox-project.sh RemoteLocator
- name: Build HarcHardware
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>create-windows-jre</id>
Expand Down Expand Up @@ -105,7 +105,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>make-appimage</id>
Expand Down Expand Up @@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.7.0</version>
<version>3.1.0</version>
<configuration>
<resourceBundles>
<resourceBundle>${project.groupId}:IrpTransmogrifier:${IrpTransmogrifier.version}</resourceBundle>
Expand All @@ -157,7 +157,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -299,7 +299,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<executions>
<execution>
<!-- FIRST, make the fat jar, and NOT the *-bin.zip -->
Expand Down Expand Up @@ -353,15 +353,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.12.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.5.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down Expand Up @@ -481,7 +481,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>sillify docs</id>
Expand Down Expand Up @@ -676,7 +676,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.5.1</version>
<version>7.9.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
3 changes: 2 additions & 1 deletion tools/build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ done

for proj in ${SUBPROJECTS} ; do
(cd $proj ; \
xpath -e "/project/version/text()" -q pom.xml )
xsltproc common/xslt/extract_project_version.xsl pom.xml ;
echo "" )
done

0 comments on commit 9d45825

Please sign in to comment.