Skip to content

Commit

Permalink
Update the version and fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsuki31 authored Jun 13, 2023
1 parent c2dd884 commit 3115ae0
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<package.version.core>1.0.0</package.version.core>
<package.mainClass>com.mitsuki.jmatrix.Main</package.mainClass>
<package.releaseType>beta</package.releaseType>
<package.betaNum>6</package.betaNum>
<package.betaNum>7</package.betaNum>

<!-- Encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -34,7 +34,24 @@
<groupId>com.mitsuki</groupId>
<artifactId>jmatrix</artifactId>
<packaging>jar</packaging>
<version>1.0.0-beta.6</version>
<version>1.0.0-beta.7</version>

<profiles>
<!--
This profile will include all source files while packaging
Use it for packaging with command `mvn package -P include-src`
-->
<profile>
<id>include-src</id>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
</resource>
</resources>
</build>
</profile>
</profiles>

<build>
<resources>
Expand Down Expand Up @@ -116,12 +133,6 @@
<Manifest-Version>1.2</Manifest-Version>
</manifestEntries>
</archive>
<includes>
<include>**/*.class</include>
<include>LICENSE</include>
<include>**/*.content</include>
<include>**/*.xml</include>
</includes>
</configuration>
</plugin>

Expand Down

0 comments on commit 3115ae0

Please sign in to comment.