Skip to content

Commit

Permalink
Maven clean up:
Browse files Browse the repository at this point in the history 
Removes jdoc, mvn:site (not needed nor useful)
Moves from assembly plugin to maven shade plugin for core, consumption and viewer (Improves mvn install by 50% per module and reduces output)
  • Loading branch information
@rgerm
rgerm committed Aug 26, 2018
1 parent 00ce8ea commit 8aebfe4
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 177 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ out/
logs/
classes/

# maven
dependency-reduced-pom.xml

# Log file
*.log

Expand Down
24 changes: 1 addition & 23 deletions common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,6 @@
<version>2.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!--<version></version>-->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

60 changes: 33 additions & 27 deletions consumption/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,39 @@
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- <version> </version> -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.movsim.consumption.ConsumptionMain</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.movsim.MovsimCoreMain</Main-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

62 changes: 34 additions & 28 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,39 @@
<version>0.8.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- <version> </version> -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.movsim.MovsimCoreMain</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.movsim.MovsimCoreMain</Main-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

27 changes: 0 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<projectVersion>${project.version}</projectVersion>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
<!-- dependency version -->
<jdom.version>2.0.2</jdom.version>
Expand Down Expand Up @@ -105,16 +104,6 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<plugin>
<!-- execution: mvn javadoc:javadoc -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<show>private</show>
<nohelp>true</nohelp>
</configuration>
</plugin>
<plugin>
<!-- mvn findbugs:findbugs -->
<!-- mvn findbugs:gui -->
Expand Down Expand Up @@ -145,12 +134,6 @@
<artifactId>log4j-core</artifactId>
<version>2.11.0</version>
</dependency>
<!--<dependency>-->
<!--<groupId>log4j</groupId>-->
<!--<artifactId>log4j</artifactId>-->
<!--<version>1.2.16</version>-->
<!--<type>jar</type>-->
<!--</dependency>-->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down Expand Up @@ -210,15 +193,5 @@
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<!-- mvn site -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
</plugin>
</plugins>
</reporting>
</project>

104 changes: 56 additions & 48 deletions viewer/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,60 @@
<?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.movsim</groupId>
<artifactId>Movsim</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
<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.movsim</groupId>
<artifactId>Movsim</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>

<artifactId>MovsimViewer</artifactId>
<packaging>jar</packaging>
<name>MovsimViewer</name>
<description>Graphical user interface and visualization frontend to movsim core.</description>

<dependencies>
<dependency>
<groupId>org.movsim</groupId>
<artifactId>MovsimCore</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.movsim.viewer.App</Main-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<artifactId>MovsimViewer</artifactId>
<packaging>jar</packaging>
<name>MovsimViewer</name>
<description>Graphical user interface and visualization frontend to movsim core.</description>

<dependencies>
<dependency>
<groupId>org.movsim</groupId>
<artifactId>MovsimCore</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- <version> </version> -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.movsim.viewer.App</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

24 changes: 0 additions & 24 deletions xsd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,30 +131,6 @@
</execution>
</executions>
</plugin>
<!-- build executable jar with all dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!-- <version> </version> -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<!-- <manifest>
<mainClass>org.movsim.MovsimCoreMain</mainClass>
</manifest> -->
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Expand Down

0 comments on commit 8aebfe4

Please sign in to comment.