1 Commits

Author SHA1 Message Date
1061b96c7e ENTAXY-374 release 1.8.2 2022-08-23 15:55:41 +03:00
8 changed files with 5 additions and 389 deletions

View File

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

View File

@ -21,7 +21,6 @@ package ru.entaxy.platform.core.producer.executor.commands;
import java.util.Map;
import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -138,13 +137,6 @@ public class Build extends AbstractCommandExecutor {
}
}
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);
printOutput("\n\t == " + artifact.getCoordinates().toString() + " ==\n");
printOutput(new String(artifact.asByteArray()));

View File

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

View File

@ -1437,21 +1437,6 @@
</plugins>
</build>
</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>
<build>
@ -1921,68 +1906,4 @@
</repository>
</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>

View File

@ -82,7 +82,6 @@
</properties>
<!-- Comment out the snapshot repositories as we don't need them now -->
<!--
<repositories>
<repository>
<id>central</id>
@ -95,9 +94,7 @@
<enabled>true</enabled>
</releases>
</repository>
-->
<!-- camel-jira -->
<!--
<repository>
<id>atlassian-public</id>
<url>https://packages.atlassian.com/maven-external</url>
@ -109,9 +106,7 @@
<enabled>true</enabled>
</releases>
</repository>
-->
<!-- camel-ipfs and camel-weka -->
<!--
<repository>
<id>jboss.thirdparty</id>
<name>JBoss Thirdparty Repository</name>
@ -147,7 +142,6 @@
</releases>
</pluginRepository>
</pluginRepositories>
-->
<build>
<defaultGoal>install</defaultGoal>
@ -882,69 +876,4 @@
</profile>
</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>

View File

@ -745,68 +745,4 @@
</profile>
</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>

View File

@ -78,21 +78,6 @@
<blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</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>
<dependencies>
@ -200,68 +185,4 @@
</plugins>
</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>

View File

@ -312,85 +312,5 @@
</plugins>
</build>
</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>
<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>