This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch flatcp in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit f7f57f63fe3d14345a784dd4a836ea62c08efee2 Author: David Bosschaert <[email protected]> AuthorDate: Thu Sep 12 13:01:11 2024 +0100 Generate flat classpath version --- sling-mini/launch-fullweb.sh | 18 ++++++ sling-mini/pom.xml | 149 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 151 insertions(+), 16 deletions(-) diff --git a/sling-mini/launch-fullweb.sh b/sling-mini/launch-fullweb.sh new file mode 100755 index 00000000..e908607b --- /dev/null +++ b/sling-mini/launch-fullweb.sh @@ -0,0 +1,18 @@ +pushd target +rm -rf launcher +# java -agentlib:jdwp=transport=dt_socket,address=*:7777,server=y,suspend=y \ +java \ +-cp "artifacts/org/apache/sling/org.apache.sling.feature.launcher.atomos/0.0.1-SNAPSHOT/org.apache.sling.feature.launcher.atomos-0.0.1-SNAPSHOT.jar:\ +artifacts/org/apache/sling/org.apache.sling.feature.launcher/1.2.4/org.apache.sling.feature.launcher-1.2.4.jar:\ +artifacts/org/apache/felix/org.apache.felix.atomos/1.0.1-SNAPSHOT/org.apache.felix.atomos-1.0.1-SNAPSHOT.jar:\ +artifacts/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar:\ +artifacts/org/apache/sling/org.apache.sling.feature/1.3.0/org.apache.sling.feature-1.3.0.jar:\ +artifacts/org/apache/felix/org.apache.felix.cm.json/1.0.6/org.apache.felix.cm.json-1.0.6.jar:\ +artifacts/commons-cli/commons-cli/1.4/commons-cli-1.4.jar:\ +artifacts/org/apache/felix/org.apache.felix.framework/7.0.5/org.apache.felix.framework-7.0.5.jar:\ +/Users/david/.m2/repository/org/apache/sling/org.apache.sling.commons.johnzon/1.2.16/org.apache.sling.commons.johnzon-1.2.16.jar:\ +artifacts/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar:\ +atomos-config/app.substrate.jar" \ +org.apache.sling.feature.launcher.impl.Main \ +-f file:///Users/david/clones/sling-whiteboard_2/sling-mini/target/slingfeature-tmp/feature-fullwebapp.json +popd diff --git a/sling-mini/pom.xml b/sling-mini/pom.xml index 7aafe867..d9edead0 100644 --- a/sling-mini/pom.xml +++ b/sling-mini/pom.xml @@ -33,11 +33,21 @@ <project.build.outputTimestamp>1</project.build.outputTimestamp> <sourceDir>/tmp/docs</sourceDir> <targetDir>/tmp/offliner</targetDir> + <!-- <feature>offlineapp</feature> + --> + <feature>fullwebapp</feature> </properties> <build> <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> <plugin> <groupId>org.apache.sling</groupId> <artifactId>slingfeature-maven-plugin</artifactId> @@ -105,6 +115,72 @@ <goals> <goal>repository</goal> </goals> + <configuration> + <repositories> + <repository> + <filesInclude>**/*.*</filesInclude> + <embedArtifacts> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.feature.launcher.atomos</artifactId> + <version>0.0.1-SNAPSHOT</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.feature.launcher</artifactId> + <version>1.2.4</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>8.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>7.0.5</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.atomos</artifactId> + <version>1.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>1.10.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.12.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.25</version> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.feature</artifactId> + <version>1.3.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.cm.json</artifactId> + <version>1.0.6</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.4</version> + </dependency> + </embedArtifacts> + </repository> + </repositories> + </configuration> </execution> </executions> <configuration> @@ -140,30 +216,71 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> + <version>3.1.0</version> <executions> + <!-- run with mvn exec:exec@run-launcher --> + <!-- + <execution> + <id>run-launcher</id> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${basedir}/target/org.apache.sling.feature.launcher-${launcher.version}/bin/launcher</executable> + <arguments> + <argument>-f</argument> + <argument>mvn:${project.groupId}/${project.artifactId}/${project.version}/slingosgifeature/${feature}</argument> + <argument>-p</argument> + <argument>target/launcher</argument> + <argument>-c</argument> + <argument>target/launcher/cache</argument> + <argument>-D</argument> + <argument>SOURCE_DIR=${sourceDir}</argument> + <argument>-D</argument> + <argument>TARGET_DIR=${targetDir}</argument> + </arguments> + </configuration> + </execution> + --> <execution> <goals> <goal>exec</goal> </goals> + <phase>package</phase> </execution> </executions> - <configuration> - <executable>${basedir}/target/org.apache.sling.feature.launcher-${launcher.version}/bin/launcher</executable> - <arguments> - <argument>-f</argument> - <argument>mvn:${project.groupId}/${project.artifactId}/${project.version}/slingosgifeature/${feature}</argument> - <argument>-p</argument> - <argument>target/launcher</argument> - <argument>-c</argument> - <argument>target/launcher/cache</argument> - <argument>-D</argument> - <argument>SOURCE_DIR=${sourceDir}</argument> - <argument>-D</argument> - <argument>TARGET_DIR=${targetDir}</argument> - </arguments> - </configuration> + <configuration> + <executable>java</executable> + <arguments> + <argument>-jar</argument> + <classpath> + <dependency>org.apache.sling:org.apache.sling.feature.launcher.atomos.config</dependency> + </classpath> + <argument>-u</argument> + <argument>file:${build.directory}/artifacts</argument> + <argument>-f</argument> + <argument>file:${build.directory}/slingfeature-tmp/feature-fullwebapp.json</argument> + </arguments> + <inheritIo>true</inheritIo> + <addOutputToClasspath>false</addOutputToClasspath> + <workingDirectory>${build.directory}</workingDirectory> + </configuration> </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.feature.launcher.atomos.config</artifactId> + <version>0.0.1-SNAPSHOT</version> + <classifier>fatjar</classifier> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </project>
