Skip to content

Commit

Permalink
update pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
rakow committed Dec 6, 2023
1 parent 387791d commit d830bf0
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:
run: mvn -B package --file pom.xml -Dmatsim.preferLocalDtds=true -Dmaven.javadoc.skip -e

env:
MAVEN_OPTS: -Xmx10G
MAVEN_OPTS: -Xmx512m
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

env:
MAVEN_OPTS: -Xmx10G
MAVEN_OPTS: -Xmx512m
29 changes: 24 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.matsim-scenarios</groupId>
<artifactId>matsim-gladbeck</artifactId>
<version>1.0</version>
<version>2.0-SNAPSHOT</version>

<name>MATSim Gladbeck project</name>
<description>MATSim Gladbeck project</description>
Expand Down Expand Up @@ -183,12 +183,31 @@
<configuration>
<forkMode>once</forkMode>
<!-- avoid out of memory errors: -->
<argLine>-Xmx9500m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true</argLine>
<argLine>-Xmx6500m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true</argLine>
<!--necessary in tu berlin gitlab. BUT not good in other places, so solve by command line switch only where needed. kai, nov'18-->
<!--<useSystemClassLoader>false</useSystemClassLoader>-->
</configuration>
</plugin>

<!-- Fetch Git information -->
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>5.0.0</version>
<executions>
<execution>
<id>get-the-git-infos</id>
<goals>
<goal>revision</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
<configuration>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -200,19 +219,19 @@
<goal>shade</goal>
</goals>
<configuration>
<outputFile>${project.basedir}/${project.build.finalName}.jar</outputFile>
<outputFile>${project.basedir}/${project.build.finalName}-${git.commit.id.describe-short}.jar</outputFile>
<transformers>
<!-- This bit sets the main class for the executable jar as you otherwise would with the assembly plugin -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.matsim.run.RunGladbeckScenario</mainClass>
<manifestEntries>
<Main-Class>org.matsim.run.RunGladbeckScenario</Main-Class>
<Specification-Vendor>org.matsim</Specification-Vendor>
<Implementation-Vendor>org.matsim</Implementation-Vendor>
<Implementation-Version>${project.version}</Implementation-Version>
<SCM-Revision>${git.commit.id.describe-short}</SCM-Revision>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</transformer>
<!-- This bit merges the various GeoTools META-INF/services files -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<filters>
Expand Down

0 comments on commit d830bf0

Please sign in to comment.