diff --git a/.gitignore b/.gitignore index a447db5..e0d52eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -/target/ -/pom.xml -/target-ide/ /out/ /.idea/ -/.idea_modules/ diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml deleted file mode 100644 index 4f731bf..0000000 --- a/.mvn/extensions.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - io.takari.polyglot - polyglot-scala - 0.2.1 - - - diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fff2b02..0000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -sudo: false -language: java -jdk: - - oraclejdk8 - -before_script: - # install maven - - mvn -N io.takari:maven:0.5.0:wrapper -Dmaven=3.5.2 - # instal mill - - wget "https://raw.githubusercontent.com/lefou/millw/master/millw" -O millw && chmod +x millw - -script: - # Build with maven - - ./mvnw clean install source:jar javadoc:jar - # Build with mill - - ./millw -i main.test.test - - ./millw -i main.publishLocal diff --git a/makerelease.sh b/makerelease.sh deleted file mode 100644 index d077f23..0000000 --- a/makerelease.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -if [ ! -f "staging-settings.xml" ]; then - - cat > staging-settings.xml << EOF - - - - ossrh - your-username - your-password - - - -EOF - -fi - -echo "Please edit staging-settings.xml with propper connection details." -read - -DOMINO_VERSION="0.3.0" -URL="https://oss.sonatype.org/service/local/staging/deploy/maven2/" - -mvn clean source:jar javadoc:jar install - -if [ -n "$SKIP_UPLOAD" ] ; then - echo "Skipping Upload" -else - - echo "Uploading jar" - mvn -s ./staging-settings.xml gpg:sign-and-deploy-file -Durl="${URL}" -DrepositoryId=ossrh -DpomFile=.polyglot.pom.scala -Dfile="target/domino-java-${DOMINO_VERSION}.jar" - - echo "Uploading sources" - mvn -s ./staging-settings.xml gpg:sign-and-deploy-file -Durl="${URL}" -DrepositoryId=ossrh -DpomFile=.polyglot.pom.scala -Dfile="target/domino-java-${DOMINO_VERSION}-sources.jar" -Dclassifier=sources - - echo "Uploading javadoc" - mvn -s ./staging-settings.xml gpg:sign-and-deploy-file -Durl="${URL}" -DrepositoryId=ossrh -DpomFile=.polyglot.pom.scala -Dfile="target/domino-java-${DOMINO_VERSION}-javadoc.jar" -Dclassifier=javadoc - -fi diff --git a/osgi.bnd b/osgi.bnd deleted file mode 100644 index 98bab6f..0000000 --- a/osgi.bnd +++ /dev/null @@ -1,10 +0,0 @@ -Bundle-SymbolicName: ${bundle.symbolicName} - -Import-Package: \ - org.slf4j.*;resolution:=optional, \ - de.tototec.utils.functional.*;resolution:=optional, \ - * - -Export-Package: \ - ${bundle.namespace};version="0.3.0", \ - ${bundle.namespace}.capsule;version="0.1.0" diff --git a/pom.scala b/pom.scala deleted file mode 100644 index a2248e7..0000000 --- a/pom.scala +++ /dev/null @@ -1,174 +0,0 @@ -import org.sonatype.maven.polyglot.scala.model._ -import scala.collection.immutable._ - -val dominoJavaName = "domino.java" -val dominoJavaVersion = "0.3.1-SNAPSHOT" -val url = "https://github.com/domino-osgi/domino-java" - -object Deps { - val asciiDoclet = "org.asciidoctor" % "asciidoclet" % "1.5.4" - val bndlib = "biz.aQute.bnd" % "biz.aQute.bndlib" % "3.5.0" - val felixConnect = "org.apache.felix" % "org.apache.felix.connect" % "0.2.0" - val junit4 = "junit" % "junit" % "4.12" - val lambdaTest = "de.tototec" % "de.tobiasroeser.lambdatest" % "0.8.0" - val osgiCompendium = "org.osgi" % "org.osgi.compendium" % "5.0.0" - val osgiCore = "org.osgi" % "org.osgi.core" % "5.0.0" - val slf4j = "org.slf4j" % "slf4j-api" % "1.7.36" - val utilsFunctional = "de.tototec" % "de.tototec.utils.functional" % "2.0.1" - // val felixConfigAdmin = "org.apache.felix" % "org.apache.felix.configadmin" % "1.8.8" - val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.1.3" -} - -object Plugins { - val bnd = "biz.aQute.bnd" % "bnd-maven-plugin" % "3.5.0" - val bundle = "org.apache.felix" % "maven-bundle-plugin" % "3.5.0" - val clean = "org.apache.maven.plugins" % "maven-clean-plugin" % "3.0.0" - val gpg = "org.apache.maven.plugins" % "maven-gpg-plugin" % "1.6" - val jar = "org.apache.maven.plugins" % "maven-jar-plugin" % "2.5" - val javadoc = "org.apache.maven.plugins" % "maven-javadoc-plugin" % "2.10.3" - val polyglotTranslate = "io.takari.polyglot" % "polyglot-translate-plugin" % "0.2.1" - val surefire = "org.apache.maven.plugins" % "maven-surefire-plugin" % "2.17" -} - -Model( - gav = "com.github.domino-osgi" % "domino-java" % dominoJavaVersion, - modelVersion = "4.0.0", - packaging = "bundle", - properties = Map( - "maven.compiler.source" -> "1.8", - "maven.compiler.target" -> "1.8", - "project.build.sourceEncoding" -> "UTF-8", - "bundle.symbolicName" -> "${project.artifactId}", - "bundle.namespace" -> "domino.java" - ), - name = "Domino for Java", - description = "A lightweight Java library for writing elegant OSGi bundle activators", - url = url, - scm = Scm( - url = url, - connection = "scm:git:" + url, - developerConnection = "scm:git:" + url - ), - licenses = Seq(License( - name = "Apache License, Version 2", - url = "http://www.apache.org/licenses", - distribution = "repo" - )), - developers = Seq( - Developer( - name = "Tobias Roeser", - email = "le.petit.fou@web.de" - ) - ), - dependencies = Seq( - // compile dependencies - Deps.osgiCore, - Deps.osgiCompendium, - Dependency(Deps.slf4j, scope = "provided", optional = true), - Dependency(Deps.utilsFunctional, scope = "provided", optional = true), - // test dependencies - Deps.lambdaTest % "test", - Deps.felixConnect % "test", - Deps.junit4 % "test", - // Deps.felixConfigAdmin % "test", - // Deps.pojosr % "test" - Deps.logbackClassic % "test" - ), - build = Build( - resources = Seq( - Resource( - directory = "src/main/resources" - ), - Resource( - directory = ".", - includes = Seq( - "README.adoc", - "FAQ.adoc", - "UserGuide.adoc", - "LICENSE" - ) - ) - ), - plugins = Seq( - // Build OSGi Manifest and bundle, also check version compatibility (baselining) - Plugin( - Plugins.bundle, - dependencies = Seq( - Deps.bndlib - ), - extensions = true, - configuration = Config( - instructions = Config( - _include = "osgi.bnd" - ) - ), - executions = Seq( - Execution( - phase = "verify", - goals = Seq("baseline"), - configuration = Config( - failOnError = "false" - ) - ) - ) - ), - // Use Asciidoclet processor instead of standard Javadoc - Plugin( - Plugins.javadoc, - configuration = Config( - source = "${maven.compiler.source}", - doclet = "org.asciidoctor.Asciidoclet", - docletArtifact = Config( - groupId = Deps.asciiDoclet.groupId.get, - artifactId = Deps.asciiDoclet.artifactId, - version = Deps.asciiDoclet.version.get - ), - overview = "README.adoc", - additionalparam = s"""--base-dir "$${project.basedir}" - | --attributes-file src/main/doc/placeholders.adoc - | --attribute "name=$${project.name}" - | --attribute "version=${dominoJavaVersion}" - | --attribute "dominojavaversion=${dominoJavaVersion}" - | --attribute "title-link=${url}[${dominoJavaName} ${dominoJavaVersion}]" - | --attribute "env-asciidoclet=true"""".stripMargin - ) - ) - ) - ), - profiles = Seq( - Profile( - id = "gen-pom-xml", - build = BuildBase( - plugins = Seq( - Plugin( - Plugins.polyglotTranslate, - executions = Seq( - Execution( - id = "pom-scala-to-pom-xml", - phase = "initialize", - goals = Seq("translate-project"), - configuration = Config( - input = "pom.scala", - output = "pom.xml" - ) - ) - ) - ), - Plugin( - Plugins.clean, - configuration = Config( - filesets = Config( - fileset = Config( - directory = "${basedir}", - includes = Config( - include = "pom.xml" - ) - ) - ) - ) - ) - ) - ) - ) - ) -)