Skip to content

Commit

Permalink
[JBWS-4349]:Create jbossws galleon feature pack
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimma
jimma committed Apr 6, 2023
1 parent d6fc828 commit e17ccdf
Show file tree
Hide file tree
Showing 22 changed files with 227 additions and 325 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Build WFLY
if: ${{ matrix.profile == '-Pwildfly28'}}
working-directory: ./wildfly
run: mvn -s ../.m2-settings.xml -DskipTests=true '-Denforcer.skip=true' -Prelease clean install
run: mvn -DskipTests=true '-Denforcer.skip=true' -Prelease clean install
- name: Build with Maven Java ${{ matrix.java }} ${{ matrix.profile }}
run: |
mvn -s ./.m2-settings.xml -fae ${{ matrix.profile }} clean install
Expand Down
22 changes: 0 additions & 22 deletions .m2-settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,6 @@
</repositories>

<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>http://central</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>central-maven2</id>
<name>Central maven2 repository proxy</name>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
Expand Down
129 changes: 16 additions & 113 deletions modules/dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,67 +17,20 @@

<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<version>${jboss.version}</version>
<type>zip</type>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-transports-undertow</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-transports-udp</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-feature-pack</artifactId>
<version>${project.version}</version>
<type>zip</type>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common-tools</artifactId>
<scope>provided</scope>
</dependency>

<!-- OpenSAML -->
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-impl</artifactId>
<scope>provided</scope>
</dependency>
<!--junit-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -124,6 +77,12 @@
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<version>${jboss.version}</version>
<inherit-configs>true</inherit-configs>
</feature-pack>
<feature-pack>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-feature-pack</artifactId>
<version>${project.version}</version>
<inherit-configs>false</inherit-configs>
</feature-pack>
</feature-packs>
Expand Down Expand Up @@ -158,62 +117,6 @@
<jboss.home>${project.build.directory}/wildfly-${jboss.version}</jboss.home>
</properties>
</profile>
<!--
Name: deploy
Descr: Deploy stack on WildFly instance
-->
<profile>
<id>deploy</id>
<activation>
<property>
<name>!nodeploy</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>distribution-package</id>
<phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>assembly</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>deploy</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="jboss.home" value="${jboss.home}" />
<ant antfile="src/main/scripts/build-deploy.xml" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<!--
Name: echo
Expand Down
49 changes: 0 additions & 49 deletions modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/sts/main/module.xml
View file

This file was deleted.

37 changes: 0 additions & 37 deletions modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsconsume/main/module.xml
View file

This file was deleted.

37 changes: 0 additions & 37 deletions modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsprovide/main/module.xml
View file

This file was deleted.

Loading

0 comments on commit e17ccdf

Please sign in to comment.