Skip to content

Commit

Permalink
Merge pull request #342 from dmatej/master-version
Browse files Browse the repository at this point in the history
Master version was still 3.0.0-SNAPSHOT
  • Loading branch information
arjantijms authored Nov 12, 2022
2 parents 64ce56d + 6e39028 commit 24a427c
Show file tree
Hide file tree
Showing 30 changed files with 68 additions and 71 deletions.
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.soteria</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>jakarta.security.enterprise</artifactId>
Expand All @@ -38,10 +38,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.4</version>
<version>5.1.6</version>
<extensions>true</extensions>
<configuration>
<instructions>
<_noimportjava>true</_noimportjava>
<_runee>JavaSE-11</_runee>
<Bundle-SymbolicName>org.glassfish.jakarta.security.enterprise</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Name>Soteria Jakarta Security Implementation ${project.version}</Bundle-Name>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.glassfish.soteria</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<description>Security Soteria - the Reference Implementation of JSR 375</description>
Expand Down Expand Up @@ -102,19 +102,19 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.0</version>
<version>5.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0.0</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>jakarta.authentication</groupId>
Expand All @@ -137,7 +137,7 @@
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>4.0.0</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -156,7 +156,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.21</version>
<version>9.23</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -233,7 +233,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-api-javadocs</id>
Expand Down
2 changes: 1 addition & 1 deletion spi/bean-decorator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.glassfish.soteria</groupId>
<artifactId>spi</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>spi-bean-decorator</artifactId>
Expand Down
14 changes: 10 additions & 4 deletions spi/bean-decorator/weld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.glassfish.soteria</groupId>
<artifactId>spi-bean-decorator</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>soteria.spi.bean.decorator.weld</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-osgi-bundle</artifactId>
<version>5.0.0.CR2</version>
<version>5.0.1.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.4</version>
<version>5.1.6</version>
<extensions>true</extensions>
<executions>
<execution>
Expand All @@ -67,6 +67,12 @@
</goals>
</execution>
</executions>
<configuration>
<instructions>
<_noimportjava>true</_noimportjava>
<_runee>JavaSE-11</_runee>
</instructions>
</configuration>
</plugin>

<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
Expand All @@ -91,7 +97,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-api-javadocs</id>
Expand Down
2 changes: 1 addition & 1 deletion spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.soteria</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>spi</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions test/app-custom-identity-store-handler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-custom-identity-store-handler</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions test/app-custom-rememberme/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-custom-rememberme</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions test/app-custom-session/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-custom-session</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions test/app-custom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-custom</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions test/app-db/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-db</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions test/app-jaxrs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-jaxrs</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions test/app-ldap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-ldap</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions test/app-ldap2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions test/app-ldap3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion test/app-mem-basic-decorate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-mem-basic-decorate</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions test/app-mem-basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-mem-basic</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions test/app-mem-customform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-mem-customform</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.faces</groupId>
Expand Down
4 changes: 2 additions & 2 deletions test/app-mem-form/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>app-mem-form</artifactId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
Loading

0 comments on commit 24a427c

Please sign in to comment.