Skip to content

Commit

Permalink
Update dist versions and fix one potential problem in TCK setup
Browse files Browse the repository at this point in the history 
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
  • Loading branch information
@arjantijms
arjantijms committed May 11, 2024
1 parent b74a3be commit 1841297
Show file tree
Hide file tree
Showing 4 changed files with 124 additions and 128 deletions.
29 changes: 25 additions & 4 deletions tck-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, 2022 Contributors to Eclipse Foundation. All rights reserved.
Copyright (c) 2022, 2024 Contributors to Eclipse Foundation.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -16,19 +16,19 @@
-->

<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/xsd/maven-4.0.0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath/>
</parent>

<groupId>org.eclipse.ee4j.tck.security</groupId>
<artifactId>jakarta-security-tck-dist</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand All @@ -37,6 +37,27 @@

<build>
<plugins>
<!-- Sets minimal Maven version to 3.8.6 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Assembly plugin to collect everything into a single distribution -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
211 changes: 93 additions & 118 deletions tck-dist/userguide/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024 Contributors to the Eclipse Foundation.
Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -17,80 +18,136 @@
-->

<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">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath/>
</parent>

<groupId>org.glassfish</groupId>
<artifactId>tck_security</artifactId>
<version>4.0.0</version>
<packaging>pom</packaging>
<version>3.0.0</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Security API for Jakarta EE, Release 3.0</name>

<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Security API for Jakarta EE, Release 4.0</name>

<distributionManagement>
<site>
<url>scm:git:git@github.com:jakartaee/security.git</url>
</site>
</distributionManagement>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctorj.version>2.4.2</asciidoctorj.version>
<asciidoctorj.diagram.version>2.1.0</asciidoctorj.diagram.version>
<asciidoctorj.maven.plugin.version>2.1.0</asciidoctorj.maven.plugin.version>
<asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<jbake.maven.plugin.version>0.3.3</jbake.maven.plugin.version>
<freemarker.version>2.3.30</freemarker.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status></status>
<doc.pdf>Jakarta-Security-TCK-Users-Guide.pdf</doc.pdf>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<distributionManagement>
<site>
<url>scm:git:git@github.com:jakartaee/security.git</url>
</site>
</distributionManagement>

<build>
<defaultGoal>package</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.glassfish.doc</groupId>
<artifactId>glassfish-doc-maven-plugin</artifactId>
<version>1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
<version>2.7.0-rc.7</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
<version>2.5.12</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-diagram</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.32</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>2.3.15</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>src/main/jbake/content</directory>
<includes>
<include>toc.adoc</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
<!-- Sets minimal Maven version to 3.8.6 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-versions</id>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[11,)</version>
<message>You need JDK11 or newer</message>
</requireJavaVersion>
<requireMavenVersion>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>src/main/jbake/content</directory>
<includes>
<include>toc.adoc</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<groupId>org.glassfish.doc</groupId>
<artifactId>glassfish-doc-maven-plugin</artifactId>
Expand Down Expand Up @@ -173,88 +230,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<executions>
<execution>
<id>deploy-site</id>
<phase>deploy</phase>
<goals>
<goal>publish-scm</goal>
</goals>
<configuration>
<scmBranch>gh-pages</scmBranch>
<skipDeletedFiles>false</skipDeletedFiles>
<checkinComment>Update site</checkinComment>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.doc</groupId>
<artifactId>glassfish-doc-maven-plugin</artifactId>
<version>1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
<version>${jbake.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
<version>${asciidoctorj.version}</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-diagram</artifactId>
<version>${asciidoctorj.diagram.version}</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctorj.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>${asciidoctorj.pdf.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
6 changes: 3 additions & 3 deletions tck/app-openid2/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -143,8 +143,8 @@
<include name="clients.sql" />
</replace>

<copy file="server.xml" todir="${tomcat.dir}/conf"/>
<copy file="localhost-rsa.jks" todir="${tomcat.dir}/conf"/>
<copy file="server.xml" todir="${tomcat.dir}/conf" verbose="true" overwrite="true" force="true"/>
<copy file="localhost-rsa.jks" todir="${tomcat.dir}/conf" verbose="true"/>

<chmod dir="${tomcat.dir}/bin" perm="ugo+rx" includes="*" />

Expand Down
6 changes: 3 additions & 3 deletions tck/app-openid3/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -143,8 +143,8 @@
<include name="clients.sql" />
</replace>

<copy file="server.xml" todir="${tomcat.dir}/conf"/>
<copy file="localhost-rsa.jks" todir="${tomcat.dir}/conf"/>
<copy file="server.xml" todir="${tomcat.dir}/conf" verbose="true" overwrite="true" force="true" />
<copy file="localhost-rsa.jks" todir="${tomcat.dir}/conf" verbose="true" />

<chmod dir="${tomcat.dir}/bin" perm="ugo+rx" includes="*" />

Expand Down

0 comments on commit 1841297

Please sign in to comment.