Issue #1600
This commit is contained in:
parent
0bee599d29
commit
3296c01e8e
|
@ -240,33 +240,6 @@
|
||||||
<outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
|
<outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
||||||
<execution>
|
|
||||||
<id>copy-jta-deps</id>
|
|
||||||
<phase>generate-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy-dependencies</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<includeGroupIds>javax.transaction</includeGroupIds>
|
|
||||||
<includeArtifactIds>javax.transaction-api</includeArtifactIds>
|
|
||||||
<includeTypes>jar</includeTypes>
|
|
||||||
<outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>copy-jndi-deps</id>
|
|
||||||
<phase>generate-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy-dependencies</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
|
|
||||||
<includeArtifactIds>javax.mail.glassfish</includeArtifactIds>
|
|
||||||
<includeTypes>jar</includeTypes>
|
|
||||||
<outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
<execution>
|
||||||
<id>copy-apache-jsp-deps</id>
|
<id>copy-apache-jsp-deps</id>
|
||||||
<phase>generate-resources</phase>
|
<phase>generate-resources</phase>
|
||||||
|
|
|
@ -24,6 +24,23 @@
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>single</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<descriptors>
|
||||||
|
<descriptor>src/main/assembly/config.xml</descriptor>
|
||||||
|
</descriptors>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>findbugs-maven-plugin</artifactId>
|
<artifactId>findbugs-maven-plugin</artifactId>
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<assembly>
|
||||||
|
<id>config</id>
|
||||||
|
<includeBaseDirectory>false</includeBaseDirectory>
|
||||||
|
<formats>
|
||||||
|
<format>jar</format>
|
||||||
|
</formats>
|
||||||
|
<dependencySets>
|
||||||
|
<dependencySet>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<outputDirectory>lib/mail</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>org.eclipse.jetty.orbit:javax.mail.glassfish</include>
|
||||||
|
</includes>
|
||||||
|
</dependencySet>
|
||||||
|
</dependencySets>
|
||||||
|
<fileSets>
|
||||||
|
<fileSet>
|
||||||
|
<directory>src/main/jndi-config</directory>
|
||||||
|
<outputDirectory></outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>**</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
|
</fileSets>
|
||||||
|
</assembly>
|
||||||
|
|
|
@ -3,6 +3,7 @@ Adds the Jetty JNDI implementation to the classpath.
|
||||||
|
|
||||||
[depend]
|
[depend]
|
||||||
server
|
server
|
||||||
|
mail
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
lib/jetty-jndi-${jetty.version}.jar
|
lib/jetty-jndi-${jetty.version}.jar
|
|
@ -0,0 +1,8 @@
|
||||||
|
[description]
|
||||||
|
Adds the javax.mail implementation to the classpath.
|
||||||
|
|
||||||
|
[name]
|
||||||
|
mail
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
lib/mail/*.jar
|
|
@ -73,6 +73,23 @@
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>single</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<descriptors>
|
||||||
|
<descriptor>src/main/assembly/config.xml</descriptor>
|
||||||
|
</descriptors>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>findbugs-maven-plugin</artifactId>
|
<artifactId>findbugs-maven-plugin</artifactId>
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<assembly>
|
||||||
|
<id>config</id>
|
||||||
|
<includeBaseDirectory>false</includeBaseDirectory>
|
||||||
|
<formats>
|
||||||
|
<format>jar</format>
|
||||||
|
</formats>
|
||||||
|
<dependencySets>
|
||||||
|
<dependencySet>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<outputDirectory>lib/transactions</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>javax.transaction:javax.transaction-api</include>
|
||||||
|
</includes>
|
||||||
|
</dependencySet>
|
||||||
|
</dependencySets>
|
||||||
|
<fileSets>
|
||||||
|
<fileSet>
|
||||||
|
<directory>src/main/plus-config</directory>
|
||||||
|
<outputDirectory></outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>**</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
|
</fileSets>
|
||||||
|
</assembly>
|
||||||
|
|
|
@ -8,6 +8,7 @@ server
|
||||||
security
|
security
|
||||||
jndi
|
jndi
|
||||||
webapp
|
webapp
|
||||||
|
transactions
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
lib/jetty-plus-${jetty.version}.jar
|
lib/jetty-plus-${jetty.version}.jar
|
|
@ -0,0 +1,8 @@
|
||||||
|
[description]
|
||||||
|
Puts javax.transaction api on the classpath
|
||||||
|
|
||||||
|
[name]
|
||||||
|
transactions
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
lib/transactions/*.jar
|
|
@ -61,15 +61,6 @@
|
||||||
<overWrite>true</overWrite>
|
<overWrite>true</overWrite>
|
||||||
<outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
|
<outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
<artifactItem>
|
|
||||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
|
||||||
<artifactId>javax.mail.glassfish</artifactId>
|
|
||||||
<version>1.4.1.v201005082020</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<includes>**</includes>
|
|
||||||
<overWrite>true</overWrite>
|
|
||||||
<outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
|
|
||||||
</artifactItem>
|
|
||||||
</artifactItems>
|
</artifactItems>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
Loading…
Reference in New Issue