Refactor POMS (again) so modules inherit from rg.eclipse.ee4j:project
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>
diff --git a/api/pom.xml b/api/pom.xml
index e57c54f..90b14ed 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,12 +22,14 @@
<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>
@@ -35,6 +37,45 @@
</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>
@@ -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>
@@ -221,12 +285,6 @@
<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>
<version>1.6</version>
</plugin>
diff --git a/impl/pom.xml b/impl/pom.xml
index b8f866e..0c0f5f7 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -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>
@@ -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. -->
diff --git a/pom.xml b/pom.xml
index ba65112..66aa3de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/spec/pom.xml b/spec/pom.xml
index 17de153..8e77ca0 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -20,9 +20,9 @@
<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>
@@ -42,6 +42,45 @@
</license>
</licenses>
+ <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>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
@@ -58,6 +97,33 @@
<build>
<defaultGoal>package</defaultGoal>
<plugins>
+ <!-- Sets minimal Maven version to 3.5.4 and Java version to 8 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ <executions>
+ <execution>
+ <id>enforce</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>
+ <requireJavaVersion>
+ <version>1.8</version>
+ <message>You need JDK8 or higher</message>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -78,27 +144,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.8.0,)</version>
- <message>You need JDK8 or higher</message>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
