2 Commits

Author SHA1 Message Date
a0d3fb9633 ENTAXY-374 fix file connection 2022-09-09 11:49:41 +03:00
f495628c75 ENTAXY-374 release 1.8.2 2022-08-25 16:12:26 +03:00
8 changed files with 389 additions and 5 deletions

View File

@ -204,7 +204,8 @@ public class ConnectionInitializer extends AbstractInitializer {
.command("build") .command("build")
.set(EntaxyProducerService.INSTRUCTIONS.ARTIFACT.TIMESTAMP, newTimestamp) .set(EntaxyProducerService.INSTRUCTIONS.ARTIFACT.TIMESTAMP, newTimestamp)
.command("install") .command("install")
.set("update", ""); .set("update", "")
.set("installLocal", true);
String instructions = builder String instructions = builder
.getInstructionsString(); .getInstructionsString();

View File

@ -21,6 +21,7 @@ package ru.entaxy.platform.core.producer.executor.commands;
import java.util.Map; import java.util.Map;
import org.osgi.framework.Constants;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -137,6 +138,13 @@ public class Build extends AbstractCommandExecutor {
} }
} }
artifact.getProperties().putAll(g.getProperties()); artifact.getProperties().putAll(g.getProperties());
// TODO get value from manifest
// ArtifactManifest must be improved to provide read access to all attributes
if (!artifact.getProperties().containsKey(Constants.BUNDLE_SYMBOLICNAME)) {
artifact.getProperties().put(Constants.BUNDLE_SYMBOLICNAME
, artifact.getCoordinates().getGroupId()
+ "." + artifact.getCoordinates().getArtifactId());
}
artifactList.add(artifact); artifactList.add(artifact);
printOutput("\n\t == " + artifact.getCoordinates().toString() + " ==\n"); printOutput("\n\t == " + artifact.getCoordinates().toString() + " ==\n");
printOutput(new String(artifact.asByteArray())); printOutput(new String(artifact.asByteArray()));

View File

