summaryrefslogtreecommitdiff
path: root/src/build/maven
diff options
context:
space:
mode:
Diffstat (limited to 'src/build/maven')
-rw-r--r--src/build/maven/continuations-plugin-pom.xml12
-rw-r--r--src/build/maven/jline-pom.xml12
-rw-r--r--src/build/maven/maven-deploy.xml122
-rw-r--r--src/build/maven/scala-compiler-pom.xml12
-rw-r--r--src/build/maven/scala-dbc-pom.xml12
-rw-r--r--src/build/maven/scala-library-pom.xml12
-rw-r--r--src/build/maven/scala-partest-pom.xml12
-rw-r--r--src/build/maven/scala-swing-pom.xml12
-rw-r--r--src/build/maven/scalap-pom.xml12
9 files changed, 184 insertions, 34 deletions
diff --git a/src/build/maven/continuations-plugin-pom.xml b/src/build/maven/continuations-plugin-pom.xml
index 0277b899ed..aca519b87e 100644
--- a/src/build/maven/continuations-plugin-pom.xml
+++ b/src/build/maven/continuations-plugin-pom.xml
@@ -6,6 +6,8 @@
<artifactId>continuations</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Scala Continuations Plugin</name>
+ <description>Delimited continuations compilation for Scala</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2010</inceptionYear>
<organization>
@@ -48,4 +50,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/jline-pom.xml b/src/build/maven/jline-pom.xml
index 0c96c1374e..4752deb5e0 100644
--- a/src/build/maven/jline-pom.xml
+++ b/src/build/maven/jline-pom.xml
@@ -6,6 +6,8 @@
<artifactId>jline</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>jline</name>
+ <description>Like readline, but better</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2011</inceptionYear>
<organization>
@@ -54,4 +56,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 9fddca3c73..2e490163e0 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -9,15 +9,12 @@
<!-- Pull in properties from build -->
<property file="build.properties" />
<!-- Initialize specific properties -->
- <!--<property name="remote.snapshot.repository" value="http://scala-tools.org:8081/nexus/content/repositories/snapshots" />
- <property name="remote.release.repository" value="http://scala-tools.org:8081/nexus/content/repositories/releases" />-->
-
- <property name="remote.snapshot.repository" value="http://nexus.scala-tools.org/content/repositories/snapshots" />
- <property name="remote.release.repository" value="http://nexus.scala-tools.org/content/repositories/releases" />
+ <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
+ <property name="remote.release.repository" value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
<property name="local.snapshot.repository" value="${user.home}/.m2/repository" />
<property name="local.release.repository" value="${user.home}/.m2/repository" />
- <property name="repository.credentials.id" value="scala-tools.org" />
+ <property name="repository.credentials.id" value="sonatype-nexus" />
<property name="settings.file" value="${user.home}/.m2/settings.xml" />
<echo>Using server[${repository.credentials.id}] for maven repository credentials.
@@ -30,6 +27,7 @@
<!-- Add our maven ant tasks -->
<path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+
<!-- simplify fixing pom versions -->
<macrodef name="make-pom">
<attribute name="name" />
@@ -60,13 +58,6 @@
<artifact:pom id="plugin-@{name}.pom" file="plugins/@{name}/@{name}-pom-fixed.xml" />
</sequential>
</macrodef>
- <!-- Simply attaching documentation -->
- <macrodef name="attach-doc">
- <attribute name="name" />
- <sequential>
- <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" />
- </sequential>
- </macrodef>
</target>
<!-- macros for local deployment -->
<target name="deploy.local.init" depends="init.maven">
@@ -82,6 +73,7 @@
<artifact:pom refid="@{name}.pom" />
<artifact:localRepository path="@{repository}" id="${repository.credentials.id}" />
<artifact:attach type="jar" file="@{name}/@{name}-src.jar" classifier="sources" />
+ <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" />
<extra-attachments />
</artifact:install>
</sequential>
@@ -97,6 +89,8 @@
<make-pom-plugin name="@{name}" version="@{version}" />
<artifact:install file="plugins/@{name}/@{name}.jar">
<artifact:pom refid="plugin-@{name}.pom" />
+ <artifact:attach type="jar" file="plugins/@{name}/@{name}-src.jar" classifier="sources" />
+ <artifact:attach type="jar" file="plugins/@{name}/@{name}-docs.jar" classifier="javadoc" />
<artifact:localRepository path="@{repository}" id="${repository.credentials.id}" />
<extra-attachments />
</artifact:install>
@@ -109,24 +103,14 @@
<attribute name="repository" />
<attribute name="version" />
<sequential>
- <deploy-local name="scala-library" version="@{version}" repository="@{repository}">
- <extra-attachments>
- <artifact:attach type="jar" file="scala-library/scala-library-docs.jar" classifier="javadoc" />
- </extra-attachments>
- </deploy-local>
- <deploy-local name="jline" version="@{version}" repository="@{repository}"/>
+ <deploy-local name="scala-library" version="@{version}" repository="@{repository}" />
<deploy-local name="scala-compiler" version="@{version}" repository="@{repository}" />
+ <deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/>
<deploy-local name="scala-dbc" version="@{version}" repository="@{repository}" />
<deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/>
<deploy-local name="scalap" version="@{version}" repository="@{repository}"/>
<deploy-local name="scala-partest" version="@{version}" repository="@{repository}"/>
- <deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/>
- <!-- scala swing api is included in main library api
- <extra-attachments>
- <artifact:attach type="jar" file="scala-swing/scala-swing-docs.jar" classifier="javadoc" />
- </extra-attachments>
- </deploy-local>
- -->
+ <deploy-local name="jline" version="@{version}" repository="@{repository}"/>
</sequential>
</macrodef>
</target>
@@ -145,13 +129,13 @@
<artifact:pom refid="@{name}.pom" />
<artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" />
<artifact:attach type="jar" file="@{name}/@{name}-src.jar" classifier="sources" />
+ <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" />
<extra-attachments />
</artifact:deploy>
</sequential>
</macrodef>
-
- <!-- Deploy compiler plugins -->
+ <!-- Deploy compiler plugins -->
<macrodef name="deploy-remote-plugin">
<attribute name="name" />
<attribute name="version" />
@@ -161,6 +145,8 @@
<make-pom-plugin name="@{name}" version="@{version}" />
<artifact:deploy file="plugins/@{name}/@{name}.jar" settingsFile="${settings.file}">
<artifact:pom refid="plugin-@{name}.pom" />
+ <artifact:attach type="jar" file="plugins/@{name}/@{name}-src.jar" classifier="sources" />
+ <artifact:attach type="jar" file="plugins/@{name}/@{name}-docs.jar" classifier="javadoc" />
<artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" />
<extra-attachments />
</artifact:deploy>
@@ -184,12 +170,72 @@
<deploy-remote name="scalap" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-partest" version="@{version}" repository="@{repository}"/>
<deploy-remote-plugin name="continuations" version="@{version}" repository="@{repository}"/>
- <!-- scala swing api is included in main library api
- <extra-attachments>
- <artifact:attach type="jar" file="scala-swing/scala-swing-docs.jar" classifier="javadoc" />
- </extra-attachments>
- </deploy-remote>
- -->
+ </sequential>
+ </macrodef>
+
+ <!-- PGP Signed deployment -->
+ <macrodef name="deploy-remote-signed-single">
+ <attribute name="pom" />
+ <attribute name="repository" />
+ <attribute name="jar" />
+ <attribute name="srcjar" />
+ <attribute name="docjar" />
+ <sequential>
+ <artifact:mvn>
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+ <arg value="-Durl=@{repository}" />
+ <arg value="-DrepositoryId=${repository.credentials.id}" />
+ <arg value="-DpomFile=@{pom}" />
+ <arg value="-Dfile=@{jar}" />
+ <arg value="-Dsources=@{srcjar}" />
+ <arg value="-Djavadoc=@{docjar}" />
+ <arg value="-Pgpg" />
+ <arg value="-Dgpg.useagent=true" />
+ </artifact:mvn>
+ </sequential>
+ </macrodef>
+ <macrodef name="deploy-remote-signed">
+ <attribute name="name" />
+ <attribute name="repository" />
+ <attribute name="version" />
+ <element name="extra-attachments" optional="yes" />
+ <sequential>
+ <make-pom name="@{name}" version="@{version}" />
+ <deploy-remote-signed-single
+ pom="@{name}/@{name}-pom-fixed.xml"
+ repository="@{repository}"
+ jar="@{name}/@{name}.jar"
+ srcjar="@{name}/@{name}-src.jar"
+ docjar="@{name}/@{name}-docs.jar" />
+ </sequential>
+ </macrodef>
+ <macrodef name="deploy-remote-plugin-signed">
+ <attribute name="name" />
+ <attribute name="repository" />
+ <attribute name="version" />
+ <element name="extra-attachments" optional="yes" />
+ <sequential>
+ <make-pom-plugin name="@{name}" version="@{version}" />
+ <deploy-remote-signed-single
+ pom="plugins/@{name}/@{name}-pom-fixed.xml"
+ repository="@{repository}"
+ jar="plugins/@{name}/@{name}.jar"
+ srcjar="plugins/@{name}/@{name}-src.jar"
+ docjar="plugins/@{name}/@{name}-docs.jar" />
+ </sequential>
+ </macrodef>
+ <macrodef name="deploy-remote-signed-all">
+ <attribute name="repository" />
+ <attribute name="version" />
+ <sequential>
+ <deploy-remote-plugin-signed name="continuations" version="@{version}" repository="@{repository}"/>
+ <deploy-remote-signed name="scala-library" version="@{version}" repository="@{repository}"/>
+ <deploy-remote-signed name="jline" version="@{version}" repository="@{repository}"/>
+ <deploy-remote-signed name="scala-compiler" version="@{version}" repository="@{repository}" />
+ <deploy-remote-signed name="scala-dbc" version="@{version}" repository="@{repository}" />
+ <deploy-remote-signed name="scala-swing" version="@{version}" repository="@{repository}"/>
+ <deploy-remote-signed name="scalap" version="@{version}" repository="@{repository}"/>
+ <deploy-remote-signed name="scala-partest" version="@{version}" repository="@{repository}"/>
</sequential>
</macrodef>
</target>
@@ -204,6 +250,14 @@
</target>
<!-- Remote Targets -->
+ <target name="deploy.signed.snapshot" depends="deploy.remote.init" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
+ <deploy-remote-signed-all version="${maven.snapshot.version.number}" repository="${remote.snapshot.repository}" />
+ </target>
+
+ <target name="deploy.signed.release" depends="deploy.remote.init" description="Deploys the bundled files as a release into the desired remote Maven repository">
+ <deploy-remote-signed-all version="${version.number}" repository="${remote.release.repository}" />
+ </target>
+
<target name="deploy.snapshot" depends="deploy.remote.init" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
<deploy-remote-all version="${maven.snapshot.version.number}" repository="${remote.snapshot.repository}" />
</target>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 520c5fd5fd..f9bcb6719d 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -6,6 +6,8 @@
<artifactId>scala-compiler</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Scala Compiler</name>
+ <description>Compiler for the Scala Programming Language</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2002</inceptionYear>
<organization>
@@ -54,4 +56,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/scala-dbc-pom.xml b/src/build/maven/scala-dbc-pom.xml
index 6c1fa4529c..23092d10ad 100644
--- a/src/build/maven/scala-dbc-pom.xml
+++ b/src/build/maven/scala-dbc-pom.xml
@@ -6,6 +6,8 @@
<artifactId>scala-dbc</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Scala Database Connectivity</name>
+ <description>Connectivity for your DBs</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2002</inceptionYear>
<organization>
@@ -47,4 +49,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
index 836ff4766a..8e0abd4937 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -6,6 +6,8 @@
<artifactId>scala-library</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Scala Library</name>
+ <description>Standard library for the Scala Programming Language</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2002</inceptionYear>
<organization>
@@ -40,4 +42,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/scala-partest-pom.xml b/src/build/maven/scala-partest-pom.xml
index 3dc330672a..f18ca46c50 100644
--- a/src/build/maven/scala-partest-pom.xml
+++ b/src/build/maven/scala-partest-pom.xml
@@ -6,6 +6,8 @@
<artifactId>scala-partest</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Parallel Test Framework</name>
+ <description>testing framework for the Scala compiler.</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2002</inceptionYear>
<organization>
@@ -48,4 +50,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/scala-swing-pom.xml b/src/build/maven/scala-swing-pom.xml
index 06b799c7b7..a03bc07ab0 100644
--- a/src/build/maven/scala-swing-pom.xml
+++ b/src/build/maven/scala-swing-pom.xml
@@ -6,6 +6,8 @@
<artifactId>scala-swing</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Scala Swing library</name>
+ <description>Swing for Scala</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2002</inceptionYear>
<organization>
@@ -47,4 +49,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
index 3326e2d350..d7f867d4a1 100644
--- a/src/build/maven/scalap-pom.xml
+++ b/src/build/maven/scalap-pom.xml
@@ -6,6 +6,8 @@
<artifactId>scalap</artifactId>
<packaging>jar</packaging>
<version>@VERSION@</version>
+ <name>Scalap</name>
+ <description>bytecode analysis tool</description>
<url>http://www.scala-lang.org/</url>
<inceptionYear>2002</inceptionYear>
<organization>
@@ -48,4 +50,14 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
</project>