Skip to content

Commit

Permalink
Update versions and automatic module in pom, plus tidying
Browse files Browse the repository at this point in the history 
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
  • Loading branch information
@arjantijms
arjantijms committed Aug 18, 2020
1 parent 73dd702 commit a834bcd
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 131 deletions.
37 changes: 3 additions & 34 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<email>el-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta Expression Language Contributors</name>
Expand All @@ -72,7 +71,6 @@
<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>
Expand All @@ -85,9 +83,6 @@
<extensionName>jakarta.el</extensionName>
<bundle.symbolicName>jakarta.el-api</bundle.symbolicName>
<vendorName>Eclipse Foundation</vendorName>
<findbugs.version>2.5.2</findbugs.version>
<findbugs.exclude />
<findbugs.threshold>High</findbugs.threshold>
</properties>

<build>
Expand All @@ -107,7 +102,6 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>

<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
Expand Down Expand Up @@ -202,12 +196,12 @@
<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>jakarta.el.api</Automatic-Module-Name>
<Automatic-Module-Name>jakarta.el</Automatic-Module-Name>
</manifestEntries>
</archive>
<excludes>
Expand Down Expand Up @@ -238,7 +232,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -271,31 +265,6 @@ Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
</configuration>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
50 changes: 4 additions & 46 deletions combined-pom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@
<bundle.version>4.0.0-SNAPSHOT</bundle.version>
<!-- The most current api version -->
<spec.version>4.0</spec.version>
<extensionName>jakarta.el</extensionName>
<bundle.symbolicName>com.sun.el.jakarta.el</bundle.symbolicName>
<vendorName>Oracle Corporation</vendorName>
<findbugs.version>2.5.2</findbugs.version>
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
<findbugs.threshold>High</findbugs.threshold>
</properties>

<developers>
Expand Down Expand Up @@ -173,13 +168,12 @@
<version>1.4.3</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-SymbolicName>com.sun.el.jakarta.el</Bundle-SymbolicName>
<Bundle-Description>
Expression Language ${spec.version} API and Implementation

</Bundle-Description>
<Bundle-Version>${bundle.version}</Bundle-Version>
<Extension-Name>${extensionName}</Extension-Name>
<Extension-Name>jakarta.el</Extension-Name>
<Specification-Version>${spec.version}</Specification-Version>
<Specification-Vendor>${vendorName}</Specification-Vendor>
<Implementation-Version>${project.version}</Implementation-Version>
Expand Down Expand Up @@ -224,7 +218,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version> 2.2.1 </version>
<version>2.2.1</version>
<configuration>
<includePom>true</includePom>
</configuration>
Expand Down Expand Up @@ -262,7 +256,7 @@
<packages>com.sun.el</packages>
</group>
</groups>
<bottom> Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. Use is subject to license terms. </bottom>
<bottom> Copyright (c) 2013, 2020 Oracle and/or its affiliates. All Rights Reserved. Use is subject to license terms. </bottom>
</configuration>
</execution>
</executions>
Expand All @@ -271,17 +265,6 @@
<!-- Use ant to manually invoke javacc, as this required is very infrequently <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version> <executions> <execution> <id>jjtree-javacc</id> <goals> <goal>jjtree-javacc</goal> </goals> <configuration> <sourceDirectory>src/main/java/com/sun/el/parser</sourceDirectory>
<outputDirectory>src/main/java/com/sun/el/parser</outputDirectory> </configuration> </execution> </executions> </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -299,30 +282,5 @@
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<excludePackageNames>com.sun.el.parser</excludePackageNames>
<sourceFileExcludes>
<sourceFileExclude>**/parser/*.java</sourceFileExclude>
</sourceFileExcludes>
</configuration>
</plugin>
</plugins>
</reporting>

</project>
50 changes: 5 additions & 45 deletions impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<version>1.0.6</version>
<relativePath/>
</parent>

<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>4.0.0-SNAPSHOT</version>
Expand All @@ -44,7 +44,6 @@
<email>el-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta Expression Language Contributors</name>
Expand All @@ -69,7 +68,6 @@
<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>
Expand All @@ -83,9 +81,6 @@
<extensionName>jakarta.el.impl</extensionName>
<bundle.symbolicName>org.glassfish.jakarta.el</bundle.symbolicName>
<vendorName>Eclipse Foundation</vendorName>
<findbugs.version>2.5.2</findbugs.version>
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
<findbugs.threshold>High</findbugs.threshold>
</properties>

<dependencies>
Expand Down Expand Up @@ -120,7 +115,6 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>

<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<plugin>
Expand Down Expand Up @@ -173,7 +167,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<archive>
<manifestFile>
Expand Down Expand Up @@ -206,7 +200,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -236,18 +230,6 @@ Use is subject to <a href="http://www.eclipse.org/legal/epl-2.0" target="_top">l
<version>2.6</version> <executions> <execution> <id>jjtree-javacc</id> <goals> <goal>jjtree-javacc</goal> </goals> <configuration> <sourceDirectory>src/main/java/com/sun/el/parser</sourceDirectory>
<outputDirectory>src/main/java/com/sun/el/parser</outputDirectory> </configuration> </execution> </executions> </plugin> -->

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -260,33 +242,11 @@ Use is subject to <a href="http://www.eclipse.org/legal/epl-2.0" target="_top">l

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.7.1</version>
</dependency>
</dependencies>
<version>3.0.0-M4</version>
<configuration>
<forkMode>never</forkMode>
</configuration>
</plugin>
</plugins>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
<configuration>
<threshold>${findbugs.threshold}</threshold>
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
</configuration>
</plugin>
</plugins>
</reporting>

</project>
25 changes: 25 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,29 @@
<module>impl</module>
</modules>

<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-M3</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>
9 changes: 3 additions & 6 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<name>Jakarta Expression Language Specification</name>
<description>Jakarta Expression Language - Specification</description>
<url>https://projects.eclipse.org/projects/ee4j.el</url>

<licenses>
<license>
<name>Eclipse Foundation Specification License – v1.0</name>
Expand All @@ -51,7 +50,6 @@
<email>el-dev@eclipse.org</email>
</developer>
</developers>

<contributors>
<contributor>
<name>Jakarta Expression Language Contributors</name>
Expand All @@ -76,7 +74,6 @@
<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>
Expand All @@ -86,9 +83,9 @@
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.2.0</asciidoctorj.version>
<asciidoctorj.version>2.4.0</asciidoctorj.version>
<asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<jruby.version>9.2.11.1</jruby.version>
<jruby.version>9.2.13.0</jruby.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
Expand Down Expand Up @@ -234,7 +231,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down

0 comments on commit a834bcd

Please sign in to comment.