# Common
qualifier=.next
--include: -${workspace}/cnf/release.bnd
Bundle-Version: ${version.released}${qualifier}
Private-Package: *.internal.*
-source true
-removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
Automatic-Module-Name: ${bsn}
+SLC-Category=${category}
+-groupid=${category}
-include: \
${workspace}/cnf/unstable.bnd, \
-${workspace}/cnf/argeo.bnd
-
-SLC-Category: org.argeo.commons
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+${workspace}/cnf/argeo.bnd, \
+-${workspace}/cnf/release.bnd
--- /dev/null
+-include: \
+../cnf/unstable.bnd, \
+../cnf/argeo.bnd
-version.released=2.3.1
\ No newline at end of file
+category=org.argeo.commons
+version.released=2.3.1
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
+++ /dev/null
--include: ../../cnf/build.bnd
\ No newline at end of file
--- /dev/null
+-include: ../../cnf/maven.bnd
\ No newline at end of file
</modules>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../cnf/unstable.bnd</file>
+ </files>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
<module>argeo-node</module>
<module>containers</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../cnf/unstable.bnd</file>
+ </files>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
<properties>
<version.argeo-tp>2.1.27</version.argeo-tp>
<!-- RPM -->
- <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
<project.scm.id>code.argeo.org</project.scm.id>
</properties>
<modules>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>argeo-commons-a2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="argeo-commons-upstream">
+ <locations>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache.commons" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache.felix" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.apache.jackrabbit" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.bouncycastle" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.equinox" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.jackson" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.javax" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.jetty" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.misc" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.rap.e4" type="Directory"/>
+ <location path="${project_loc:argeo-commons-unstable}/sdk/a2/upstream/org.argeo.tp.sdk" type="Directory"/>
+ </locations>
+</target>
\ No newline at end of file
--- /dev/null
+*.*/
+index.xml
\ No newline at end of file
--- /dev/null
+*.*/
+index.xml
\ No newline at end of file
#!/bin/bash
+# TODO source files and allow to override
+A2_CATEGORY=org.argeo.commons
+
# Works on Fedora 34
JVM=/usr/lib/jvm/jre-11/bin/java
ECJ_JAR=/usr/share/java/ecj/ecj.jar
OSGI_JAR=/usr/share/java/eclipse/osgi.jar
+SDK_DIR="$(cd "$(dirname "$0")"; pwd -P)"
+echo SDK: $SDK_DIR
+BUNDLES_BASEDIR="$(cd "$SDK_DIR/.."; pwd -P)"
+A2_UPSTREAM="$(cd "$SDK_DIR/a2/upstream"; pwd -P)"
+A2_BUILD="$(cd "$SDK_DIR/a2/build"; pwd -P)"
+
echo PREPARING
SOURCE_PATH=
-for bundle in ../*.*.*/ ; do
+for bundle in $BUNDLES_BASEDIR/*.*.*/ ; do
echo $bundle
# clean
rm -rf $bundle/generated/*
done
echo COMPILING
-$JVM -jar $ECJ_JAR @ecj.args -time -cp $OSGI_JAR:"$(printf %s: target/sdk-*-a2-target/*/*.jar)" $SOURCE_PATH
+$JVM -jar $ECJ_JAR @$SDK_DIR/ecj.args -time -cp $OSGI_JAR:"$(printf %s: $A2_UPSTREAM/*/*.jar)" $SOURCE_PATH
echo PACKAGING
-bnd build
+bnd -b $SDK_DIR build
-mkdir -p target/a2/org.argeo.commons
-cp ../*/generated/*.jar target/a2/org.argeo.commons
+mkdir -p $A2_BUILD/$A2_CATEGORY
+mv $BUNDLES_BASEDIR/*/generated/*.jar $A2_BUILD/$A2_CATEGORY
+bnd index -d $A2_BUILD/ */*.jar
-echo DONE
\ No newline at end of file
+echo DONE
--- /dev/null
+#!/bin/sh
+
+SDK_DIR="$(cd "$(dirname "$0")"; pwd -P)"
+A2_UPSTREAM="$(cd "$SDK_DIR/a2/upstream"; pwd -P)"
+
+
+mvn -f $SDK_DIR clean assembly:single -Pa2-provided
+rsync -rv $SDK_DIR/target/sdk-*-a2-provided/ $A2_UPSTREAM
+bnd index -d $A2_UPSTREAM/ */*.jar
+