Merge remote-tracking branch 'origin/EE4J_8'
Conflicts:
api/pom.xml
impl/pom.xml
pom.xml
diff --git a/api/pom.xml b/api/pom.xml
index 21989aa..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>
@@ -108,7 +127,6 @@
<supportedProjectType>jar</supportedProjectType>
</supportedProjectTypes>
<instructions>
- <Automatic-Module-Name>java.el</Automatic-Module-Name>
<Bundle-Description>Expression Language ${spec.version} API</Bundle-Description>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${bundle.version}</Bundle-Version>
@@ -198,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 a8fad36..dbb6975 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,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.2</version>
+ <version>1.0.5</version>
+ <relativePath/>
</parent>
+
+ <groupId>com.sun.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el.impl</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
<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>
@@ -49,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>
@@ -103,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
@@ -113,7 +134,6 @@
<version>1.4.3</version>
<configuration>
<instructions>
- <Automatic-Module-Name>java.el.impl</Automatic-Module-Name>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Description>
Expression Language ${spec.version} Implementation
@@ -161,23 +181,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version> 2.2.1 </version>
- <configuration>
- <includePom>true</includePom>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<executions>
@@ -241,42 +244,7 @@
<!-- <parallel>classes</parallel> -->
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.glassfish.copyright</groupId>
- <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>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
+ </plugins>
</build>
@@ -298,7 +266,7 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
- <version>3.0.1-b07-SNAPSHOT</version>
+ <version>${bundle.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index e6c1400..2eb9e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,14 +28,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <artifactId>jakarta.el</artifactId>
+ <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>
@@ -103,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>
@@ -180,6 +206,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version> 2.2.1 </version>
+ <configuration>
+ <includePom>true</includePom>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<executions>
@@ -222,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>
@@ -246,43 +279,14 @@
<!-- <parallel>classes</parallel> -->
</configuration>
</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>
+ <groupId>org.glassfish.copyright</groupId>
+ <artifactId>glassfish-copyright-maven-plugin</artifactId>
+ <version>1.32</version>
</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>
