This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new b8a39ab Improve POM
b8a39ab is described below
commit b8a39abd65540c2a6147a4f7d76f079da2f2da79
Author: remm <[email protected]>
AuthorDate: Thu Dec 2 10:29:58 2021 +0100
Improve POM
---
modules/openssl-java17/README.md | 4 ++--
modules/openssl-java17/pom.xml | 50 ++++++++++++++++++++++++----------------
2 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/modules/openssl-java17/README.md b/modules/openssl-java17/README.md
index 188af2e..07f0a68 100644
--- a/modules/openssl-java17/README.md
+++ b/modules/openssl-java17/README.md
@@ -16,7 +16,7 @@ The module uses the OpenSSL 1.1 API. It requires an API
compatible version of
OpenSSL or a compatible alternative library, that can be loaded from the JVM
library path.
-Copy `tomcat-openssl-1.0.jar` to the Apache Tomcat `lib` folder.
+Copy `openssl-java17-1.0.jar` to the Apache Tomcat `lib` folder.
Remove `AprLifecycleListener` from `server.xml`. The
`org.apache.tomcat.util.net.openssl.panama.OpenSSLLifecycleListener` can be
@@ -68,7 +68,7 @@ index dc1260b..dd9fba9 100644
<pathelement location="${derby.jar}"/>
<pathelement location="${derby-shared.jar}"/>
<pathelement location="${derby-tools.jar}"/>
-+ <pathelement location="output/build/lib/tomcat-openssl-0.1.jar"/>
++ <pathelement location="output/build/lib/openssl-java17-0.1.jar"/>
<path refid="compile.classpath" />
<path refid="tomcat.classpath" />
</path>
diff --git a/modules/openssl-java17/pom.xml b/modules/openssl-java17/pom.xml
index 9ccec48..8139a3c 100644
--- a/modules/openssl-java17/pom.xml
+++ b/modules/openssl-java17/pom.xml
@@ -1,21 +1,21 @@
-<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";>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
-
+<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>
@@ -25,15 +25,14 @@
</parent>
<groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-openssl</artifactId>
- <name>Apache Tomcat OpenSSL support for Panama</name>
- <description>OpenSSL support using the Panama API</description>
- <version>0.1</version>
- <packaging>jar</packaging>
+ <artifactId>openssl-java17</artifactId>
+ <name>Apache Tomcat OpenSSL support for Java 17</name>
+ <description>OpenSSL support using the Panama JEP 412 API included in Java
17</description>
+ <version>0.1-SNAPSHOT</version>
<properties>
<tomcat.version>10.0.13</tomcat.version>
- <project.build.outputTimestamp>10</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2021-12-02T12:00:00Z</project.build.outputTimestamp>
</properties>
<mailingLists>
@@ -80,6 +79,17 @@
</compilerArgs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>17</source>
+ <additionalJOptions>
+
<additionalJOption>--add-modules</additionalJOption>
+
<additionalJOption>jdk.incubator.foreign</additionalJOption>
+ </additionalJOptions>
+ </configuration>
+ </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
