Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1597 

Removed javax.mail and javax.transaction jars and tidied up dependencies for test webapps.
This commit is contained in:
Jan Bartel 2017-06-21 16:19:10 +02:00
parent 23c8e64fd8
commit 21b1ecef7b
13 changed files with 40 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jetty-home/pom.xml
View File

@ -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>
@ -397,10 +370,6 @@
</build> </build>
<dependencies> <dependencies>
<!-- Orbit Deps --> <!-- Orbit Deps -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>javax.security.auth.message</artifactId>
@ -410,10 +379,6 @@
<groupId>javax.annotation</groupId> <groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>javax.annotation-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>

27
jetty-jndi/src/main/assembly/config.xml
View File

@ -1,27 +0,0 @@
<?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
jetty-jndi/src/main/jndi-config/modules/jndi.mod → jetty-jndi/src/main/config/modules/jndi.mod
View File

@ -3,9 +3,6 @@ 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
lib/jndi/*.jar

8
jetty-jndi/src/main/jndi-config/modules/mail.mod
View File

@ -1,8 +0,0 @@
[description]
Adds the javax.mail implementation to the classpath.
[name]
mail
[lib]
lib/mail/*.jar

1
jetty-plus/pom.xml
View File

@ -60,6 +60,7 @@
<dependency> <dependency>
<groupId>javax.transaction</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId> <artifactId>javax.transaction-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

27
jetty-plus/src/main/assembly/config.xml
View File

@ -1,27 +0,0 @@
<?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>

0
jetty-plus/src/main/plus-config/etc/jetty-plus.xml → jetty-plus/src/main/config/etc/jetty-plus.xml
View File

12
jetty-plus/src/main/config/modules/plus.mod Normal file
View File

@ -0,0 +1,12 @@
[description]
Enables resource injection and other servlet 3.x
features not supported in the core jetty webapps module.
[depend]
server
security
jndi
webapp
[lib]
lib/jetty-plus-${jetty.version}.jar

14
jetty-plus/src/main/plus-config/modules/plus.mod
View File

@ -1,14 +0,0 @@
[description]
Enables JNDI and resource injection for webapplications
and other servlet 3.x features not supported in the core
jetty webapps module.
[depend]
server
security
jndi
webapp
transactions
[lib]
lib/jetty-plus-${jetty.version}.jar

8
jetty-plus/src/main/plus-config/modules/transactions.mod
View File

@ -1,8 +0,0 @@
[description]
Puts javax.transaction api on the classpath
[name]
transactions
[lib]
lib/transactions/*.jar

58
tests/test-webapps/test-jndi-webapp/pom.xml
View File

@ -51,30 +51,12 @@
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<artifactItems> <includeArtifactIds>javax.transaction-api,javax.mail.glassfish,test-mock-resources</includeArtifactIds>
<artifactItem> <outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
<groupId>org.eclipse.jetty.tests</groupId> </configuration>
<artifactId>test-mock-resources</artifactId>
<version>${project.version}</version>
<type>jar</type>
<includes>**</includes>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
</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>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -109,21 +91,27 @@
</webAppConfig> </webAppConfig>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty.tests</groupId> <groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-mock-resources</artifactId> <artifactId>test-mock-resources</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version> <version>1.4.1.v201005082020</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-mock-resources</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.transaction</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId> <artifactId>javax.transaction-api</artifactId>
@ -139,6 +127,12 @@
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version> <version>1.4.1.v201005082020</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

3
tests/test-webapps/test-mock-resources/pom.xml
View File

@ -52,17 +52,16 @@
<dependency> <dependency>
<groupId>javax.transaction</groupId> <groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId> <artifactId>javax.transaction-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId> <artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version> <version>1.4.1.v201005082020</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

5
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

@ -185,11 +185,6 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>