From 2da99281c55824a810041b866d2b3ebb41c7e379 Mon Sep 17 00:00:00 2001 From: Wercker Release Date: Thu, 30 Aug 2018 15:39:02 +0000 Subject: [PATCH 1/2] Release v1.0.0 --- pom.xml | 2 +- pom.xml.versionsBackup | 130 ++++++ .../pom.xml | 2 +- .../pom.xml.versionsBackup | 31 ++ .../pom.xml | 2 +- .../pom.xml.versionsBackup | 31 ++ solr-osgi-feature/pom.xml | 2 +- solr-osgi-feature/pom.xml.versionsBackup | 186 ++++++++ solr-osgi-http/pom.xml | 2 +- solr-osgi-http/pom.xml.versionsBackup | 78 ++++ solr-osgi-parent/pom.xml | 2 +- solr-osgi-parent/pom.xml.versionsBackup | 410 ++++++++++++++++++ solr-osgi-services/pom.xml | 2 +- solr-osgi-services/pom.xml.versionsBackup | 158 +++++++ 14 files changed, 1031 insertions(+), 7 deletions(-) create mode 100644 pom.xml.versionsBackup create mode 100644 solr-osgi-example-configsets-dataimportNorthwind/pom.xml.versionsBackup create mode 100644 solr-osgi-example-configsets-exampleCollection/pom.xml.versionsBackup create mode 100644 solr-osgi-feature/pom.xml.versionsBackup create mode 100644 solr-osgi-http/pom.xml.versionsBackup create mode 100644 solr-osgi-parent/pom.xml.versionsBackup create mode 100644 solr-osgi-services/pom.xml.versionsBackup diff --git a/pom.xml b/pom.xml index 88fa8fc..48f0ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt solr-osgi - 1.0.0-SNAPSHOT + 1.0.0 pom Solr OSGi diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup new file mode 100644 index 0000000..88fa8fc --- /dev/null +++ b/pom.xml.versionsBackup @@ -0,0 +1,130 @@ + + 4.0.0 + + hu.blackbelt + solr-osgi + 1.0.0-SNAPSHOT + pom + + Solr OSGi + + + solr-osgi-parent + solr-osgi-example-configsets-exampleCollection + solr-osgi-example-configsets-dataimportNorthwind + solr-osgi-services + solr-osgi-http + solr-osgi-feature + + + + scm:git:git://github.com/BlackBeltTechnology/solr-osgi.git + scm:git:ssh://${git.username}@github.com:BlackBeltTechnology/solr-osgi.git + http://github.com/BlackBeltTechnology/solr-osgi + + + + + + external.atlassian.jgitflow + jgitflow-maven-plugin + ${jgitflow-maven-plugin.version} + + true + ${git.username} + + + + org.apache.maven.plugins + maven-scm-plugin + 1.9.5 + + developerConnection + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + true + + + + + + + 1.0-m5.1 + true + + + + + + release-github + + + + de.jutzig + github-release-plugin + 1.2.0 + + https://github.com/BlackBeltTechnology/solr-osgi.git + Branch: ${env.WERCKER_GIT_BRANCH} Wercker: ${env.WERCKER_RUN_URL} + ${project.version} + true + ${project.version} + + + solr-osgi-example-configsets-dataimportNorthwind/target + + *.jar + + + + solr-osgi-example-configsets-exampleCollection/target + + *.jar + + + + solr-osgi-feature/target/features + + *.xml + + + + solr-osgi-http/target + + *.jar + + + + solr-osgi-parent + + pom.xml + + + + solr-osgi-services/target + + *.jar + + + + + + + release-to-github + install + + release + + + + + + + + + diff --git a/solr-osgi-example-configsets-dataimportNorthwind/pom.xml b/solr-osgi-example-configsets-dataimportNorthwind/pom.xml index 28f9573..849aa30 100644 --- a/solr-osgi-example-configsets-dataimportNorthwind/pom.xml +++ b/solr-osgi-example-configsets-dataimportNorthwind/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0-SNAPSHOT + 1.0.0 ../solr-osgi-parent diff --git a/solr-osgi-example-configsets-dataimportNorthwind/pom.xml.versionsBackup b/solr-osgi-example-configsets-dataimportNorthwind/pom.xml.versionsBackup new file mode 100644 index 0000000..28f9573 --- /dev/null +++ b/solr-osgi-example-configsets-dataimportNorthwind/pom.xml.versionsBackup @@ -0,0 +1,31 @@ + + 4.0.0 + + + hu.blackbelt + solr-osgi-parent + 1.0.0-SNAPSHOT + ../solr-osgi-parent + + + solr-osgi-example-configsets-dataimportNorthwind + bundle + + Solr OSGi exampleCollection configset + Example exampleCollection configset to load to solr-osgi-service. + + + + + org.apache.felix + maven-bundle-plugin + + + northwind + + + + + + + diff --git a/solr-osgi-example-configsets-exampleCollection/pom.xml b/solr-osgi-example-configsets-exampleCollection/pom.xml index fa081f3..750d736 100644 --- a/solr-osgi-example-configsets-exampleCollection/pom.xml +++ b/solr-osgi-example-configsets-exampleCollection/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0-SNAPSHOT + 1.0.0 ../solr-osgi-parent diff --git a/solr-osgi-example-configsets-exampleCollection/pom.xml.versionsBackup b/solr-osgi-example-configsets-exampleCollection/pom.xml.versionsBackup new file mode 100644 index 0000000..fa081f3 --- /dev/null +++ b/solr-osgi-example-configsets-exampleCollection/pom.xml.versionsBackup @@ -0,0 +1,31 @@ + + 4.0.0 + + + hu.blackbelt + solr-osgi-parent + 1.0.0-SNAPSHOT + ../solr-osgi-parent + + + solr-osgi-example-configsets-exampleCollection + bundle + + Solr OSGi exampleCollection configset + Example exampleCollection configset to load to solr-osgi-service. + + + + + org.apache.felix + maven-bundle-plugin + + + exampleCollection + + + + + + + diff --git a/solr-osgi-feature/pom.xml b/solr-osgi-feature/pom.xml index b87b730..04e4314 100644 --- a/solr-osgi-feature/pom.xml +++ b/solr-osgi-feature/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0-SNAPSHOT + 1.0.0 ../solr-osgi-parent diff --git a/solr-osgi-feature/pom.xml.versionsBackup b/solr-osgi-feature/pom.xml.versionsBackup new file mode 100644 index 0000000..b87b730 --- /dev/null +++ b/solr-osgi-feature/pom.xml.versionsBackup @@ -0,0 +1,186 @@ + + 4.0.0 + + hu.blackbelt + solr-osgi-parent + 1.0.0-SNAPSHOT + ../solr-osgi-parent + + + + ${java.version} + + + solr-osgi-feature + pom + + Solr Karaf feature + Apache Karaf feature for Solr. + + + + + ${project.basedir}/src/main/features + true + ${project.build.directory}/features + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf-version} + true + + true + true + manual + + + + feature-verify + compile + + verify + + + + mvn:org.apache.karaf.features/framework/${karaf-version}/xml/features + mvn:org.apache.karaf.features/standard/${karaf-version}/xml/features + mvn:org.apache.karaf.features/enterprise/${karaf-version}/xml/features + mvn:org.apache.karaf.features/spring/${karaf-version}/xml/features + mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features + file:${project.build.directory}/features/solr-osgi-feature.xml + + org.apache.karaf.features:framework + 1.8 + + framework + shell-compat + + + javax-interceptor-api + javax-annotation-api + javax-el-api + javax-cdi-api + javax-transaction-api + javax-mail-api + javax-servlet-api + xmlresolver + apache-xerces + apache-commons + apache-httpclient + bouncycastle + cxf-jackson + xmlbeans + joda-time + apache-poi + antlr4 + velocity + icu4j + dropwizard-metrics + jsr305 + lucene + javassist + reflections + osgi-utils + solr + solr-services + solr-http + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/features/solr-osgi-feature.xml + xml + features + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.2 + + + filter + generate-resources + + resources + + + + + + + + + + org.apache.karaf.features + framework + kar + runtime + ${karaf-version} + + + org.apache.karaf.features + standard + features + runtime + xml + ${karaf-version} + + + org.apache.karaf.features + spring + features + xml + runtime + ${karaf-version} + + + org.apache.karaf.features + enterprise + features + xml + runtime + ${karaf-version} + + + org.apache.karaf.features + enterprise + features + xml + runtime + ${karaf-version} + + + org.apache.cxf.karaf + apache-cxf + features + xml + runtime + ${cxf-version} + + + + diff --git a/solr-osgi-http/pom.xml b/solr-osgi-http/pom.xml index e2135aa..deaca49 100644 --- a/solr-osgi-http/pom.xml +++ b/solr-osgi-http/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0-SNAPSHOT + 1.0.0 ../solr-osgi-parent diff --git a/solr-osgi-http/pom.xml.versionsBackup b/solr-osgi-http/pom.xml.versionsBackup new file mode 100644 index 0000000..e2135aa --- /dev/null +++ b/solr-osgi-http/pom.xml.versionsBackup @@ -0,0 +1,78 @@ + + 4.0.0 + + + hu.blackbelt + solr-osgi-parent + 1.0.0-SNAPSHOT + ../solr-osgi-parent + + + solr-osgi-http + bundle + + Solr OSGi HTTP + Solr OSGi HTTP endpoints. + + + + + org.apache.felix + maven-bundle-plugin + + + + com.google.common.base;version="[14.0,30)", + com.google.common.cache;version="[14.0,30)", + com.google.common.collect;version="[14.0,30)", + com.google.common.io;version="[14.0,30)", + com.google.common.primitives;version="[14.0,30)", + com.google.common.hash;version="[14.0,30)", + com.google.common.util.concurrent;version="[14.0,30)", + javax.annotation;version="[1.0,2)", + org.apache.xerces.jaxp;version="[2.0,3.0)", + * + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.osgi + org.osgi.service.component.annotations + + + org.osgi + org.osgi.annotation + + + org.osgi + org.osgi.service.metatype.annotations + + + + org.apache.solr + solr-core + 7.0.1 + + + diff --git a/solr-osgi-parent/pom.xml b/solr-osgi-parent/pom.xml index e62f883..81bef37 100644 --- a/solr-osgi-parent/pom.xml +++ b/solr-osgi-parent/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0-SNAPSHOT + 1.0.0 pom Solr OSGi parent diff --git a/solr-osgi-parent/pom.xml.versionsBackup b/solr-osgi-parent/pom.xml.versionsBackup new file mode 100644 index 0000000..e62f883 --- /dev/null +++ b/solr-osgi-parent/pom.xml.versionsBackup @@ -0,0 +1,410 @@ + + 4.0.0 + + hu.blackbelt + solr-osgi-parent + 1.0.0-SNAPSHOT + pom + + Solr OSGi parent + Parent project of Solr OSGi. + + http://github.com/BlackBeltTechnology/solr-osgi + + + https://github.com/BlackBeltTechnology/solr-osgi/issues + GitHub Issues + + + + scm:git:git://github.com/BlackBeltTechnology/solr-osgi.git + scm:git:ssh://${git.username}@github.com:BlackBeltTechnology/solr-osgi.git + http://github.com/BlackBeltTechnology/solr-osgi + + + + + borcsokj + Börcsök József + jozsef.borcsok@blackbelt.hu + https://bitbucket.org/borcsokj + BlackBelt Technology + http://www.blackbelt.hu + + + + robson + Csákány Róbert + robert.csakany@blackbelt.hu + https://github.com/robertcsakany + BlackBelt Technology + http://www.blackbelt.hu + + + + + + + Apache License, Version 2.0 + https://opensource.org/licenses/Apache-2.0 + repo + + + + + UTF-8 + false + + 1.7 + 6.0.0 + 1.3.0 + + 1.16.16 + 1.7.25 + + 3.0.1 + 1.0-m5.1 + + 4.1.2 + 3.2.1 + + 7.0.1 + + 1.0.1 + + + + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + + org.projectlombok + lombok + 1.16.10 + + + + com.google.code.findbugs + annotations + ${findbugs.version} + provided + + + com.google.code.findbugs + jsr305 + ${findbugs.version} + provided + + + + junit + junit + 4.12 + test + + + + + + + org.osgi + osgi.core + ${osgi.version} + provided + + + org.osgi + osgi.cmpn + ${osgi.version} + provided + + + org.osgi + org.osgi.service.component.annotations + ${osgi-ds.version} + provided + + + org.osgi + org.osgi.service.metatype.annotations + ${osgi-ds.version} + provided + + + org.osgi + org.osgi.annotation + ${osgi.version} + provided + + + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + ${java.version} + ${java.version} + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.9 + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + validate + + create + + + + + false + false + + + + external.atlassian.jgitflow + jgitflow-maven-plugin + ${jgitflow-maven-plugin.version} + + true + ${git.username} + + + + + + + + org.apache.felix + maven-bundle-plugin + 3.2.0 + true + + + ${project.version} + ${buildNumber} + <_dsannotations>* + <_metatypeannotations>* + + + + + bundle-manifest + process-classes + + manifest + + + + + + + + + + + build-extras + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + true + true + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + + + + + sign + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + + + + + + + + + + release-blackbelt + + + blackbelt-nexus-distribution + https://nexus.blackbelt.cloud/repository/maven-judo-snapshot/ + + + blackbelt-nexus-distribution + https://nexus.blackbelt.cloud/repository/maven-judo-release/ + + + + + + + release-central + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + ${gpg.keyname} + + + --pinentry-mode + loopback + + + + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + diff --git a/solr-osgi-services/pom.xml b/solr-osgi-services/pom.xml index e55df2a..4a82aab 100644 --- a/solr-osgi-services/pom.xml +++ b/solr-osgi-services/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0-SNAPSHOT + 1.0.0 ../solr-osgi-parent diff --git a/solr-osgi-services/pom.xml.versionsBackup b/solr-osgi-services/pom.xml.versionsBackup new file mode 100644 index 0000000..e55df2a --- /dev/null +++ b/solr-osgi-services/pom.xml.versionsBackup @@ -0,0 +1,158 @@ + + 4.0.0 + + + hu.blackbelt + solr-osgi-parent + 1.0.0-SNAPSHOT + ../solr-osgi-parent + + + solr-osgi-services + bundle + + Solr OSGi services + Implementation of Solr OSGi services. + + + + + maven-dependency-plugin + + + unpack-exampleCollection + + unpack + + + + + ${project.groupId} + solr-osgi-example-configsets-exampleCollection + ${project.version} + configsets/**/* + + + ${project.build.directory} + + + + + + + org.apache.felix + maven-bundle-plugin + + + + com.google.common.base;version="[14.0,30)", + com.google.common.cache;version="[14.0,30)", + com.google.common.collect;version="[14.0,30)", + com.google.common.io;version="[14.0,30)", + com.google.common.primitives;version="[14.0,30)", + com.google.common.hash;version="[14.0,30)", + com.google.common.util.concurrent;version="[14.0,30)", + javax.annotation;version="[1.0,2)", + * + + osgi.service;objectClass="org.apache.solr.core.CoreContainer";effective:="active" + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.osgi + org.osgi.service.component.annotations + + + org.osgi + org.osgi.service.metatype.annotations + + + + hu.blackbelt.osgi.utils + osgi-api + ${osgi-util-version} + + + + org.apache.solr + solr-core + 7.0.1 + + + com.google.guava + guava + 19.0 + + + + com.google.jimfs + jimfs + 1.1 + + + + + org.junit.jupiter + junit-jupiter-api + 5.1.0 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.1.0 + test + + + org.junit.vintage + junit-vintage-engine + 5.1.0 + test + + + org.junit.platform + junit-platform-launcher + 1.1.0 + test + + + org.junit.platform + junit-platform-runner + 1.1.0 + test + + + org.apache.sling + org.apache.sling.testing.osgi-mock + 2.3.10 + test + + + io.leangen.geantyref + geantyref + 1.3.4 + test + + + From 261e2939e0b2a5152e6824a1e944594de766dbac Mon Sep 17 00:00:00 2001 From: Wercker Release Date: Thu, 30 Aug 2018 15:39:18 +0000 Subject: [PATCH 2/2] Next development cycle --- pom.xml | 2 +- solr-osgi-example-configsets-dataimportNorthwind/pom.xml | 2 +- solr-osgi-example-configsets-exampleCollection/pom.xml | 2 +- solr-osgi-feature/pom.xml | 2 +- solr-osgi-http/pom.xml | 2 +- solr-osgi-parent/pom.xml | 2 +- solr-osgi-services/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 48f0ad7..105f001 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt solr-osgi - 1.0.0 + 1.0.1-SNAPSHOT pom Solr OSGi diff --git a/solr-osgi-example-configsets-dataimportNorthwind/pom.xml b/solr-osgi-example-configsets-dataimportNorthwind/pom.xml index 849aa30..c39ed87 100644 --- a/solr-osgi-example-configsets-dataimportNorthwind/pom.xml +++ b/solr-osgi-example-configsets-dataimportNorthwind/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0 + 1.0.1-SNAPSHOT ../solr-osgi-parent diff --git a/solr-osgi-example-configsets-exampleCollection/pom.xml b/solr-osgi-example-configsets-exampleCollection/pom.xml index 750d736..215653a 100644 --- a/solr-osgi-example-configsets-exampleCollection/pom.xml +++ b/solr-osgi-example-configsets-exampleCollection/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0 + 1.0.1-SNAPSHOT ../solr-osgi-parent diff --git a/solr-osgi-feature/pom.xml b/solr-osgi-feature/pom.xml index 04e4314..aca5a44 100644 --- a/solr-osgi-feature/pom.xml +++ b/solr-osgi-feature/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0 + 1.0.1-SNAPSHOT ../solr-osgi-parent diff --git a/solr-osgi-http/pom.xml b/solr-osgi-http/pom.xml index deaca49..395c73f 100644 --- a/solr-osgi-http/pom.xml +++ b/solr-osgi-http/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0 + 1.0.1-SNAPSHOT ../solr-osgi-parent diff --git a/solr-osgi-parent/pom.xml b/solr-osgi-parent/pom.xml index 81bef37..cbd55e2 100644 --- a/solr-osgi-parent/pom.xml +++ b/solr-osgi-parent/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0 + 1.0.1-SNAPSHOT pom Solr OSGi parent diff --git a/solr-osgi-services/pom.xml b/solr-osgi-services/pom.xml index 4a82aab..04f9ab8 100644 --- a/solr-osgi-services/pom.xml +++ b/solr-osgi-services/pom.xml @@ -4,7 +4,7 @@ hu.blackbelt solr-osgi-parent - 1.0.0 + 1.0.1-SNAPSHOT ../solr-osgi-parent