fix assembly conf

This commit is contained in:
Chris Frohoff
2024-03-30 18:49:26 -07:00
parent ac3d16bbd9
commit 2298d942e6
+91 -89
View File
@@ -25,9 +25,9 @@
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
<!-- ignore noisy internal api warnings --> <!-- ignore noisy internal api warnings -->
<compilerArgument>-XDignore.symbol.file</compilerArgument> <compilerArgument>-XDignore.symbol.file</compilerArgument>
<fork>true</fork> <fork>true</fork>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@@ -39,8 +39,10 @@
<mainClass>ysoserial.GeneratePayload</mainClass> <mainClass>ysoserial.GeneratePayload</mainClass>
</manifest> </manifest>
</archive> </archive>
<descriptor>assembly.xml</descriptor> <descriptors>
</configuration> <descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
<executions> <executions>
<execution> <execution>
<id>make-assembly</id> <id>make-assembly</id>
@@ -52,16 +54,16 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M1</version> <version>3.0.0-M1</version>
<configuration> <configuration>
<trimStackTrace>false</trimStackTrace> <trimStackTrace>false</trimStackTrace>
<systemPropertyVariables> <systemPropertyVariables>
<java.rmi.server.useCodebaseOnly>false</java.rmi.server.useCodebaseOnly> <java.rmi.server.useCodebaseOnly>false</java.rmi.server.useCodebaseOnly>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -141,11 +143,11 @@
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.9</version> <version>1.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>remoting</artifactId> <artifactId>remoting</artifactId>
<groupId>org.jenkins-ci.main</groupId> <groupId>org.jenkins-ci.main</groupId>
@@ -246,7 +248,7 @@
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.3</version> <version>1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.wicket</groupId> <groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId> <artifactId>wicket-util</artifactId>
<version>6.23.0</version> <version>6.23.0</version>
@@ -276,11 +278,11 @@
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.python</groupId> <groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId> <artifactId>jython-standalone</artifactId>
<version>2.5.2</version> <version>2.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>rhino</groupId> <groupId>rhino</groupId>
<artifactId>js</artifactId> <artifactId>js</artifactId>
@@ -321,11 +323,11 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.21</version> <version>1.7.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId> <artifactId>slf4j-jdk14</artifactId>
<version>1.7.21</version> <version>1.7.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.clojure</groupId> <groupId>org.clojure</groupId>
<artifactId>clojure</artifactId> <artifactId>clojure</artifactId>
@@ -336,55 +338,55 @@
<artifactId>vaadin-server</artifactId> <artifactId>vaadin-server</artifactId>
<version>7.7.14</version> <version>7.7.14</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.9.5</version> <version>1.9.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.click</groupId> <groupId>org.apache.click</groupId>
<artifactId>click-nodeps</artifactId> <artifactId>click-nodeps</artifactId>
<version>2.3.0</version> <version>2.3.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>jdk6</id> <id>jdk6</id>
<activation> <activation>
<jdk>1.6</jdk> <jdk>1.6</jdk>
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version> <version>2.22.1</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.el</groupId> <groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId> <artifactId>javax.el-api</artifactId>
<version>3.0.0</version> <version>3.0.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for non-overlapping TLS versions in JDK6 and central repo <!-- workaround for non-overlapping TLS versions in JDK6 and central repo
https://central.sonatype.org/articles/2018/May/04/discontinued-support-for-tlsv11-and-below/ --> https://central.sonatype.org/articles/2018/May/04/discontinued-support-for-tlsv11-and-below/ -->
<repositories> <repositories>
<repository> <repository>
<id>repo1</id> <id>repo1</id>
<url>http://repo1.maven.org/maven2</url><!-- intentionally http (see above) --> <url>http://repo1.maven.org/maven2</url><!-- intentionally http (see above) -->
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>repo1</id> <id>repo1</id>
<url>http://repo1.maven.org/maven2</url><!-- intentionally http (see above) --> <url>http://repo1.maven.org/maven2</url><!-- intentionally http (see above) -->
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</profile> </profile>
<profile> <profile>
<id>hibernate5</id> <id>hibernate5</id>
@@ -399,11 +401,11 @@
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>5.0.7.Final</version> <version>5.0.7.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.el</groupId> <groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId> <artifactId>javax.el-api</artifactId>
<version>3.0.0</version> <version>3.0.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
@@ -448,11 +450,11 @@
</profile> </profile>
</profiles> </profiles>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>github</id> <id>github</id>
<name>GitHub Packages</name> <name>GitHub Packages</name>
<url>https://maven.pkg.github.com/frohoff/ysoserial</url> <url>https://maven.pkg.github.com/frohoff/ysoserial</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
</project> </project>