Benoker · joao-bolsson · Nov 4, 2020 · Mar 15, 2021 · Mar 18, 2021 · Mar 18, 2021
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .svn
 .project
-.classpath
+.classpath/
 .settings/
 
 bin/
@@ -9,6 +9,7 @@ logs/
 
 release.properties
 pom.xml.releaseBackup
+pom.xml.versionsBackup
 
 # TeX binaries and editor files
 docking-frames-common/guide/Guide.dvi

diff --git a/README.md b/README.md
@@ -134,3 +134,26 @@ just add to your pom.xml:
 
 be sure to use latest &lt;version>
 
+## Build and Deploy Artifact as a Bundle
+
+1. Edit the root `pom.xml` to set the property `toolsJar` to point to a JDK 1.8 tools.jar inside lib folder, 
+   if needed.
+
+2. Set desired version at the root of the project with:
+    ```
+    mvn -DnewVersion=YOUR_VERSION versions:set
+    ```
+
+3. Edit the file `build-package/build.sh` and set the variable `JAVA_HOME` accordingly.
+
+4. Go to the folder `build-package`, using a command prompt, and type `./build.sh`. The final bundle will be
+   generated at `build-package/target`.
+
+5. Edit the file `build-package/deploy.sh` to set:
+
+   a. `JAVA_HOME` accordingly. 
+   b. `repositoryId` to `main` for a final release, or `main-dev` for a SNAPSHOT. 
+   c. `url` to the Archiva repository URL.
+
+6. In the same folder run `./deploy.sh` to send final bundle to Archiva.
+
diff --git a/build-package/build.sh b/build-package/build.sh
@@ -0,0 +1,18 @@
+
+export JAVA_HOME=/home/riss/apps/jdk1.8.0_261
+
+mvn clean
+mvn source:jar install -f ../docking-frames-core
+mvn source:jar install -f ../docking-frames-common
+
+VERSION=`mvn -f ../pom.xml org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['`
+echo "New version: $VERSION"
+read
+mvn -DallowSnapshots=true -DparentVersion=[$VERSION] versions:update-parent
+mvn versions:set -DnewVersion=${VERSION} -f pom
+
+mvn clean install
+mvn install -f pom
+
+mvn versions:commit
+mvn versions:commit -f pom
diff --git a/build-package/deploy.sh b/build-package/deploy.sh
@@ -0,0 +1,4 @@
+
+export JAVA_HOME=/home/riss/apps/jdk1.8.0_261
+
+mvn -DpomFile=pom/pom.xml -Dsources=target/docking-frames-sources.jar -Dfile=target/docking-frames.jar -DrepositoryId=main-dev -Durl="ARCHIVA_URL" deploy:deploy-file
diff --git a/build-package/dist.xml b/build-package/dist.xml
@@ -0,0 +1,20 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>sources</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*:sources</include>
+            </includes>
+            <unpack>true</unpack>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/build-package/pom.xml b/build-package/pom.xml
@@ -0,0 +1,91 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dockingframes</groupId>
+        <artifactId>docking-frames-base</artifactId>
+        <version>1.1.3p1-an1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.weasis.thirdparty</groupId>
+    <artifactId>docking-frames</artifactId>
+    <packaging>bundle</packaging>
+    <name>Docking Frames</name>
+    <url>http://dock.javaforge.com</url>
+    <properties>
+        <bundle.symbolicName>${project.artifactId}</bundle.symbolicName>
+        <bundle.namespace>bibliothek</bundle.namespace>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>4.2.1</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <obrRepository>NONE</obrRepository>
+                    <instructions>
+                        <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+                        <_removeheaders>
+                            Bnd-LastModified,Include-Resource,Private-Package,Tool,Built-By,Build-Jdk,Created-By
+                        </_removeheaders>
+                        <_nouses>true</_nouses>
+                        <Import-Package>*</Import-Package>
+                        <Export-Package>${bundle.namespace}.*</Export-Package>
+                        <Embed-Dependency>*;scope=provided;inline=true</Embed-Dependency>
+                        <Embed-StripGroup>true</Embed-StripGroup>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>dist.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.dockingframes</groupId>
+            <artifactId>docking-frames-core</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dockingframes</groupId>
+            <artifactId>docking-frames-common</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dockingframes</groupId>
+            <artifactId>docking-frames-core</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.dockingframes</groupId>
+            <artifactId>docking-frames-common</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/build-package/pom/pom.xml b/build-package/pom/pom.xml
@@ -0,0 +1,11 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.weasis.thirdparty</groupId>
+    <artifactId>docking-frames</artifactId>
+    <version>1.1.3p1-an1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Docking Frames</name>
+    <url>http://dock.javaforge.com</url>
+</project>
diff --git a/docking-frames-common/pom.xml b/docking-frames-common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.dockingframes</groupId>
 		<artifactId>docking-frames-base</artifactId>
-		<version>1.1.3p1</version>
+		<version>1.1.3p1-an1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>docking-frames-common</artifactId>
@@ -22,4 +22,8 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 </project>
diff --git a/docking-frames-core/pom.xml b/docking-frames-core/pom.xml
@@ -5,44 +5,17 @@
 	<parent>
 		<groupId>org.dockingframes</groupId>
 		<artifactId>docking-frames-base</artifactId>
-        <version>1.1.3p1</version>
+        <version>1.1.3p1-an1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>docking-frames-core</artifactId>
 	<packaging>jar</packaging>
 
 	<name>${project.artifactId}</name>
 	<description>${project.name} is a core library</description>
-
-    <profiles>
-        <profile>
-            <activation>
-                <!-- This profile is activated when jdk >= 1.6 -->
-                <jdk>[1.6,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.7</version>
-                        <executions>
-                            <execution>
-                                <id>add-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src-j6</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                   </plugin>
-               </plugins>
-            </build>
-        </profile>
-    </profiles>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 </project>
diff --git a/...es-core/src-j6/bibliothek/gui/dock/station/stack/DefaultDndAutoSelectStrategyRequest.java b/...es-core/src-j6/bibliothek/gui/dock/station/stack/DefaultDndAutoSelectStrategyRequest.java