Skip to content

Commit

Permalink
prepare 3.1.1.0.11 release of ruby-maven
Browse files Browse the repository at this point in the history 
the problem was that version of the bundled telsa-polyglot-ruby
needs to be on maven-central to load on the fly the missing
jruby bits.

this is build of 0.1.2-SNAPSHOT with get relabled with 0.1.1 (bad thing
but repo needs a new home once maven-3.6.2 is released and then rectify this
version mess)

fixes mkristian/jbundler#58

Sponsored by Lookout Inc.
  • Loading branch information
@mkristian
mkristian committed Feb 17, 2015
1 parent 76fdef2 commit ea72eb7
Show file tree
Hide file tree
Showing 11 changed files with 205 additions and 150 deletions.
164 changes: 84 additions & 80 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2012 to original author or authors All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Copyright (c) 2012 to original author or authors
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.takari</groupId>
<artifactId>takari</artifactId>
<version>14</version>
<groupId>io.tesla</groupId>
<artifactId>tesla</artifactId>
<version>7</version>
</parent>

<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
<name>Polyglot Tesla :: Aggregator</name>
<packaging>pom</packaging>

Expand All @@ -29,7 +33,7 @@
</licenses>

<properties>
<mavenVersion>3.2.6-SNAPSHOT</mavenVersion>
<mavenVersion>3.1.1</mavenVersion>
<sisuInjectVersion>0.0.0.M5</sisuInjectVersion>
</properties>

Expand All @@ -41,41 +45,34 @@

<modules>
<module>tesla-polyglot-common</module>
<module>tesla-polyglot-maven-plugin</module>
<module>tesla-polyglot-atom</module>
<module>tesla-polyglot-ruby</module>
<!--
<module>tesla-polyglot-groovy</module>
<module>tesla-polyglot-yaml</module>
<module>tesla-polyglot-clojure</module>
<module>tesla-polyglot-cli</module> <module>tesla-polyglot-scala</module>
-->
<module>tesla-polyglot-cli</module>
<module>tesla-polyglot-maven-plugin</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-common</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<!-- We inline Maven's dependency management section to align dependency
versions from Maven's core -->
<!-- We inline Maven's dependency management section to align dependency versions from Maven's core -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>${mavenVersion}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- I'd like to remove these two and place them in Maven's depMan
section. We want to be a complete superset as much as possible -->
<!-- I'd like to remove these two and place them in Maven's depMan section. We want to be a complete
superset as much as possible -->
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject.tests</artifactId>
<version>0.0.0.M3</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -85,61 +82,12 @@
</dependencies>
</dependencyManagement>

<!-- Dependencies all implementors need -->
<dependencies>
<!-- This needs to not be provided or it causes the extension mechanism to fail -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<scope>provided</scope>
</dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject.tests</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>1.5.4</version>
<executions>
<execution>
<goals>
Expand All @@ -149,18 +97,74 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.tesla.maven.plugins</groupId>
<artifactId>tesla-license-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<aggregate>true</aggregate>
<strictCheck>true</strictCheck>
<header>license-header.txt</header>
<useDefaultExcludes>false</useDefaultExcludes>
<includes>
<include>**/pom.xml</include>
<include>**/*.xml</include>
<include>**/*.xsd</include>
<include>**/*.xjb</include>
<include>**/*.mdo</include>
<include>**/*.properties</include>
<include>**/*.java</include>
<include>**/*.groovy</include>
<include>**/*.scala</include>
<include>**/*.aj</include>
<include>**/*.js</include>
<include>**/*.css</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/conf/**</exclude>
<exclude>**/.*</exclude>
<exclude>**/pkg/**</exclude>
<exclude>**/.idea/**</exclude>
<exclude>**/src/test/resources/*.scala</exclude>
<exclude>**/release.properties</exclude>
<exclude>**/pom.xml.releaseBackup</exclude>
<exclude>**/pom.xml</exclude>
<exclude>release.sh</exclude>
</excludes>
<mapping>
<scala>JAVADOC_STYLE</scala>
<xjb>XML_STYLE</xjb>
<mdo>XML_STYLE</mdo>
</mapping>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<preparationGoals>clean install</preparationGoals>
<mavenExecutorId>forked-path</mavenExecutorId>
</configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<preparationGoals>clean install</preparationGoals>
<mavenExecutorId>forked-path</mavenExecutorId>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tesla-polyglot-atom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</parent>

<artifactId>tesla-polyglot-atom</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions tesla-polyglot-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</parent>
<artifactId>tesla-polyglot-cli</artifactId>
<name>Polyglot Tesla :: CLI</name>
Expand All @@ -26,32 +26,32 @@
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-groovy</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-atom</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-yaml</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-scala</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-clojure</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</dependency>
<!-- Used for XML Canonicalization, to compare pom.xml files -->
<dependency>
Expand Down
40 changes: 28 additions & 12 deletions tesla-polyglot-common/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2012 to original author or authors All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Copyright (c) 2012 to original author or authors
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.1.1</version>
</parent>

<artifactId>tesla-polyglot-common</artifactId>
<name>Polyglot Tesla :: Common</name>

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.20</version>
<scope>provided</scope>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
</dependencies>

Expand All @@ -32,7 +39,16 @@
<directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
</resources>
</resources>
<plugins>
<plugin>
<groupId>io.tesla.maven.plugins</groupId>
<artifactId>tesla-license-plugin</artifactId>
<configuration>
<header>../license-header.txt</header>
</configuration>
</plugin>
</plugins>
</build>

</project>
3 changes: 2 additions & 1 deletion tesla-polyglot-gems/pom.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
'header' => '${basedir}/../license-header.txt',
'excludes' => [ '**/conf/**',
'**/pkg/**',
'**/*pom.xml' ] )
'**/*pom.xml',
'**/*gemspec.xml' ] )
end
4 changes: 2 additions & 2 deletions tesla-polyglot-gems/ruby-maven-libs/Mavenfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tesla-polyglot-gems/ruby-maven/Mavenfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit ea72eb7

Please sign in to comment.