-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix versioning and add choral-standalone to the dist zip
- Loading branch information
Showing
9 changed files
with
142 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,93 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>distribution</artifactId> | ||
| <relativePath>../pom.xml</relativePath> | ||
| <version>1.0.0</version> | ||
| </parent> | ||
| <version>${choral.version}</version> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>Choral-zip</artifactId> | ||
| <version>0.1.2</version> | ||
| <artifactId>choral-zip</artifactId> | ||
| <url>${choral.url}</url> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <properties> | ||
| <choral.version>0.1.2</choral.version> | ||
| <choral.url>https://www.choral-lang.org/</choral.url> | ||
| </properties> | ||
| <!-- add zip with all the jars from the submodules --> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>base</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>choral</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>choral-unit</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>compare</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>runtime</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <!-- add zip with all the jars from the submodules --> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>base</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>choral</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>choral-unit</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>compare</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.choral-lang</groupId> | ||
| <artifactId>runtime</artifactId> | ||
| <version>${choral.version}</version> | ||
| <type>jar</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>make-bundles</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>assembly.xml</descriptor> | ||
| </descriptors> | ||
| <finalName>choral-${choral.version}</finalName> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>make-uberjar</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| <archive> | ||
| <manifest> | ||
| <mainClass>choral.Choral</mainClass> | ||
| </manifest> | ||
| </archive> | ||
| <!-- <finalName>choral-v${choral.version}-standalone</finalName> --> | ||
| <finalName>choral-standalone</finalName> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>make-bundles</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>assembly.xml</descriptor> | ||
| </descriptors> | ||
| <finalName>choral-${choral.version}</finalName> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>make-uberjar</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptorRefs> | ||
| <descriptorRef>jar-with-dependencies</descriptorRef> | ||
| </descriptorRefs> | ||
| <archive> | ||
| <manifest> | ||
| <mainClass>choral.Choral</mainClass> | ||
| </manifest> | ||
| </archive> | ||
| <!-- <finalName>choral-v${choral.version}-standalone</finalName> --> | ||
| <finalName>choral-standalone</finalName> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters