Skip to content

Commit

Permalink
[BACKLOG-36213] Merge no-osgi feature branch to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@ricksjames @peterrinehart
ricksjames authored and peterrinehart committed Aug 22, 2022
1 parent 59d4ca8 commit df3fdb1
Show file tree
Hide file tree
Showing 1,193 changed files with 45,341 additions and 40,337 deletions.
382 changes: 204 additions & 178 deletions assemblies/client/pom.xml
View file

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions assemblies/client/src/assemblies/assembly-no-osgi.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>no-osgi</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>data-integration</baseDirectory>
<componentDescriptors>
<componentDescriptor>src/assembly-common/component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
18 changes: 18 additions & 0 deletions assemblies/client/src/assemblies/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>client</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>data-integration</baseDirectory>
<componentDescriptors>
<componentDescriptor>src/assembly-common/component.xml</componentDescriptor>
</componentDescriptors>
<files>
<file>
<source>${project.basedir}/src/main/resources/drivers/README</source>
<outputDirectory>./drivers</outputDirectory>
</file>
</files>
</assembly>
17 changes: 2 additions & 15 deletions assemblies/client/src/assembly/assembly.xml → .../client/src/assembly-common/component.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>client</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>data-integration</baseDirectory>
<files>
<file>
<source>${project.basedir}/src/main/resources/drivers/README</source>
<outputDirectory>./drivers</outputDirectory>
</file>
</files>
<component>
<fileSets>
<!-- the staging dir -->
<fileSet>
Expand Down Expand Up @@ -106,4 +93,4 @@
<outputFileNameMapping>launcher.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>
</component>
221 changes: 156 additions & 65 deletions assemblies/core/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<pdi-dataservice-driver-bundle.version>${project.version}</pdi-dataservice-driver-bundle.version>
<ael.version>9.4.0.0-SNAPSHOT</ael.version>

<pentaho-karaf.version>9.4.0.0-SNAPSHOT</pentaho-karaf.version>
<pentaho-launcher.version>9.4.0.0-SNAPSHOT</pentaho-launcher.version>
<oss-licenses.version>9.4.0.0-SNAPSHOT</oss-licenses.version>

Expand All @@ -32,43 +31,6 @@
</properties>

<dependencies>
<!-- PDI Assemblies -->
<dependency>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core-static</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core-libs</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hitachivantara.karaf.assemblies</groupId>
<artifactId>client</artifactId>
<version>${pentaho-karaf.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>pentaho</groupId>
<artifactId>pdi-dataservice-driver-bundle</artifactId>
Expand Down Expand Up @@ -138,32 +100,161 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>add-karaf</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.hitachivantara.karaf.assemblies</groupId>
<artifactId>client</artifactId>
<type>zip</type>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly.dir}/system/karaf</outputDirectory>
<excludes>**/etc-pan/*.cfg,**/etc-kitchen/*.cfg,**/etc-scale/*.cfg,system/org/pentaho/hadoop/shims/</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>standard</id>
<activation>
<property>
<name>!no-osgi</name>
</property>
</activation>
<properties>
<pentaho-karaf.version>9.4.0.0-SNAPSHOT</pentaho-karaf.version>
</properties>
<dependencies>
<!-- PDI Assemblies -->
<dependency>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core-static</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core-libs</artifactId>
<version>${project.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hitachivantara.karaf.assemblies</groupId>
<artifactId>client</artifactId>
<version>${pentaho-karaf.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>add-karaf</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.hitachivantara.karaf.assemblies</groupId>
<artifactId>client</artifactId>
<type>zip</type>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly.dir}/system/karaf</outputDirectory>
<excludes>**/etc-pan/*.cfg,**/etc-kitchen/*.cfg,**/etc-scale/*.cfg,system/org/pentaho/hadoop/shims/</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assembly_package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${basedir}/src/assemblies/assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>no-osgi</id>
<activation>
<property>
<name>no-osgi</name>
</property>
</activation>
<dependencies>
<!-- PDI Assemblies -->
<dependency>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core-static</artifactId>
<version>${project.version}</version>
<classifier>no-osgi</classifier>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.di</groupId>
<artifactId>pdi-core-libs</artifactId>
<version>${project.version}</version>
<classifier>no-osgi</classifier>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assembly_package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${basedir}/src/assemblies/assembly-no-osgi.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
12 changes: 12 additions & 0 deletions assemblies/core/client/src/assemblies/assembly-no-osgi.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>no-osgi</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>data-integration</baseDirectory>
<componentDescriptors>
<componentDescriptor>src/assembly-common/component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
18 changes: 18 additions & 0 deletions assemblies/core/client/src/assemblies/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>pdi-core-ce</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>data-integration</baseDirectory>
<componentDescriptors>
<componentDescriptor>src/assembly-common/component.xml</componentDescriptor>
</componentDescriptors>
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
15 changes: 2 additions & 13 deletions ...ies/core/client/src/assembly/assembly.xml → .../client/src/assembly-common/component.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>pdi-core-ce</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>data-integration</baseDirectory>
<component>
<fileSets>
<!-- the staging dir -->
<fileSet>
<directory>${assembly.dir}</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<!-- pdi components -->
Expand Down Expand Up @@ -101,4 +90,4 @@
<outputFileNameMapping>launcher.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>
</component>
Loading

0 comments on commit df3fdb1

Please sign in to comment.