Merge pull request #75 from arjantijms/pom_fixes
Impl to 3.0.2 as well and added LICENSE/NOTICE to archive
diff --git a/api/pom.xml b/api/pom.xml
index 01cbbe3..bf28703 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,24 +20,25 @@
<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.5</version>
<relativePath/>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
- <packaging>jar</packaging>
<version>3.0.2-SNAPSHOT</version>
+
<name>Expression Language 3.0 API</name>
<properties>
<!-- Make sure the two versions are in sync with the maven version -->
<spec.version>3.0</spec.version>
- <bundle.version>3.0.0</bundle.version>
+ <bundle.version>3.0.2</bundle.version>
<extensionName>javax.el</extensionName>
<bundle.symbolicName>javax.el-api</bundle.symbolicName>
<vendorName>Oracle Corporation</vendorName>
@@ -60,10 +61,12 @@
<distribution>repo</distribution>
</license>
</licenses>
+
<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/el-ri/issues</url>
</issueManagement>
+
<mailingLists>
<mailingList>
<name>EL mailing list</name>
@@ -73,11 +76,10 @@
<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:git@github.com:eclipse-ee4j/el-ri.git
- </developerConnection>
+ <developerConnection>scm:git:git@github.com:eclipse-ee4j/el-ri.git</developerConnection>
<url>https://github.com/eclipse-ee4j/el-ri</url>
<tag>HEAD</tag>
</scm>
@@ -98,6 +100,23 @@
</contributors>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE.md</include>
+ <include>NOTICE.md</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -197,15 +216,6 @@
</configuration>
</plugin>
</plugins>
-
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
</build>
<reporting>
diff --git a/impl/pom.xml b/impl/pom.xml
index daba2b1..5aeae26 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,22 +20,24 @@
<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.5</version>
+ <relativePath/>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el.impl</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <version>3.0.2-SNAPSHOT</version>
+
<name>Expression Language 3.0 Implementation</name>
<properties>
<!-- the bundle build number must be the same as the maven number -->
- <bundle.version>3.0.0</bundle.version>
+ <bundle.version>3.0.2</bundle.version>
<!-- The most current api version -->
<spec.version>3.0</spec.version>
<extensionName>javax.el.impl</extensionName>
@@ -50,7 +52,6 @@
<description>Expression Language (JSR 341) Reference Implementation</description>
<url>https://projects.eclipse.org/projects/ee4j.el</url>
-
<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/el-ri/issues</url>
@@ -104,6 +105,25 @@
</contributors>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE.md</include>
+ <include>NOTICE.md</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+
+
<plugins>
<!-- 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
@@ -224,16 +244,7 @@
<!-- <parallel>classes</parallel> -->
</configuration>
</plugin>
-
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
+
</build>
@@ -255,7 +266,7 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
- <version>3.0.1-b07-SNAPSHOT</version>
+ <version>$project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index a269814..2eb9e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,13 +29,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Expression Language 3.0</name>
<properties>
<!-- the bundle build number must be the same as the maven number -->
- <bundle.version>3.0.0</bundle.version>
+ <bundle.version>3.0.2</bundle.version>
<!-- The most current api version -->
<spec.version>3.0</spec.version>
<extensionName>javax.el</extensionName>
@@ -104,6 +104,31 @@
</contributors>
<build>
+ <resources>
+ <resource>
+ <directory>api/src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>impl/src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>LICENSE.md</include>
+ <include>NOTICE.md</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<!-- Use this to include both the api and impl sources -->
<plugin>
@@ -240,16 +265,6 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>${release.arguments}</arguments>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.1</version>
<dependencies>
@@ -270,43 +285,8 @@
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>1.32</version>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.glassfish:legal:1.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
-
-
- <resources>
- <resource>
- <directory>api/src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>impl/src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
+
</build>
