diff options
| -rwxr-xr-x | dozentenmodul/pom.xml | 72 | ||||
| -rw-r--r-- | dozentenmodulserver/pom.xml | 57 |
2 files changed, 28 insertions, 101 deletions
diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml index e4cfa85f..bc73b103 100755 --- a/dozentenmodul/pom.xml +++ b/dozentenmodul/pom.xml @@ -79,6 +79,17 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>3.0.0</version> <executions> @@ -107,56 +118,6 @@ </descriptorRefs> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <minimizeJar>true</minimizeJar> - <filters> - <filter> - <artifact>commons-logging:*</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>org.lz4:*</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - <exclude>META-INF/maven/**</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>${main.class}</mainClass> - <manifestEntries> - <Build-Timestamp>${maven.build.timestamp}</Build-Timestamp> - <Build-Revision>${buildNumber}</Build-Revision> - <Build-Revision-Timestamp>${revision.timestamp}</Build-Revision-Timestamp> - </manifestEntries> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> </plugins> <resources> @@ -183,25 +144,22 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openslx.ecp</groupId> <artifactId>ecp-client-lean</artifactId> <version>0.0.3-SNAPSHOT</version> + <scope>compile</scope> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>2.9.9</version> + <scope>compile</scope> </dependency> <dependency> <groupId>com.github.decbin</groupId> <artifactId>JDatePicker</artifactId> <version>af657d4d12645efa2eb211d780779e4712d94673</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.openslx</groupId> @@ -213,6 +171,7 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>[4.5.3,4.5.99]</version> + <scope>compile</scope> </dependency> <dependency> <groupId>commons-io</groupId> @@ -224,6 +183,7 @@ <groupId>org.kamranzafar</groupId> <artifactId>jtar</artifactId> <version>2.3</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml index ac41c772..08be1a2d 100644 --- a/dozentenmodulserver/pom.xml +++ b/dozentenmodulserver/pom.xml @@ -44,6 +44,17 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>default-jar</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>3.0.0</version> <executions> @@ -73,51 +84,6 @@ <useSystemClassLoader>false</useSystemClassLoader> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <minimizeJar>true</minimizeJar> - <filters> - <filter> - <artifact>mysql:*</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>org.lz4:*</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - <exclude>META-INF/maven/**</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>${main.class}</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -168,6 +134,7 @@ <groupId>org.kamranzafar</groupId> <artifactId>jtar</artifactId> <version>2.3</version> + <scope>compile</scope> </dependency> </dependencies> </project> |