Merge pull request #69 from Cousjava/updateparent-ee4j
Use jakarta rather than javax
diff --git a/api/pom.xml b/api/pom.xml
index c0c86cf..d614ba5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
- <version>1.0.2</version>
+ <version>1.0.5</version>
<relativePath/>
</parent>
@@ -196,26 +196,7 @@
<arguments>${release.arguments}</arguments>
</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>
- </plugin>
- </plugins>
-
+
<resources>
<resource>
<directory>src/main/java</directory>
diff --git a/impl/pom.xml b/impl/pom.xml
index 87d050b..daba2b1 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
- <version>1.0.2</version>
+ <version>1.0.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el.impl</artifactId>
+ <artifactId>jakarta.el.impl</artifactId>
<version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Expression Language 3.0 Implementation</name>
@@ -161,23 +161,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>
@@ -242,32 +225,6 @@
</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>
diff --git a/pom.xml b/pom.xml
index 6cf1d07..a269814 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
<version>3.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Expression Language 3.0</name>
