Skip to content

Commit

Permalink
Using jetty-parent to reduce number of dependabot
Browse files Browse the repository at this point in the history
  • Loading branch information
@joakime
joakime committed May 3, 2024
1 parent c6961a6 commit dd5a15e
Show file tree
Hide file tree
Showing 3 changed files with 390 additions and 494 deletions.
285 changes: 140 additions & 145 deletions apache-el/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.mortbay.jasper</groupId>
<artifactId>jasper-jsp</artifactId>
<version>11.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>apache-el</artifactId>
<packaging>jar</packaging>
<name>MortBay :: Apache EL :: API and Implementation</name>

<dependencies>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta.el.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
<version>${tomcat.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.14</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
<plugins>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Automatic-Module-Name>org.mortbay.apache.el</Automatic-Module-Name>
<Bundle-Name>Mortbay Apache EL Implementation</Bundle-Name>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
<Bundle-Classpath>.</Bundle-Classpath>
<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
<Specification-Version>${jakarta.servlet.jsp.api.version}</Specification-Version>
<Implementation-Version>${tomcat.version}</Implementation-Version>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Export-Package>!jakarta.servlet.*,
!jakarta.el.*,
org.apache.el;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.lang;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.stream;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.parser;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.util;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}"</Export-Package>
<Import-Package>jakarta.servlet.jsp;version="${jakarta.servlet.jsp.api.version}",
jakarta.servlet.jsp.el;version="${jakarta.servlet.jsp.api.version}",
jakarta.servlet.jsp.tagext;version="${jakarta.servlet.jsp.api.version}"</Import-Package>
<Provide-Capability>osgi.serviceloader;osgi.serviceloader="jakarta.el.ExpressionFactory";register:="org.apache.el.ExpressionFactoryImpl"</Provide-Capability>
<Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
<_nouses>true</_nouses>
<_contract>!JakartaJSP</_contract>
</instructions>
</configuration>
<executions>
<execution>
<id>bundle-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
<phase>process-classes</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-source</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<excludeArtifactIds>jakarta.servlet-api,jakarta.el-api,ecj,ant,ant-launcher</excludeArtifactIds>
<classifier>sources</classifier>
Expand All @@ -33,53 +113,58 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/sources</source>
</sources>
</configuration>
</execution>
<execution>
<id>set-osgi-version</id>
<phase>validate</phase>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
<execution>
<id>set-tomcat-osgi-version</id>
<phase>validate</phase>
<id>sources-jar</id>
<goals>
<goal>parse-version</goal>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<versionString>${tomcat.version}</versionString>
<propertyPrefix>tomcat</propertyPrefix>
<classifier>sources</classifier>
<classesDirectory>${project.build.directory}/sources</classesDirectory>
<forceCreation>true</forceCreation>
<useDefaultManifestFile>false</useDefaultManifestFile>
<excludes>
<exclude>*.java</exclude>
</excludes>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.mortbay.apache.el.sources</Automatic-Module-Name>
<Bundle-Name>Mortbay Apache EL Implementation Sources</Bundle-Name>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
<additionalDependencies>
<additionalDependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd</artifactId>
<version>5.2.0</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<phase>package</phase>
<configuration>
<createSourcesJar>false</createSourcesJar>
<shadeSourcesContent>false</shadeSourcesContent>
Expand Down Expand Up @@ -112,134 +197,44 @@
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<id>set-osgi-version</id>
<goals>
<goal>manifest</goal>
<goal>parse-version</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
<configuration>
<instructions>
<Automatic-Module-Name>org.mortbay.apache.el</Automatic-Module-Name>
<Bundle-Name>Mortbay Apache EL Implementation</Bundle-Name>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
<Bundle-Classpath>.</Bundle-Classpath>
<Bundle-Version>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
</Bundle-Version>
<Specification-Version>${jakarta.servlet.jsp.api.version}</Specification-Version>
<Implementation-Version>${tomcat.version}</Implementation-Version>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Export-Package>!jakarta.servlet.*,
!jakarta.el.*,
org.apache.el;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.lang;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.stream;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.parser;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}",
org.apache.el.util;version="${tomcat.majorVersion}.${tomcat.minorVersion}.${tomcat.incrementalVersion}"
</Export-Package>
<Import-Package>
jakarta.servlet.jsp;version="${jakarta.servlet.jsp.api.version}",
jakarta.servlet.jsp.el;version="${jakarta.servlet.jsp.api.version}",
jakarta.servlet.jsp.tagext;version="${jakarta.servlet.jsp.api.version}"
</Import-Package>
<Provide-Capability>osgi.serviceloader;osgi.serviceloader="jakarta.el.ExpressionFactory";register:="org.apache.el.ExpressionFactoryImpl"</Provide-Capability>
<Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
<_nouses>true</_nouses>
<_contract>!JakartaJSP</_contract>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>sources-jar</id>
<phase>package</phase>
<id>set-tomcat-osgi-version</id>
<goals>
<goal>jar</goal>
<goal>parse-version</goal>
</goals>
<phase>validate</phase>
<configuration>
<classifier>sources</classifier>
<classesDirectory>${project.build.directory}/sources</classesDirectory>
<forceCreation>true</forceCreation>
<useDefaultManifestFile>false</useDefaultManifestFile>
<excludes>
<exclude>*.java</exclude>
</excludes>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.mortbay.apache.el.sources</Automatic-Module-Name>
<Bundle-Name>Mortbay Apache EL Implementation Sources</Bundle-Name>
</manifestEntries>
</archive>
<versionString>${tomcat.version}</versionString>
<propertyPrefix>tomcat</propertyPrefix>
</configuration>
</execution>
<execution>
<id>add-source</id>
<goals>
<goal>add-source</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
<additionalDependencies>
<additionalDependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd</artifactId>
<version>5.2.0</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</plugin>

</plugins>
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>

<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
<version>${tomcat.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta.el.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.14</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit dd5a15e

Please sign in to comment.