[Pkg-freeipa-devel] [Git][freeipa-team/tomcatjss][master] 32 commits: Update version number to 8.0.0-alpha1
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Tue Oct 19 08:52:59 BST 2021
Timo Aaltonen pushed to branch master at FreeIPA packaging / tomcatjss
Commits:
5baf1b72 by Endi S. Dewata at 2021-06-16T16:40:27-05:00
Update version number to 8.0.0-alpha1
- - - - -
90f005ef by Endi S. Dewata at 2021-06-18T19:25:29-05:00
Drop Java 1.8 support
- - - - -
7cb22849 by Endi S. Dewata at 2021-06-18T19:49:10-05:00
Add configurable test matrix
The test workflow have been modified to load the test
matrix from MATRIX secret variable. If the secret is
not defined, it will use the latest Fedora version
and the previous version.
- - - - -
4dedaae9 by Endi S. Dewata at 2021-06-18T20:34:17-05:00
Add Dockerfile
- - - - -
a0f11722 by Endi S. Dewata at 2021-06-18T20:35:14-05:00
Add test tools
- - - - -
df977d7a by Endi S. Dewata at 2021-06-18T20:46:34-05:00
Add PKI tests
- - - - -
29c80842 by Chris Kelley at 2021-06-21T17:24:59+01:00
Add missing @override annotations
- - - - -
1636c78a by Chris Kelley at 2021-06-21T17:24:59+01:00
Remove redundant type specifications
- - - - -
3179b499 by Endi S. Dewata at 2021-07-16T14:41:37-05:00
Add GitLab synchronization job
The .gitlab-ci.yml has been added to define a job to
synchronize a branch from an upstream repository to a
GitLab repository.
- - - - -
012bf803 by Endi S. Dewata at 2021-07-28T15:16:45-05:00
Add init-workflow.sh
The init-workflow.sh has been added to configure the test
matrix based on the BASE64_MATRIX variable. The test matrix
needs to be base64-encoded since otherwise GitHub will mask
the value rendering it unusable.
- - - - -
a0c6db64 by Endi S. Dewata at 2021-07-29T15:23:07-05:00
Add test repository configuration
The init-workflow.sh has been modified to load the test
repository from BASE64_REPO variable. The test repository
will be configured in the runner image so all tests using
the same image will automatically use the same repository.
- - - - -
5417289e by Endi S. Dewata at 2021-07-29T17:20:29-05:00
Update default test matrix
The init-workflow.sh has been modified to test
against the latest Fedora version by default.
- - - - -
b373daa2 by Endi S. Dewata at 2021-08-03T15:43:22-05:00
Replace backquote with $() in build.sh
- - - - -
4ab95988 by Endi S. Dewata at 2021-08-11T21:09:25-05:00
Drop Java 1.8 compatibility
- - - - -
9f10a5fe by Endi S. Dewata at 2021-08-11T21:09:25-05:00
Fix build directory in tomcatjss.spec
- - - - -
b42527c8 by Endi S. Dewata at 2021-08-11T21:09:25-05:00
Update version number to 8.0.0-alpha2
- - - - -
70c8612a by Endi S. Dewata at 2021-09-23T08:56:50-05:00
Add SSL test
A new job has been added to test creating an SSL connector
in a basic PKI server instance.
- - - - -
6f20e697 by Endi S. Dewata at 2021-09-30T15:14:47-05:00
Fix java_home path
- - - - -
3c434ce4 by Endi S. Dewata at 2021-09-30T15:14:47-05:00
Update version number to 8.0.0
- - - - -
44d7114e by Endi S. Dewata at 2021-09-30T18:10:21-05:00
Fix java_home path
- - - - -
dd21d767 by Endi S. Dewata at 2021-09-30T22:29:07-05:00
Revert java_home path
- - - - -
ff64eb5d by Timo Aaltonen at 2021-10-18T22:09:54+03:00
Merge tag 'v7.7.0' into m
- - - - -
a0d67675 by Timo Aaltonen at 2021-10-18T22:09:59+03:00
Merge branch 'master' into m
- - - - -
0dbc008e by Timo Aaltonen at 2021-10-18T22:10:22+03:00
bump version
- - - - -
74cb020a by Timo Aaltonen at 2021-10-19T10:07:57+03:00
control: Bump libjss-java depends.
- - - - -
8c04bdf3 by Timo Aaltonen at 2021-10-19T10:12:18+03:00
rules: Drop building for old jdk target.
- - - - -
286e2d45 by Timo Aaltonen at 2021-10-19T10:19:08+03:00
rules: Fix version.
- - - - -
e8113cd2 by Timo Aaltonen at 2021-10-19T10:20:14+03:00
control: Bump debhelper to 13.
- - - - -
ceed7746 by Timo Aaltonen at 2021-10-19T10:39:14+03:00
rules: Drop obsolete build parameters.
- - - - -
673c9c05 by Timo Aaltonen at 2021-10-19T10:39:55+03:00
control: Bump policy to 4.6.0.
- - - - -
25aafe63 by Timo Aaltonen at 2021-10-19T10:40:18+03:00
control: Fix Vcs-Browser url.
- - - - -
5e3ecf06 by Timo Aaltonen at 2021-10-19T10:40:33+03:00
releasing package tomcatjss version 8.0.0-1
- - - - -
13 changed files:
- .github/workflows/pki-tests.yml
- Dockerfile
- build.sh
- build.xml
- core/src/main/java/org/apache/tomcat/util/net/jss/PlainPasswordFile.java
- core/src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java
- debian/changelog
- debian/control
- debian/rules
- + tests/bin/init-workflow.sh
- tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSContext.java
- tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
- tomcatjss.spec
Changes:
=====================================
.github/workflows/pki-tests.yml
=====================================
@@ -6,29 +6,25 @@ jobs:
init:
name: Initializing Workflow
runs-on: ubuntu-latest
- container: fedora:latest
outputs:
- matrix: ${{ steps.set-matrix.outputs.matrix }}
+ matrix: ${{ steps.init.outputs.matrix }}
+ repo: ${{ steps.init.outputs.repo }}
steps:
- - name: Set up test matrix
- id: set-matrix
+ - name: Clone repository
+ uses: actions/checkout at v2
+
+ - name: Initialize workflow
+ id: init
+ env:
+ BASE64_MATRIX: ${{ secrets.BASE64_MATRIX }}
+ BASE64_REPO: ${{ secrets.BASE64_REPO }}
run: |
- export latest=$(cat /etc/fedora-release | awk '{ print $3 }')
- export previous=$(cat /etc/fedora-release | awk '{ print $3 - 1 }')
- echo "Running CI against Fedora $previous and $latest"
- if [ "${{ secrets.MATRIX }}" == "" ]
- then
- echo "::set-output name=matrix::{\"os\":[\"$previous\", \"$latest\"]}"
- else
- echo "::set-output name=matrix::${{ secrets.MATRIX }}"
- fi
+ tests/bin/init-workflow.sh
build:
name: Building TomcatJSS
needs: init
runs-on: ubuntu-latest
- env:
- COPR_REPO: "@pki/10.11"
strategy:
matrix: ${{ fromJSON(needs.init.outputs.matrix) }}
steps:
@@ -44,7 +40,7 @@ jobs:
context: .
build-args: |
OS_VERSION=${{ matrix.os }}
- COPR_REPO=${{ env.COPR_REPO }}
+ COPR_REPO=${{ needs.init.outputs.repo }}
BUILD_OPTS=--with-timestamp --with-commit-id
tags: tomcatjss-runner
target: tomcatjss-runner
@@ -56,13 +52,117 @@ jobs:
name: tomcatjss-runner-${{ matrix.os }}
path: /tmp/tomcatjss-runner.tar
+ # https://github.com/dogtagpki/pki/blob/master/docs/installation/server/Installing_Basic_PKI_Server.md
+ ssl-test:
+ name: Testing SSL Connector
+ needs: [init, build]
+ runs-on: ubuntu-latest
+ env:
+ SHARED: /tmp/workdir/tomcatjss
+ strategy:
+ matrix: ${{ fromJSON(needs.init.outputs.matrix) }}
+ steps:
+ - name: Clone repository
+ uses: actions/checkout at v2
+
+ - name: Download runner image
+ uses: actions/download-artifact at v2
+ with:
+ name: tomcatjss-runner-${{ matrix.os }}
+ path: /tmp
+
+ - name: Load runner image
+ run: docker load --input /tmp/tomcatjss-runner.tar
+
+ - name: Run container
+ run: |
+ IMAGE=tomcatjss-runner \
+ NAME=pki \
+ HOSTNAME=pki.example.com \
+ tests/bin/runner-init.sh
+
+ - name: Install PKI packages
+ run: docker exec pki dnf install -y pki-server sslscan
+
+ - name: Create PKI server
+ run: docker exec pki pki-server create
+
+ - name: Create NSS database
+ run: docker exec pki pki-server nss-create --no-password
+
+ - name: Create SSL server cert request
+ run: |
+ docker exec pki pki \
+ -d /var/lib/pki/pki-tomcat/conf/alias \
+ nss-cert-request \
+ --subject "CN=pki.example.com" \
+ --ext /usr/share/pki/server/certs/sslserver.conf \
+ --csr sslserver.csr
+ docker exec pki openssl req -text -noout -in sslserver.csr
+
+ - name: Issue self-signed SSL server cert
+ run: |
+ docker exec pki pki \
+ -d /var/lib/pki/pki-tomcat/conf/alias \
+ nss-cert-issue \
+ --csr sslserver.csr \
+ --ext /usr/share/pki/server/certs/sslserver.conf \
+ --cert sslserver.crt
+ docker exec pki openssl x509 -text -noout -in sslserver.crt
+
+ - name: Import SSL server cert
+ run: |
+ docker exec pki pki \
+ -d /var/lib/pki/pki-tomcat/conf/alias \
+ nss-cert-import \
+ --cert sslserver.crt \
+ sslserver
+
+ - name: Enable JSS in PKI server
+ run: docker exec pki pki-server jss-enable
+
+ - name: Create SSL connector
+ run: |
+ docker exec pki pki-server http-connector-add \
+ --port 8443 \
+ --scheme https \
+ --secure true \
+ --sslEnabled true \
+ --sslProtocol SSL \
+ --sslImpl org.dogtagpki.tomcat.JSSImplementation \
+ Secure
+
+ - name: Configure SSL certificate
+ run: |
+ docker exec pki pki-server http-connector-cert-add \
+ --keyAlias sslserver \
+ --keystoreType pkcs11 \
+ --keystoreProvider Mozilla-JSS
+
+ - name: Create ROOT web application
+ run: |
+ docker exec pki mkdir /var/lib/pki/pki-tomcat/webapps/ROOT
+ docker exec pki touch /var/lib/pki/pki-tomcat/webapps/ROOT/index.html
+
+ - name: Start PKI server
+ run: docker exec pki pki-server start --wait
+
+ - name: Verify SSL connection
+ run: docker exec pki sslscan pki.example.com:8443
+
+ - name: Stop PKI server
+ run: docker exec pki pki-server stop --wait
+
+ - name: Remove PKI server
+ run: docker exec pki pki-server remove
+
+ # https://github.com/dogtagpki/pki/blob/master/docs/installation/ca/Installing_CA.md
ca-test:
- name: Installing CA
+ name: Testing CA Installation
needs: [init, build]
runs-on: ubuntu-latest
env:
SHARED: /tmp/workdir/tomcatjss
- COPR_REPO: "@pki/10.11"
strategy:
matrix: ${{ fromJSON(needs.init.outputs.matrix) }}
steps:
=====================================
Dockerfile
=====================================
@@ -5,7 +5,7 @@
#
ARG OS_VERSION="latest"
-ARG COPR_REPO="@pki/10.11"
+ARG COPR_REPO="@pki/master"
################################################################################
FROM registry.fedoraproject.org/fedora:$OS_VERSION AS tomcatjss-builder
=====================================
build.sh
=====================================
@@ -7,10 +7,10 @@
NAME=tomcatjss
-SCRIPT_PATH=`readlink -f "$0"`
-SCRIPT_NAME=`basename "$SCRIPT_PATH"`
+SCRIPT_PATH="$(readlink -f "$0")"
+SCRIPT_NAME="$(basename "$SCRIPT_PATH")"
-SRC_DIR=`dirname "$SCRIPT_PATH"`
+SRC_DIR="$(dirname "$SCRIPT_PATH")"
WORK_DIR="$HOME/build/$NAME"
SOURCE_TAG=
@@ -61,8 +61,8 @@ generate_rpm_sources() {
if [ "$SOURCE_TAG" != "HEAD" ] ; then
- TAG_ID=`git -C "$SRC_DIR" rev-parse $SOURCE_TAG`
- HEAD_ID=`git -C "$SRC_DIR" rev-parse HEAD`
+ TAG_ID="$(git -C "$SRC_DIR" rev-parse $SOURCE_TAG)"
+ HEAD_ID="$(git -C "$SRC_DIR" rev-parse HEAD)"
if [ "$TAG_ID" != "$HEAD_ID" ] ; then
generate_patch
@@ -136,7 +136,7 @@ while getopts v-: arg ; do
case $OPTARG in
work-dir=?*)
- WORK_DIR=`readlink -f "$LONG_OPTARG"`
+ WORK_DIR="$(readlink -f "$LONG_OPTARG")"
;;
source-tag=?*)
SOURCE_TAG="$LONG_OPTARG"
@@ -203,13 +203,13 @@ if [ "$BUILD_TARGET" != "src" ] &&
fi
SPEC_TEMPLATE="$SRC_DIR/$NAME.spec"
-VERSION="`rpmspec -P "$SPEC_TEMPLATE" | grep "^Version:" | awk '{print $2;}'`"
+VERSION="$(rpmspec -P "$SPEC_TEMPLATE" | grep "^Version:" | awk '{print $2;}')"
if [ "$DEBUG" = true ] ; then
echo "VERSION: $VERSION"
fi
-RELEASE="`rpmspec -P "$SPEC_TEMPLATE" --undefine dist | grep "^Release:" | awk '{print $2;}'`"
+RELEASE="$(rpmspec -P "$SPEC_TEMPLATE" --undefine dist | grep "^Release:" | awk '{print $2;}')"
if [ "$DEBUG" = true ] ; then
echo "RELEASE: $RELEASE"
@@ -235,7 +235,7 @@ if [ "$DEBUG" = true ] ; then
fi
if [ "$WITH_COMMIT_ID" = true ]; then
- COMMIT_ID="`git -C "$SRC_DIR" rev-parse --short=8 HEAD`"
+ COMMIT_ID="$(git -C "$SRC_DIR" rev-parse --short=8 HEAD)"
_COMMIT_ID=".$COMMIT_ID"
fi
@@ -329,7 +329,7 @@ if [ $rc != 0 ]; then
exit 1
fi
-SRPM=`find "$WORK_DIR/SRPMS" -type f`
+SRPM="$(find "$WORK_DIR/SRPMS" -type f)"
echo "SRPM package:"
echo " $SRPM"
=====================================
build.xml
=====================================
@@ -217,7 +217,7 @@
description="compile the source " >
<!-- Compile the java code from ${src} into ${build} -->
<mkdir dir="${build.classes}"/>
- <javac debug="on" destdir="${build.classes}" source="1.8" target="1.8">
+ <javac debug="on" destdir="${build.classes}">
<src path="core/src/main/java"/>
<src path="${src.dir}/src/main/java"/>
<classpath refid="classpath"/>
=====================================
core/src/main/java/org/apache/tomcat/util/net/jss/PlainPasswordFile.java
=====================================
@@ -81,6 +81,7 @@ public class PlainPasswordFile implements IPasswordStore {
* @exception IOException if an error occurred when reading from the
* input stream.
*/
+ @Override
public void init(String pwdPath) throws IOException {
logger.debug("PlainPasswordFile: Initializing PlainPasswordFile");
// initialize mPwdStore
@@ -111,24 +112,29 @@ public class PlainPasswordFile implements IPasswordStore {
}
}
+ @Override
public String getPassword(String tag) {
return getPassword(tag, 0);
}
+ @Override
public String getPassword(String tag, int iteration) {
return mPwdStore.getProperty(tag);
}
// return an array of String-based tag
+ @Override
@SuppressWarnings("unchecked")
public Enumeration<String> getTags() {
return (Enumeration<String>) mPwdStore.propertyNames();
}
+ @Override
public Object putPassword(String tag, String password) {
return mPwdStore.setProperty(tag, password);
}
+ @Override
public synchronized void commit()
throws IOException, ClassCastException, NullPointerException {
try (FileOutputStream file = new FileOutputStream(mPwdPath);
=====================================
core/src/main/java/org/apache/tomcat/util/net/jss/TomcatJSS.java
=====================================
@@ -59,7 +59,7 @@ public class TomcatJSS implements SSLSocketListener {
public static TomcatJSS getInstance() { return INSTANCE; }
- Collection<SSLSocketListener> socketListeners = new ArrayList<SSLSocketListener>();
+ Collection<SSLSocketListener> socketListeners = new ArrayList<>();
String certdbDir;
CryptoManager manager;
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+tomcatjss (8.0.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * control: Bump libjss-java depends.
+ * rules: Drop building for old jdk target.
+ * rules: Fix version.
+ * control: Bump debhelper to 13.
+ * rules: Drop obsolete build parameters.
+ * control: Bump policy to 4.6.0.
+ * control: Fix Vcs-Browser url.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Tue, 19 Oct 2021 10:40:26 +0300
+
tomcatjss (7.7.0-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -5,23 +5,23 @@ Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at alioth-lists.debian.net>
Uploaders: Timo Aaltonen <tjaalton at debian.org>
Build-Depends:
ant,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk,
javahelper,
libcommons-lang3-java,
- libjss-java (>= 4.9.1~),
+ libjss-java (>= 5.0.0),
libslf4j-java,
libtomcat9-java (>= 9.0.37-2~),
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Homepage: http://pki.fedoraproject.org
Vcs-Git: https://salsa.debian.org/freeipa-team/tomcatjss.git
-Vcs-Browser: https://salsa.debian.org/freeipa-team/tomcatjss.git
+Vcs-Browser: https://salsa.debian.org/freeipa-team/tomcatjss
Package: libtomcatjss-java
Architecture: all
Depends: libtomcat9-java, ${java:Depends}, ${misc:Depends},
libcommons-lang3-java,
- libjss-java (>= 4.9.1~),
+ libjss-java (>= 5.0.0),
libslf4j-java,
Conflicts: libtcnative-1
Breaks: pki-server (<< 10.3.5-2)
=====================================
debian/rules
=====================================
@@ -8,8 +8,6 @@ export CLASSPATH=/usr/share/java/jss.jar:/usr/share/java/tomcat-coyote.jar
override_dh_auto_build:
ant \
- -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
- -Dsrc.dir=tomcat-9.0 \
-Dcatalina.jar=/usr/share/java/tomcat9-catalina.jar \
-Dtomcat-api.jar=/usr/share/java/tomcat9-api.jar \
-Dtomcat-coyote.jar=/usr/share/java/tomcat9-coyote.jar \
@@ -18,6 +16,7 @@ override_dh_auto_build:
-Dinstall.doc.dir=build/usr/share/doc/tomcatjss \
-Dinstall.jar.dir=build/usr/share/java \
-Dslf4j-api.jar=/usr/share/java/slf4j-api.jar \
+ -Dversion=8.0.0 \
install
override_dh_auto_install:
=====================================
tests/bin/init-workflow.sh
=====================================
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+if [ "$BASE64_MATRIX" == "" ]
+then
+ MATRIX="{\"os\":[\"latest\"]}"
+else
+ MATRIX=$(echo "$BASE64_MATRIX" | base64 -d)
+fi
+
+echo "MATRIX: $MATRIX"
+echo "::set-output name=matrix::$MATRIX"
+
+if [ "$BASE64_REPO" == "" ]
+then
+ REPO="@pki/master"
+else
+ REPO=$(echo "$BASE64_REPO" | base64 -d)
+fi
+
+echo "REPO: $REPO"
+echo "::set-output name=repo::$REPO"
=====================================
tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSContext.java
=====================================
@@ -41,6 +41,7 @@ public class JSSContext implements org.apache.tomcat.util.net.SSLContext {
}
}
+ @Override
public void init(KeyManager[] kms, TrustManager[] tms, SecureRandom sr) throws KeyManagementException {
logger.debug("JSSContext.init(...)");
@@ -57,6 +58,7 @@ public class JSSContext implements org.apache.tomcat.util.net.SSLContext {
}
}
+ @Override
public javax.net.ssl.SSLEngine createSSLEngine() {
logger.debug("JSSContext.createSSLEngine()");
javax.net.ssl.SSLEngine eng = ctx.createSSLEngine();
@@ -69,21 +71,25 @@ public class JSSContext implements org.apache.tomcat.util.net.SSLContext {
return eng;
}
+ @Override
public javax.net.ssl.SSLSessionContext getServerSessionContext() {
logger.debug("JSSContext.getServerSessionContext()");
return ctx.getServerSessionContext();
}
+ @Override
public javax.net.ssl.SSLServerSocketFactory getServerSocketFactory() {
logger.debug("JSSContext.getServerSocketFactory()");
return ctx.getServerSocketFactory();
}
+ @Override
public javax.net.ssl.SSLParameters getSupportedSSLParameters() {
logger.debug("JSSContext.getSupportedSSLParameters()");
return ctx.getSupportedSSLParameters();
}
+ @Override
public java.security.cert.X509Certificate[] getCertificateChain(java.lang.String alias) {
logger.debug("JSSContext.getCertificateChain(" + alias + ")");
@@ -94,6 +100,7 @@ public class JSSContext implements org.apache.tomcat.util.net.SSLContext {
}
}
+ @Override
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
logger.debug("JSSContext.getAcceptedIssuers()");
@@ -104,6 +111,7 @@ public class JSSContext implements org.apache.tomcat.util.net.SSLContext {
}
}
+ @Override
public void destroy() {
logger.debug("JSSContext.destory()");
}
=====================================
tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
=====================================
@@ -69,11 +69,11 @@ public class JSSUtil extends SSLUtilBase {
}
protocols = Collections.unmodifiableSet(
- new HashSet<String>(Arrays.asList(engine.getSupportedProtocols()))
+ new HashSet<>(Arrays.asList(engine.getSupportedProtocols()))
);
ciphers = Collections.unmodifiableSet(
- new HashSet<String>(Arrays.asList(engine.getSupportedCipherSuites()))
+ new HashSet<>(Arrays.asList(engine.getSupportedCipherSuites()))
);
}
=====================================
tomcatjss.spec
=====================================
@@ -9,7 +9,7 @@ BuildArch: noarch
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version: 7.7.0
+Version: 8.0.0
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -alpha1
@@ -34,15 +34,9 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
# Java
################################################################################
-%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
-%define java_devel java-1.8.0-openjdk-devel
-%define java_headless java-1.8.0-openjdk-headless
-%define java_home /usr/lib/jvm/jre-1.8.0-openjdk
-%else
%define java_devel java-11-openjdk-devel
%define java_headless java-11-openjdk-headless
%define java_home /usr/lib/jvm/jre-11-openjdk
-%endif
################################################################################
# Build Dependencies
@@ -63,7 +57,7 @@ BuildRequires: slf4j
BuildRequires: slf4j-jdk14
# JSS
-BuildRequires: jss >= 4.9.0, jss < 5.0.0
+BuildRequires: jss >= 5.0.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@@ -86,7 +80,7 @@ Requires: slf4j
Requires: slf4j-jdk14
# JSS
-Requires: jss >= 4.9.0, jss < 5.0.0
+Requires: jss >= 5.0.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@@ -127,6 +121,7 @@ app_server=tomcat-$tomcat_version
ant -f build.xml \
-Dversion=%{version} \
-Dsrc.dir=$app_server \
+ -Ddist.dir=%{_vpath_builddir} \
-Djnidir=%{_jnidir} \
-Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
-Dinstall.jar.dir=%{buildroot}%{_javadir} \
View it on GitLab: https://salsa.debian.org/freeipa-team/tomcatjss/-/compare/a23e20bcef103816b3b8d4ca32f215e0c9046f1f...5e3ecf064c2f6e045ed6173972d74cc00d03ab70
--
View it on GitLab: https://salsa.debian.org/freeipa-team/tomcatjss/-/compare/a23e20bcef103816b3b8d4ca32f215e0c9046f1f...5e3ecf064c2f6e045ed6173972d74cc00d03ab70
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20211019/74b3ce7f/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list