@ -90,6 +90,8 @@ public class Install extends AbstractCommandExecutor {
Installer<?> installer = null; Installer<?> installer = null;
String artifactUpdate = update;
printOutput("-> Installing artifact: [" + da.getArtifact().getCoordinates().toString() + "]"); printOutput("-> Installing artifact: [" + da.getArtifact().getCoordinates().toString() + "]");
if (installLocal) { if (installLocal) {
LocalInstaller localInstaller = artifactService.installers().local() LocalInstaller localInstaller = artifactService.installers().local()
@ -110,14 +112,14 @@ public class Install extends AbstractCommandExecutor {
BlueprintInstaller blueprintInstaller = installer.typed(BlueprintInstaller.class); BlueprintInstaller blueprintInstaller = installer.typed(BlueprintInstaller.class);
if (installOnlyIfMissing) if (installOnlyIfMissing)
blueprintInstaller.installOnlyIfMissing(); blueprintInstaller.installOnlyIfMissing();
if (update != null) { if (artifactUpdate != null) {
if (!CommonUtils.isValid(update)) { if (!CommonUtils.isValid(artifactUpdate)) {
update = da artifactUpdate = da
.getArtifact().getProperties() .getArtifact().getProperties()
.getOrDefault(Constants.BUNDLE_SYMBOLICNAME, "") .getOrDefault(Constants.BUNDLE_SYMBOLICNAME, "")
.toString(); .toString();
} }
blueprintInstaller.update(update); blueprintInstaller.update(artifactUpdate);
} }
result = blueprintInstaller.start().install(); result = blueprintInstaller.start().install();
} else { } else {

View File

@ -1437,6 +1437,21 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>public-deploy</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<distributionManagement>
<repository>
<id>entaxy-public-entaxy</id>
<name>entaxy-public-entaxy</name>
<uniqueVersion>false</uniqueVersion>
<layout>default</layout>
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
</repository>
</distributionManagement>
</profile>
</profiles> </profiles>
<build> <build>
@ -1906,4 +1921,68 @@
</repository> </repository>
</repositories> --> </repositories> -->
<repositories>
<!--
contains all used components together with sources and javadocs, proxies Maven Central and Apache
also contains public Entaxy releases & snapshots (snapshots are disabled here)
-->
<repository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!--
contains all Entaxy snaphots and releases, authorized access only
use Maven settins.xml to provide access credentials
-->
<repository>
<id>entaxy-private</id>
<name>entaxy-private</name>
<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

View File

@ -82,6 +82,7 @@
</properties> </properties>
<!-- Comment out the snapshot repositories as we don't need them now --> <!-- Comment out the snapshot repositories as we don't need them now -->
<!--
<repositories> <repositories>
<repository> <repository>
<id>central</id> <id>central</id>
@ -94,7 +95,9 @@
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
</repository> </repository>
-->
<!-- camel-jira --> <!-- camel-jira -->
<!--
<repository> <repository>
<id>atlassian-public</id> <id>atlassian-public</id>
<url>https://packages.atlassian.com/maven-external</url> <url>https://packages.atlassian.com/maven-external</url>
@ -106,7 +109,9 @@
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
</repository> </repository>
-->
<!-- camel-ipfs and camel-weka --> <!-- camel-ipfs and camel-weka -->
<!--
<repository> <repository>
<id>jboss.thirdparty</id> <id>jboss.thirdparty</id>
<name>JBoss Thirdparty Repository</name> <name>JBoss Thirdparty Repository</name>
@ -142,6 +147,7 @@
</releases> </releases>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
-->
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
@ -876,4 +882,69 @@
</profile> </profile>
</profiles> </profiles>
<repositories>
<!--
contains all used components together with sources and javadocs, proxies Maven Central and Apache
also contains public Entaxy releases & snapshots (snapshots are disabled here)
-->
<repository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!--
contains all Entaxy snaphots and releases, authorized access only
use Maven settins.xml to provide access credentials
-->
<repository>
<id>entaxy-private</id>
<name>entaxy-private</name>
<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

View File

@ -745,4 +745,68 @@
</profile> </profile>
</profiles> </profiles>
<repositories>
<!--
contains all used components together with sources and javadocs, proxies Maven Central and Apache
also contains public Entaxy releases & snapshots (snapshots are disabled here)
-->
<repository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!--
contains all Entaxy snaphots and releases, authorized access only
use Maven settins.xml to provide access credentials
-->
<repository>
<id>entaxy-private</id>
<name>entaxy-private</name>
<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

View File

@ -78,6 +78,21 @@
<blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version> <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties> </properties>
</profile> </profile>
<profile>
<id>public-deploy</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<distributionManagement>
<repository>
<id>entaxy-public-entaxy</id>
<name>entaxy-public-entaxy</name>
<uniqueVersion>false</uniqueVersion>
<layout>default</layout>
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
</repository>
</distributionManagement>
</profile>
</profiles> </profiles>
<dependencies> <dependencies>
@ -185,4 +200,68 @@
</plugins> </plugins>
</build> </build>
<repositories>
<!--
contains all used components together with sources and javadocs, proxies Maven Central and Apache
also contains public Entaxy releases & snapshots (snapshots are disabled here)
-->
<repository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!--
contains all Entaxy snaphots and releases, authorized access only
use Maven settins.xml to provide access credentials
-->
<repository>
<id>entaxy-private</id>
<name>entaxy-private</name>
<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

View File

@ -312,5 +312,85 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>public-deploy</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<distributionManagement>
<repository>
<id>entaxy-public-entaxy</id>
<name>entaxy-public-entaxy</name>
<uniqueVersion>false</uniqueVersion>
<layout>default</layout>
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
</repository>
</distributionManagement>
</profile>
</profiles> </profiles>
<repositories>
<!--
contains all used components together with sources and javadocs, proxies Maven Central and Apache
also contains public Entaxy releases & snapshots (snapshots are disabled here)
-->
<repository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!--
contains all Entaxy snaphots and releases, authorized access only
use Maven settins.xml to provide access credentials
-->
<repository>
<id>entaxy-private</id>
<name>entaxy-private</name>
<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>entaxy-public</id>
<name>entaxy-public</name>
<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>