Skip to content

Commit

Permalink
Add api#identity#auth#v1.1.war from identity-local-auth-api, as a new…
Browse files Browse the repository at this point in the history
… feature module.
  • Loading branch information
RusJaI committed Feb 29, 2024
1 parent 0000e98 commit 83a55c3
Show file tree
Hide file tree
Showing 5 changed files with 182 additions and 0 deletions.
11 changes: 11 additions & 0 deletions modules/distribution/product/src/main/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,17 @@
<include>client-registration#v0.17.war</include>
</includes>
</fileSet>
<fileSet>
<directory>
../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
</outputDirectory>
<includes>
<include>api#identity#auth#v1.1.war</include>
</includes>
</fileSet>



<!-- Copy sample calculator api webapp-->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
~
~ WSO2 LLC. 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
~
~ 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/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>am-features</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>org.wso2.carbon.identity.local.auth.api.endpoint.feature</artifactId>
<packaging>pom</packaging>
<name>WSO2 Identity - Authentication REST API Endpoint Feature</name>
<description>WSO2 Identity - Authentication REST API endpoint Feature</description>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
<configuration>
<skip>true</skip>
</configuration>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wso2.carbon.identity.local.auth.api</groupId>
<artifactId>org.wso2.carbon.identity.local.auth.api.endpoint</artifactId>
<version>${org.wso2.carbon.identity.local.auth.api.version}</version>
<overWrite>true</overWrite>
<type>war</type>
<outputDirectory>${basedir}/src/main/resources/</outputDirectory>
<destFileName>api#identity#auth#v1.1.war</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>src/main/resources</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
<includes>
<include>api#identity#auth#v1.1.war</include>
<include>p2.inf</include>
<include>build.properties</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<id>p2-feature-generation</id>
<phase>package</phase>
<goals>
<goal>p2-feature-gen</goal>
</goals>
<configuration>
<id>org.wso2.carbon.identity.local.auth.api.endpoint</id>
<propertiesFile>../etc/feature.properties</propertiesFile>
<adviceFile>
<properties>
<propertyDef>org.wso2.carbon.p2.category.type:server
</propertyDef>
<propertyDef>org.eclipse.equinox.p2.type.group:false
</propertyDef>
</properties>
</adviceFile>
<bundles>
<bundleDef>
org.wso2.carbon.identity.local.auth.api:org.wso2.carbon.identity.local.auth.api.core:${org.wso2.carbon.identity.local.auth.api.version}
</bundleDef>
</bundles>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.wso2.carbon.identity.local.auth.api</groupId>
<artifactId>org.wso2.carbon.api.server.local.auth.api</artifactId>
<version>${org.wso2.carbon.identity.local.auth.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.local.auth.api</groupId>
<artifactId>org.wso2.carbon.identity.local.auth.api.core</artifactId>
<version>${org.wso2.carbon.identity.local.auth.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.local.auth.api</groupId>
<artifactId>org.wso2.carbon.identity.local.auth.api.endpoint</artifactId>
<type>war</type>
<version>${org.wso2.carbon.identity.local.auth.api.version}</version>
</dependency>

</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
instructions.configure = \
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.local.auth.api.endpoint_${feature.version}/api#identity#auth#v1.1.war,target:${installFolder}/../../deployment/server/webapps/api#identity#auth#v1.1.war,overwrite:true);\
7 changes: 7 additions & 0 deletions modules/p2-profile/product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@
<featureArtifactDef>
org.wso2.am:org.wso2.am.security.feature:${apimserver.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.am:org.wso2.carbon.identity.local.auth.api.endpoint.feature:${apimserver.version}
</featureArtifactDef>

<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.cache.invalidation.feature:${carbon.apimgt.version}
Expand Down Expand Up @@ -1030,6 +1033,10 @@
<id>org.wso2.carbon.identity.data.publisher.application.authentication.server.feature.group</id>
<version>${carbon.identity-data-publisher-application-authentication.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.local.auth.api.endpoint.feature.group</id>
<version>${apimserver.version}</version>
</feature>


<feature>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,7 @@
<carbon.identity-data-publisher-oauth.version>1.6.10</carbon.identity-data-publisher-oauth.version>
<carbon.identity-user-ws.version>5.7.5</carbon.identity-user-ws.version>
<carbon.identity-inbound-auth-openid.version>5.9.8</carbon.identity-inbound-auth-openid.version>
<org.wso2.carbon.identity.local.auth.api.version>2.5.6</org.wso2.carbon.identity.local.auth.api.version>
<carbon.identity-local-auth-basicauth.version>6.7.32</carbon.identity-local-auth-basicauth.version>
<carbon.identity-outbound-auth-samlsso.version>5.8.11</carbon.identity-outbound-auth-samlsso.version>
<carbon.identity-metadata-saml2.version>1.7.70</carbon.identity-metadata-saml2.version>
Expand Down

0 comments on commit 83a55c3

Please sign in to comment.