Skip to content

Commit 8baa3da

Browse files
olamyolamy
committed
rename artifacts
Signed-off-by: Olivier Lamy <olamy@apache.org>
1 parent d2bd653 commit 8baa3da

File tree

5 files changed

+245
-198
lines changed

5 files changed

+245
-198
lines changed

‎apache-el/pom.xml

Lines changed: 12 additions & 197 deletions
Original file line numberDiff line numberDiff line change
@@ -8,201 +8,16 @@
88
<version>10.0.27-SNAPSHOT</version>
99
</parent>
1010
<artifactId>apache-el</artifactId>
11-
<packaging>jar</packaging>
12-
<name>MortBay :: Apache EL :: API and Implementation</name>
13-
14-
<dependencies>
15-
<dependency>
16-
<groupId>org.apache.tomcat</groupId>
17-
<artifactId>tomcat-jasper</artifactId>
18-
<version>${tomcat.version}</version>
19-
<optional>true</optional>
20-
</dependency>
21-
<dependency>
22-
<groupId>jakarta.servlet</groupId>
23-
<artifactId>jakarta.servlet-api</artifactId>
24-
<version>${servlet.api.version}</version>
25-
<scope>provided</scope>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.apache.ant</groupId>
29-
<artifactId>ant</artifactId>
30-
<version>1.10.15</version>
31-
<scope>provided</scope>
32-
</dependency>
33-
</dependencies>
34-
35-
<build>
36-
<plugins>
37-
38-
<plugin>
39-
<groupId>org.apache.felix</groupId>
40-
<artifactId>maven-bundle-plugin</artifactId>
41-
<extensions>true</extensions>
42-
<configuration>
43-
<instructions>
44-
<Automatic-Module-Name>org.mortbay.apache.el</Automatic-Module-Name>
45-
<Bundle-Name>Mortbay Apache EL API and Implementation</Bundle-Name>
46-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
47-
<Bundle-Classpath>.</Bundle-Classpath>
48-
<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
49-
<Specification-Version>3.0</Specification-Version>
50-
<Implementation-Version>${tomcat.version}</Implementation-Version>
51-
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
52-
<Export-Package>!jakarta.servlet.*,
53-
jakarta.el;version="4.0.0",
54-
org.apache.el;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
55-
org.apache.el.lang;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
56-
org.apache.el.stream;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
57-
org.apache.el.parser;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
58-
org.apache.el.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
59-
<Import-Package>jakarta.servlet.jsp;version="3.0",
60-
jakarta.servlet.jsp.el;version="3.0",
61-
jakarta.servlet.jsp.tagext;version="3.0"</Import-Package>
62-
<_nouses>true</_nouses>
63-
<_contract />
64-
</instructions>
65-
</configuration>
66-
<executions>
67-
<execution>
68-
<id>bundle-manifest</id>
69-
<goals>
70-
<goal>manifest</goal>
71-
</goals>
72-
<phase>process-classes</phase>
73-
</execution>
74-
</executions>
75-
</plugin>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-dependency-plugin</artifactId>
79-
<executions>
80-
<execution>
81-
<id>unpack-source</id>
82-
<goals>
83-
<goal>unpack-dependencies</goal>
84-
</goals>
85-
<phase>generate-sources</phase>
86-
<configuration>
87-
<excludeArtifactIds>jakarta.servlet-api,ecj,ant,ant-launcher</excludeArtifactIds>
88-
<classifier>sources</classifier>
89-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
90-
<outputDirectory>${project.build.directory}/sources</outputDirectory>
91-
</configuration>
92-
</execution>
93-
</executions>
94-
</plugin>
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-jar-plugin</artifactId>
98-
<executions>
99-
<execution>
100-
<id>sources-jar</id>
101-
<goals>
102-
<goal>jar</goal>
103-
</goals>
104-
<phase>package</phase>
105-
<configuration>
106-
<classifier>sources</classifier>
107-
<classesDirectory>${project.build.directory}/sources</classesDirectory>
108-
<forceCreation>true</forceCreation>
109-
<useDefaultManifestFile>false</useDefaultManifestFile>
110-
<excludes>
111-
<exclude>*.java</exclude>
112-
</excludes>
113-
<archive>
114-
<manifestEntries>
115-
<Automatic-Module-Name>org.mortbay.apache.el.sources</Automatic-Module-Name>
116-
<Bundle-Name>Mortbay Apache EL API and Implementation Sources</Bundle-Name>
117-
</manifestEntries>
118-
</archive>
119-
</configuration>
120-
</execution>
121-
</executions>
122-
</plugin>
123-
<plugin>
124-
<groupId>org.apache.maven.plugins</groupId>
125-
<artifactId>maven-javadoc-plugin</artifactId>
126-
<configuration>
127-
<source>8</source>
128-
<additionalDependencies>
129-
<additionalDependency>
130-
<groupId>biz.aQute.bnd</groupId>
131-
<artifactId>biz.aQute.bnd</artifactId>
132-
<version>5.2.0</version>
133-
</additionalDependency>
134-
</additionalDependencies>
135-
</configuration>
136-
</plugin>
137-
138-
<plugin>
139-
<groupId>org.apache.maven.plugins</groupId>
140-
<artifactId>maven-shade-plugin</artifactId>
141-
<executions>
142-
<execution>
143-
<goals>
144-
<goal>shade</goal>
145-
</goals>
146-
<phase>package</phase>
147-
<configuration>
148-
<createSourcesJar>false</createSourcesJar>
149-
<shadeSourcesContent>false</shadeSourcesContent>
150-
<createDependencyReducedPom>false</createDependencyReducedPom>
151-
<filters>
152-
<filter>
153-
<artifact>*:*</artifact>
154-
<excludes>
155-
<exclude>META-INF/services/jakarta.servlet.ServletContainerInitializer</exclude>
156-
<exclude>META-INF/services/javax.tools.JavaCompiler</exclude>
157-
</excludes>
158-
<includes>
159-
<include>jakarta/el/**</include>
160-
<include>org/apache/el/**</include>
161-
<include>META-INF/NOTICE</include>
162-
<include>META-INF/LICENSE</include>
163-
<include>META-INF/services/**</include>
164-
</includes>
165-
</filter>
166-
</filters>
167-
<transformers>
168-
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
169-
<resource>META-INF/MANIFEST.MF</resource>
170-
<file>target/classes/META-INF/MANIFEST.MF</file>
171-
</transformer>
172-
</transformers>
173-
</configuration>
174-
</execution>
175-
</executions>
176-
</plugin>
177-
178-
<plugin>
179-
<groupId>org.codehaus.mojo</groupId>
180-
<artifactId>build-helper-maven-plugin</artifactId>
181-
<executions>
182-
<execution>
183-
<id>set-osgi-version</id>
184-
<goals>
185-
<goal>parse-version</goal>
186-
</goals>
187-
<phase>validate</phase>
188-
</execution>
189-
<execution>
190-
<id>add-source</id>
191-
<goals>
192-
<goal>add-source</goal>
193-
</goals>
194-
<phase>generate-sources</phase>
195-
<configuration>
196-
<sources>
197-
<source>${project.build.directory}/sources</source>
198-
</sources>
199-
</configuration>
200-
</execution>
201-
</executions>
202-
</plugin>
203-
204-
</plugins>
205-
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
206-
</build>
207-
11+
<packaging>pom</packaging>
12+
<name>Relocated MortBay :: Apache EL :: API and Implementation</name>
13+
14+
<distributionManagement>
15+
<relocation>
16+
<groupId>org.mortbay.jasper</groupId>
17+
<artifactId>mortbay-apache-el</artifactId>
18+
<version>${project.version}</version>
19+
<message>This artifact has been relocated to org.mortbay.jasper:mortbay-apache-el
20+
Please update your dependencies accordingly.</message>
21+
</relocation>
22+
</distributionManagement>
20823
</project>

‎apache-jsp/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)