Skip to content

Commit

Permalink
Merge pull request #122 from arjantijms/update_versions
Browse files Browse the repository at this point in the history 
Set main version to 3.0.0 and update dependencies in pom
  • Loading branch information
@arjantijms
arjantijms committed Nov 28, 2021
2 parents f07b13a + 4e34fe8 commit d565138
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 24 deletions.
25 changes: 13 additions & 12 deletions api/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) 2020, 2021 Contributors to Eclipse Foundation. All rights reserved.
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -29,7 +30,7 @@

<groupId>jakarta.authentication</groupId>
<artifactId>jakarta.authentication-api</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>

<name>Jakarta Authentication</name>
<description>
Expand Down Expand Up @@ -99,8 +100,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<build>
Expand Down Expand Up @@ -138,11 +139,11 @@
</resource>
</resources>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<!-- Sets minimal Maven version to 3.6.0 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -152,7 +153,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
Expand All @@ -165,8 +166,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
Expand All @@ -178,7 +179,7 @@
<version>2.1</version>
<configuration>
<spec>
<specVersion>2.0</specVersion>
<specVersion>3.0</specVersion>
<specImplVersion>${project.version}</specImplVersion>
<apiPackage>jakarta.security.auth.message</apiPackage>
</spec>
Expand All @@ -197,7 +198,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.1</version>
<version>5.1.2</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
Expand Down Expand Up @@ -250,7 +251,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-api-javadocs</id>
Expand All @@ -266,7 +267,7 @@
<header><![CDATA[<br>Jakarta Authentication API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:jaspic-dev@eclipse.org">jaspic-dev@eclipse.org</a>.<br>
Copyright &#169; 2020 Eclipse Foundation. All rights reserved.<br>
Copyright &#169; 2020, 2021 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
<docfilessubdirs>true</docfilessubdirs>
Expand Down
13 changes: 7 additions & 6 deletions 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) 2020, 2021 Contributors to Eclipse Foundation. All rights reserved.
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -28,7 +29,7 @@

<groupId>org.eclipse.ee4j.authentication</groupId>
<artifactId>authentication-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jakarta Authentication</name>
Expand Down Expand Up @@ -70,17 +71,17 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<build>
<plugins>
<!-- Sets minimal Maven version to 3.5.4 -->
<!-- Sets minimal Maven version to 3.6.0 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -90,7 +91,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
19 changes: 13 additions & 6 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020, 2021 Contributors to Eclipse Foundation. All rights reserved.
Copyright (c) 2019-2020 Contributors to the Eclipse Foundation.
This program and the accompanying materials are made available under the
Expand All @@ -21,7 +23,7 @@
<parent>
<groupId>org.eclipse.ee4j.authentication</groupId>
<artifactId>authentication-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>authentication-spec</artifactId>
Expand All @@ -44,9 +46,9 @@
<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctorj.version>2.4.0</asciidoctorj.version>
<asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<jruby.version>9.2.13.0</jruby.version>
<asciidoctorj.version>2.5.2</asciidoctorj.version>
<asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version>
<jruby.version>9.3.1.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 All @@ -63,7 +65,7 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.0.0-RC.1</version>
<version>2.2.1</version>
<dependencies>
<dependency>
<groupId>org.jruby</groupId>
Expand All @@ -90,8 +92,11 @@
</goals>
<configuration>
<backend>html5</backend>
<sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
<outputFile>${project.build.directory}/generated-docs/jakarta-authentication-spec-${spec.version}.html</outputFile>
<attributes>
<source-highlighter>coderay</source-highlighter>
<imagesdir>images</imagesdir>
<doctype>book</doctype>
<status>${status}</status>
<data-uri />
Expand All @@ -113,8 +118,11 @@
</goals>
<configuration>
<backend>pdf</backend>
<sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
<outputFile>${project.build.directory}/generated-docs/jakarta-authentication-spec-${spec.version}.pdf</outputFile>
<attributes>
<source-highlighter>coderay</source-highlighter>
<imagesdir>images</imagesdir>
<pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir>
<pdf-style>jakartaee</pdf-style>
<doctype>book</doctype>
Expand All @@ -135,7 +143,6 @@
</executions>
<configuration>
<sourceDocumentName>authentication-spec.adoc</sourceDocumentName>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<revnumber>${spec.version}</revnumber>
<revremark>${status}</revremark>
Expand Down

0 comments on commit d565138

Please sign in to comment.