diff --git a/pom.xml b/pom.xml index 81612890..a1f84114 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,26 @@ - - + + 4.0.0 - io.takari - takari - 14 + io.tesla + tesla + 7 io.tesla.polyglot tesla-polyglot - 0.1.2-SNAPSHOT + 0.1.1 Polyglot Tesla :: Aggregator pom @@ -29,7 +33,7 @@ - 3.2.6-SNAPSHOT + 3.1.1 0.0.0.M5 @@ -41,15 +45,9 @@ tesla-polyglot-common - tesla-polyglot-maven-plugin - tesla-polyglot-atom tesla-polyglot-ruby - + tesla-polyglot-cli + tesla-polyglot-maven-plugin @@ -57,10 +55,9 @@ io.tesla.polyglot tesla-polyglot-common - 0.1.2-SNAPSHOT + 0.1.1 - + org.apache.maven maven @@ -68,14 +65,14 @@ pom import - + org.eclipse.sisu org.eclipse.sisu.inject.tests 0.0.0.M3 test - + junit junit @@ -85,61 +82,12 @@ - - - - - org.codehaus.plexus - plexus-utils - - - org.eclipse.sisu - org.eclipse.sisu.plexus - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model-builder - provided - - - org.slf4j - slf4j-api - provided - - - org.codehaus.plexus - plexus-component-annotations - provided - - - - junit - junit - test - - - org.eclipse.sisu - org.eclipse.sisu.inject.tests - test - - - org.codehaus.plexus plexus-component-metadata + 1.5.4 @@ -149,18 +97,74 @@ + + io.tesla.maven.plugins + tesla-license-plugin + 1.0.0 + + true + true +
license-header.txt
+ false + + **/pom.xml + **/*.xml + **/*.xsd + **/*.xjb + **/*.mdo + **/*.properties + **/*.java + **/*.groovy + **/*.scala + **/*.aj + **/*.js + **/*.css + + + **/target/** + **/conf/** + **/.* + **/pkg/** + **/.idea/** + **/src/test/resources/*.scala + **/release.properties + **/pom.xml.releaseBackup + **/pom.xml + release.sh + + + JAVADOC_STYLE + XML_STYLE + XML_STYLE + +
+ + + + check + + + +
+ + maven-release-plugin + + clean install + forked-path + + - maven-release-plugin + maven-compiler-plugin + 2.3.2 - clean install - forked-path + 1.6 + 1.6 - + org.eclipse.m2e lifecycle-mapping diff --git a/tesla-polyglot-atom/pom.xml b/tesla-polyglot-atom/pom.xml index 6931c3c7..88eb1e62 100644 --- a/tesla-polyglot-atom/pom.xml +++ b/tesla-polyglot-atom/pom.xml @@ -15,7 +15,7 @@ io.tesla.polyglot tesla-polyglot - 0.1.2-SNAPSHOT + 0.1.1 tesla-polyglot-atom diff --git a/tesla-polyglot-cli/pom.xml b/tesla-polyglot-cli/pom.xml index b45bc61d..c2070270 100644 --- a/tesla-polyglot-cli/pom.xml +++ b/tesla-polyglot-cli/pom.xml @@ -14,7 +14,7 @@ io.tesla.polyglot tesla-polyglot - 0.1.2-SNAPSHOT + 0.1.1 tesla-polyglot-cli Polyglot Tesla :: CLI @@ -26,32 +26,32 @@ io.tesla.polyglot tesla-polyglot-groovy - 0.1.2-SNAPSHOT + 0.1.1 io.tesla.polyglot tesla-polyglot-atom - 0.1.2-SNAPSHOT + 0.1.1 io.tesla.polyglot tesla-polyglot-yaml - 0.1.2-SNAPSHOT + 0.1.1 io.tesla.polyglot tesla-polyglot-ruby - 0.1.2-SNAPSHOT + 0.1.1 io.tesla.polyglot tesla-polyglot-scala - 0.1.2-SNAPSHOT + 0.1.1 io.tesla.polyglot tesla-polyglot-clojure - 0.1.2-SNAPSHOT + 0.1.1 diff --git a/tesla-polyglot-common/pom.xml b/tesla-polyglot-common/pom.xml index 28a0c6cc..35172c24 100644 --- a/tesla-polyglot-common/pom.xml +++ b/tesla-polyglot-common/pom.xml @@ -1,17 +1,21 @@ - - + + 4.0.0 io.tesla.polyglot tesla-polyglot - 0.1.2-SNAPSHOT + 0.1.1 tesla-polyglot-common @@ -19,10 +23,13 @@ - org.codehaus.plexus - plexus-utils - 3.0.20 - provided + org.apache.maven + maven-model-builder + + + + org.apache.maven + maven-embedder @@ -32,7 +39,16 @@ src/main/resources-filtered true - + + + + io.tesla.maven.plugins + tesla-license-plugin + +
../license-header.txt
+
+
+
diff --git a/tesla-polyglot-gems/pom.rb b/tesla-polyglot-gems/pom.rb index 0b1789e2..b5d0af4e 100644 --- a/tesla-polyglot-gems/pom.rb +++ b/tesla-polyglot-gems/pom.rb @@ -13,5 +13,6 @@ 'header' => '${basedir}/../license-header.txt', 'excludes' => [ '**/conf/**', '**/pkg/**', - '**/*pom.xml' ] ) + '**/*pom.xml', + '**/*gemspec.xml' ] ) end diff --git a/tesla-polyglot-gems/ruby-maven-libs/Mavenfile b/tesla-polyglot-gems/ruby-maven-libs/Mavenfile index 9572e680..24893f3f 100644 --- a/tesla-polyglot-gems/ruby-maven-libs/Mavenfile +++ b/tesla-polyglot-gems/ruby-maven-libs/Mavenfile @@ -3,7 +3,7 @@ require File.join( basedir, '../ruby-maven/lib/tesla_maven' ) gemspec -inherit "io.tesla.polyglot:tesla-polyglot-gems:#{TeslaMaven::VERSION}-SNAPSHOT" do +inherit "io.tesla.polyglot:tesla-polyglot-gems:#{TeslaMaven::VERSION}" do relative_path '../pom.rb' end @@ -45,7 +45,7 @@ build do execute("check versions", :validate) do |context| mavenVersion = context.project.properties[ 'mavenVersion' ] if context.project.version != mavenVersion - raise "\n\n\tmismatched maven versions: #{context.project.version} <=> #{mavenVersion}\n\ttesla uses a different version than ruby/maven.rb\n" + warn "\n\n\tmismatched maven versions: #{context.project.version} <=> #{mavenVersion}\n\ttesla uses a different version than ruby/maven.rb\n" end end end diff --git a/tesla-polyglot-gems/ruby-maven/Mavenfile b/tesla-polyglot-gems/ruby-maven/Mavenfile index 0135cefd..0ab8cb43 100644 --- a/tesla-polyglot-gems/ruby-maven/Mavenfile +++ b/tesla-polyglot-gems/ruby-maven/Mavenfile @@ -6,7 +6,7 @@ require File.join( basedir, 'lib', 'tesla_maven' ) # if you install that gem via maven it will get a pom.xml which is not # working for regular maven -inherit "io.tesla.polyglot:tesla-polyglot-gems:#{TeslaMaven::VERSION}-SNAPSHOT" do +inherit "io.tesla.polyglot:tesla-polyglot-gems:#{TeslaMaven::VERSION}" do relative_path '../pom.rb' end diff --git a/tesla-polyglot-gems/ruby-maven/lib/maven/ruby/version.rb b/tesla-polyglot-gems/ruby-maven/lib/maven/ruby/version.rb index ae07640a..29b48e61 100644 --- a/tesla-polyglot-gems/ruby-maven/lib/maven/ruby/version.rb +++ b/tesla-polyglot-gems/ruby-maven/lib/maven/ruby/version.rb @@ -1,6 +1,6 @@ module Maven module Ruby MAVEN_VERSION = '3.1.1'.freeze - VERSION = MAVEN_VERSION + '.0.10'# + '.dev' + VERSION = MAVEN_VERSION + '.0.11'# + '.dev' end end diff --git a/tesla-polyglot-gems/ruby-maven/lib/tesla_maven.rb b/tesla-polyglot-gems/ruby-maven/lib/tesla_maven.rb index 858444da..67ab32b9 100644 --- a/tesla-polyglot-gems/ruby-maven/lib/tesla_maven.rb +++ b/tesla-polyglot-gems/ruby-maven/lib/tesla_maven.rb @@ -6,7 +6,7 @@ module TeslaMaven - VERSION = '0.1.2'.freeze + VERSION = '0.1.1'.freeze def self.home File.expand_path( File.join( File.dirname( File.expand_path( __FILE__ ) ), '../ruby-maven-home' ) ) diff --git a/tesla-polyglot-maven-plugin/pom.xml b/tesla-polyglot-maven-plugin/pom.xml index c4bc8976..570571f9 100644 --- a/tesla-polyglot-maven-plugin/pom.xml +++ b/tesla-polyglot-maven-plugin/pom.xml @@ -1,46 +1,63 @@ - - - - 4.0.0 - - - io.tesla.polyglot - tesla-polyglot - 0.1.2-SNAPSHOT - - - tesla-polyglot-maven-plugin - Polyglot Tesla :: Maven Plugin - maven-plugin - - - + + + + 4.0.0 + + io.tesla.polyglot - tesla-polyglot-common - - - org.apache.maven - maven-plugin-api - provided - - - - - - - maven-surefire-plugin - - - ${project.version} - - - - - + tesla-polyglot + 0.1.1 + + + tesla-polyglot-maven-plugin + Polyglot Tesla :: Maven Plugin + maven-plugin + + + + io.tesla.polyglot + tesla-polyglot-common + + + + org.apache.maven + maven-plugin-api + + + + junit + junit + test + + + + + + + maven-surefire-plugin + + + ${project.version} + + + + + io.tesla.maven.plugins + tesla-license-plugin + +
../license-header.txt
+
+
+
+
diff --git a/tesla-polyglot-ruby/pom.xml b/tesla-polyglot-ruby/pom.xml index 80906089..6f902c70 100644 --- a/tesla-polyglot-ruby/pom.xml +++ b/tesla-polyglot-ruby/pom.xml @@ -15,7 +15,7 @@ io.tesla.polyglot tesla-polyglot - 0.1.2-SNAPSHOT + 0.1.1 tesla-polyglot-ruby @@ -25,11 +25,12 @@ io.tesla.polyglot tesla-polyglot-common - + org.jruby jruby-noasm 1.7.19 + provided @@ -38,6 +39,15 @@ ${project.version} test + + junit + junit + test + + + org.eclipse.sisu + org.eclipse.sisu.inject.tests + @@ -46,6 +56,13 @@ + + io.tesla.maven.plugins + tesla-license-plugin + +
../license-header.txt
+
+
maven-invoker-plugin