Skip to content

Commit

Permalink
Refactor POMS (again) so modules inherit from rg.eclipse.ee4j:project
Browse files Browse the repository at this point in the history 
While this creates duplication in the module POMs it is a better for for
the medium term goal of separating the implementation into a new project
and the spec into a searate repository

Signed-off-by: Mark Thomas <markt@apache.org>
  • Loading branch information
@markt-asf
markt-asf committed Jun 12, 2020
1 parent 2ed5d5d commit e16350e
Show file tree
Hide file tree
Showing 4 changed files with 203 additions and 101 deletions.
80 changes: 69 additions & 11 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,60 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.el</groupId>
<artifactId>el-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
</parent>

<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0-SNAPSHOT</version>

<name>Jakarta Expression Language API</name>
<description>
Jakarta Expression Language defines an expression language for Java applications
</description>
<url>https://projects.eclipse.org/projects/ee4j.el</url>

<developers>
<developer>
<id>jakarta-ee4j-el</id>
<name>Jakarta Expression Language Developers</name>
<organization>Eclipse Foundation</organization>
<email>el-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta Expression Language Contributors</name>
<email>el-dev@eclipse.org</email>
<url>https://github.com/eclipse-ee4j/el-ri/graphs/contributors</url>
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>Expression Language dev mailing list</name>
<post>el-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/el-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/el-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/el-dev</archive>
</mailingList>
</mailingLists>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/el-ri.git</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/el-ri.git</developerConnection>
<url>https://github.com/eclipse-ee4j/el-ri</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/el-ri/issues</url>
</issueManagement>

<properties>
<!-- Make sure the two versions are in sync with the maven version -->
<spec.version>4.0</spec.version>
Expand Down Expand Up @@ -66,8 +107,31 @@
</resources>

<plugins>
<!-- Restricts the Java version to 1.8 -->
<plugin>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Restricts the Java version to 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
Expand Down Expand Up @@ -219,12 +283,6 @@ Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
69 changes: 66 additions & 3 deletions impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,58 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.el</groupId>
<artifactId>el-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
</parent>

<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>4.0.0-SNAPSHOT</version>

<name>Jakarta Expression Language Implementation</name>
<description>Jakarta Expression Language Implementation</description>
<url>https://projects.eclipse.org/projects/ee4j.el</url>

<developers>
<developer>
<id>jakarta-ee4j-el</id>
<name>Jakarta Expression Language Developers</name>
<organization>Eclipse Foundation</organization>
<email>el-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta Expression Language Contributors</name>
<email>el-dev@eclipse.org</email>
<url>https://github.com/eclipse-ee4j/el-ri/graphs/contributors</url>
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>Expression Language dev mailing list</name>
<post>el-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/el-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/el-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/el-dev</archive>
</mailingList>
</mailingLists>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/el-ri.git</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/el-ri.git</developerConnection>
<url>https://github.com/eclipse-ee4j/el-ri</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/el-ri/issues</url>
</issueManagement>

<properties>
<!-- the bundle build number must be the same as the maven number -->
<bundle.version>${project.version}</bundle.version>
Expand Down Expand Up @@ -67,6 +107,29 @@


<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<message>You need Maven 3.5.4 or higher</message>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Configure maven-bundle-plugin to generate OSGi manifest. Please note: we use the manifest goal only and not the bundle goal.
The bundle goal can lead to very surprising results if the package names are not correctly specified. So, we use the jar plugin to generate the
jar. -->
Expand Down
64 changes: 0 additions & 64 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,74 +36,10 @@
<description>Jakarta Expression Language</description>
<url>https://projects.eclipse.org/projects/ee4j.el</url>

<developers>
<developer>
<id>jakarta-ee4j-el</id>
<name>Jakarta Expression Language Developers</name>
<organization>Eclipse Foundation</organization>
<email>el-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta Expression Language Contributors</name>
<email>el-dev@eclipse.org</email>
<url>https://github.com/eclipse-ee4j/el-ri/graphs/contributors</url>
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>Expression Language dev mailing list</name>
<post>el-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/el-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/el-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/el-dev</archive>
</mailingList>
</mailingLists>

<modules>
<module>api</module>
<module>spec</module>
<module>impl</module>
</modules>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/el-ri.git</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/el-ri.git</developerConnection>
<url>https://github.com/eclipse-ee4j/el-ri</url>
<tag>HEAD</tag>
</scm>

<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/el-ri/issues</url>
</issueManagement>

<build>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit e16350e

Please sign in to comment.