Skip to content

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@charphi
charphi committed Feb 23, 2024
1 parent 7826e44 commit 72c2ef1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 14 deletions.
15 changes: 15 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,21 @@
<artifactId>jreleaser-maven-plugin</artifactId>
<version>1.10.0</version>
</plugin>
<plugin>
<groupId>org.jreleaser</groupId>
<artifactId>jdks-maven-plugin</artifactId>
<version>1.10.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.8.1</version>
</plugin>
<!-- Experimental plugins -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
Expand Down
25 changes: 11 additions & 14 deletions sandbox-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.8.1</version>
<executions>
<execution>
<id>download-hugo-theme</id>
Expand Down Expand Up @@ -146,7 +145,7 @@
</properties>
<build>
<plugins>
<!-- Extract changelog for release -->
<!-- Extract changelog -->
<plugin>
<groupId>com.github.nbbrd.heylogs</groupId>
<artifactId>heylogs-maven-plugin</artifactId>
Expand All @@ -168,50 +167,49 @@
<plugin>
<groupId>org.jreleaser</groupId>
<artifactId>jdks-maven-plugin</artifactId>
<version>1.10.0</version>
<executions>
<execution>
<id>download-windows-jre</id>
<id>download-jre</id>
<phase>process-resources</phase>
<goals>
<goal>setup-disco</goal>
</goals>
<configuration>
<pkgs>
<pkg>
<name>temurin-windows-x86_64</name>
<name>jdk-windows-x86_64</name>
<distribution>temurin</distribution>
<platform>windows-x86_64</platform>
<version>${java.bundled.version}</version>
<packageType>jre</packageType>
<archiveType>zip</archiveType>
</pkg>
<pkg>
<name>temurin-linux-x86_64</name>
<name>jdk-linux-x86_64</name>
<distribution>temurin</distribution>
<platform>linux-x86_64</platform>
<version>${java.bundled.version}</version>
<packageType>jre</packageType>
<archiveType>tar.gz</archiveType>
</pkg>
<pkg>
<name>temurin-linux-aarch_64</name>
<name>jdk-linux-aarch_64</name>
<distribution>temurin</distribution>
<platform>linux-aarch64</platform>
<version>${java.bundled.version}</version>
<packageType>jre</packageType>
<archiveType>tar.gz</archiveType>
</pkg>
<pkg>
<name>temurin-osx-x86_64</name>
<name>jdk-osx-x86_64</name>
<distribution>temurin</distribution>
<platform>osx-x86_64</platform>
<version>${java.bundled.version}</version>
<packageType>jre</packageType>
<archiveType>tar.gz</archiveType>
</pkg>
<pkg>
<name>temurin-osx-aarch_64</name>
<name>jdk-osx-aarch_64</name>
<distribution>temurin</distribution>
<platform>osx-aarch64</platform>
<version>${java.bundled.version}</version>
Expand All @@ -229,7 +227,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>pack-desktop-binaries</id>
Expand All @@ -247,11 +244,11 @@
<attribute name="extension"/>
<attribute name="dir"/>
<sequential>
<echo message="Bundling jdemetra for @{platform}" level="info"/>
<pathconvert property="temurin.@{platform}">
<echo message="Bundling @{platform}" level="info"/>
<pathconvert property="jdk.@{platform}">
<first>
<fileset
dir="${project.build.directory}/jdks/temurin-@{platform}"/>
dir="${project.build.directory}/jdks/jdk-@{platform}"/>
</first>
</pathconvert>
<ant antfile="${project.basedir}/src/antrun/bundle-netbeans.xml">
Expand All @@ -260,7 +257,7 @@
<property name="x.bundleOutput"
value="${project.build.directory}/sandbox-netbeans-standalone-${project.version}-@{platform}.zip"/>
<property name="x.branding" value="sandboxnetbeans"/>
<property name="x.jdkArchive" value="${temurin.@{platform}}"/>
<property name="x.jdkArchive" value="${jdk.@{platform}}"/>
<property name="x.jdkDirectory" value="@{dir}"/>
<target name="bundle.@{extension}"/>
</ant>
Expand Down

0 comments on commit 72c2ef1

Please sign in to comment.