Skip to content

Commit

Permalink
simplify poms with inheritance
Browse files Browse the repository at this point in the history 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
  • Loading branch information
@olamy
olamy committed May 31, 2022
1 parent ab59636 commit b6239b2
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 421 deletions.
66 changes: 1 addition & 65 deletions jetty-ee8/jetty-ee8-jaas/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<description>Jetty JAAS support</description>

<properties>
<ee9.module>jetty-ee9-jaas</ee9.module>
<bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apache.directory.api.version>2.1.0</apache.directory.api.version>
Expand All @@ -19,71 +20,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-ee8-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-jaas/src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-ee8-test-resources</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-jaas/src/test/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-modify-sources-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-ee8-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-jaas/src/main/java</sourceProjectLocation>
<outputDirectory>${project.build.sourceDirectory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>generate-ee8-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<testSources>true</testSources>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-jaas/src/test/java</sourceProjectLocation>
<outputDirectory>${project.build.testSourceDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
with a snapshot. -->
<plugin>
Expand Down
66 changes: 1 addition & 65 deletions jetty-ee8/jetty-ee8-nested/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,77 +11,13 @@
<description>The jetty core handler adapted to legacy ee8 handler.</description>

<properties>
<ee9.module>jetty-ee9-nested</ee9.module>
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
<spotbugs.onlyAnalyze>org.eclipse.jetty.server.*</spotbugs.onlyAnalyze>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-ee8-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-nested/src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-ee8-test-resources</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-nested/src/test/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-modify-sources-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-ee8-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-nested/src/main/java</sourceProjectLocation>
<outputDirectory>${project.build.sourceDirectory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>generate-ee8-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<testSources>true</testSources>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-nested/src/test/java</sourceProjectLocation>
<outputDirectory>${project.build.testSourceDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
66 changes: 1 addition & 65 deletions jetty-ee8/jetty-ee8-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,77 +11,13 @@
<description>Jetty JavaEE style services</description>

<properties>
<ee9.module>jetty-ee9-plus</ee9.module>
<bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
<spotbugs.onlyAnalyze>org.eclipse.jetty.plus.*</spotbugs.onlyAnalyze>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-ee8-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-plus/src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-ee8-test-resources</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-plus/src/test/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-modify-sources-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-ee8-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-plus/src/main/java</sourceProjectLocation>
<outputDirectory>${project.build.sourceDirectory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>generate-ee8-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<testSources>true</testSources>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-plus/src/test/java</sourceProjectLocation>
<outputDirectory>${project.build.testSourceDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
66 changes: 1 addition & 65 deletions jetty-ee8/jetty-ee8-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,77 +11,13 @@
<description>Jetty security infrastructure</description>

<properties>
<ee9.module>jetty-ee9-security</ee9.module>
<bundle-symbolic-name>${project.groupId}.security</bundle-symbolic-name>
<spotbugs.onlyAnalyze>org.eclipse.jetty.security.*</spotbugs.onlyAnalyze>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-ee8-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-security/src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-ee8-test-resources</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-security/src/test/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-modify-sources-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-ee8-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-security/src/main/java</sourceProjectLocation>
<outputDirectory>${project.build.sourceDirectory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>generate-ee8-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<testSources>true</testSources>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-security/src/test/java</sourceProjectLocation>
<outputDirectory>${project.build.testSourceDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
67 changes: 1 addition & 66 deletions jetty-ee8/jetty-ee8-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,78 +12,13 @@
<description>Jetty Servlet Container</description>

<properties>
<ee9.module>jetty-ee9-servlet</ee9.module>
<bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
<spotbugs.onlyAnalyze>org.eclipse.jetty.*</spotbugs.onlyAnalyze>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-ee8-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-servlet/src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-ee8-test-resources</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-servlet/src/test/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-modify-sources-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-ee8-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-servlet/src/main/java</sourceProjectLocation>
<outputDirectory>${project.build.sourceDirectory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>generate-ee8-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>modify-sources-ee9-to-ee8</goal>
</goals>
<configuration>
<testSources>true</testSources>
<sourceProjectLocation>${maven.multiModuleProjectDirectory}/jetty-ee9/jetty-ee9-servlet/src/test/java</sourceProjectLocation>
<outputDirectory>${project.build.testSourceDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down

0 comments on commit b6239b2

Please sign in to comment.